Skip to content

Commit

Permalink
x86/MCE: Fix stack out-of-bounds write in mce-inject.c: Flags_read()
Browse files Browse the repository at this point in the history
Each of the strings that we want to put into the buf[MAX_FLAG_OPT_SIZE]
in flags_read() is two characters long. But the sprintf() adds
a trailing newline and will add a terminating NUL byte. So
MAX_FLAG_OPT_SIZE needs to be 4.

sprintf() calls vsnprintf() and *that* does return:

" * The return value is the number of characters which would
 * be generated for the given input, excluding the trailing
 * '\0', as per ISO C99."

Note the "excluding".

Reported-by: Dmitry Vyukov <[email protected]>
Signed-off-by: Tony Luck <[email protected]>
Signed-off-by: Borislav Petkov <[email protected]>
Signed-off-by: Thomas Gleixner <[email protected]>
Cc: [email protected]
Cc: linux-edac <[email protected]>
Link: http://lkml.kernel.org/r/20180427163707.ktaiysvbk3yhk4wm@agluck-desk
  • Loading branch information
aegl authored and KAGA-KOKO committed May 6, 2018
1 parent 13e8582 commit 985c78d
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion arch/x86/kernel/cpu/mcheck/mce-inject.c
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ static struct dentry *dfs_inj;

static u8 n_banks;

#define MAX_FLAG_OPT_SIZE 3
#define MAX_FLAG_OPT_SIZE 4
#define NBCFG 0x44

enum injection_type {
Expand Down

0 comments on commit 985c78d

Please sign in to comment.