mirrors/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2025-10-31 16:48:26 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

profiling: fix shift-out-of-bounds bugs

Browse source 
Syzbot reported shift-out-of-bounds bug in profile_init().
The problem was in incorrect prof_shift. Since prof_shift value comes from
userspace we need to clamp this value into [0, BITS_PER_LONG -1]
boundaries.

Second possible shiht-out-of-bounds was found by Tetsuo:
sample_step local variable in read_profile() had "unsigned int" type,
but prof_shift allows to make a BITS_PER_LONG shift. So, to prevent
possible shiht-out-of-bounds sample_step type was changed to
"unsigned long".

Also, "unsigned short int" will be sufficient for storing
[0, BITS_PER_LONG] value, that's why there is no need for
"unsigned long" prof_shift.

Link: https://lkml.kernel.org/r/20210813140022.5011-1-paskripkin@gmail.com
Fixes: 1da177e4c3 ("Linux-2.6.12-rc2")
Reported-and-tested-by: syzbot+e68c89a9510c159d9684@syzkaller.appspotmail.com
Suggested-by: Tetsuo Handa <penguin-kernel@i-love.sakura.ne.jp>
Signed-off-by: Pavel Skripkin <paskripkin@gmail.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Steven Rostedt <rostedt@goodmis.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Pavel Skripkin 2021-09-07 19:58:21 -07:00 committed by Linus Torvalds
parent 3c91dda97e
commit 2d186afd04
1 changed files with 11 additions and 10 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

21
kernel/profile.c
View file

@ -41,7 +41,8 @@ struct profile_hit {
#define NR_PROFILE_GRP (NR_PROFILE_HIT/PROFILE_GRPSZ) #define NR_PROFILE_GRP (NR_PROFILE_HIT/PROFILE_GRPSZ)
static atomic_t *prof_buffer; static atomic_t *prof_buffer;
static unsigned long prof_len, prof_shift; static unsigned long prof_len;
static unsigned short int prof_shift;
int prof_on __read_mostly; int prof_on __read_mostly;
EXPORT_SYMBOL_GPL(prof_on); EXPORT_SYMBOL_GPL(prof_on);
@ -67,8 +68,8 @@ int profile_setup(char *str)
if (str[strlen(sleepstr)] == ',') if (str[strlen(sleepstr)] == ',')
str += strlen(sleepstr) + 1; str += strlen(sleepstr) + 1;
if (get_option(&str, &par)) if (get_option(&str, &par))
prof_shift = par; prof_shift = clamp(par, 0, BITS_PER_LONG - 1);
pr_info("kernel sleep profiling enabled (shift: %ld)\n", pr_info("kernel sleep profiling enabled (shift: %u)\n",
prof_shift); prof_shift);
#else #else
pr_warn("kernel sleep profiling requires CONFIG_SCHEDSTATS\n"); pr_warn("kernel sleep profiling requires CONFIG_SCHEDSTATS\n");
@ -78,21 +79,21 @@ int profile_setup(char *str)
if (str[strlen(schedstr)] == ',') if (str[strlen(schedstr)] == ',')
str += strlen(schedstr) + 1; str += strlen(schedstr) + 1;
if (get_option(&str, &par)) if (get_option(&str, &par))
prof_shift = par; prof_shift = clamp(par, 0, BITS_PER_LONG - 1);
pr_info("kernel schedule profiling enabled (shift: %ld)\n", pr_info("kernel schedule profiling enabled (shift: %u)\n",
prof_shift); prof_shift);
} else if (!strncmp(str, kvmstr, strlen(kvmstr))) { } else if (!strncmp(str, kvmstr, strlen(kvmstr))) {
prof_on = KVM_PROFILING; prof_on = KVM_PROFILING;
if (str[strlen(kvmstr)] == ',') if (str[strlen(kvmstr)] == ',')
str += strlen(kvmstr) + 1; str += strlen(kvmstr) + 1;
if (get_option(&str, &par)) if (get_option(&str, &par))
prof_shift = par; prof_shift = clamp(par, 0, BITS_PER_LONG - 1);
pr_info("kernel KVM profiling enabled (shift: %ld)\n", pr_info("kernel KVM profiling enabled (shift: %u)\n",
prof_shift); prof_shift);
} else if (get_option(&str, &par)) { } else if (get_option(&str, &par)) {
prof_shift = par; prof_shift = clamp(par, 0, BITS_PER_LONG - 1);
prof_on = CPU_PROFILING; prof_on = CPU_PROFILING;
pr_info("kernel profiling enabled (shift: %ld)\n", pr_info("kernel profiling enabled (shift: %u)\n",
prof_shift); prof_shift);
} }
return 1; return 1;
@ -468,7 +469,7 @@ read_profile(struct file *file, char __user *buf, size_t count, loff_t *ppos)
unsigned long p = *ppos; unsigned long p = *ppos;
ssize_t read; ssize_t read;
char *pnt; char *pnt;
unsigned int sample_step = 1 << prof_shift; unsigned long sample_step = 1UL << prof_shift;
profile_flip_buffers(); profile_flip_buffers();
if (p >= (prof_len+1)*sizeof(unsigned int)) if (p >= (prof_len+1)*sizeof(unsigned int))