summaryrefslogtreecommitdiff
path: root/tools/arch
diff options
context:
space:
mode:
authorBorislav Petkov <bp@suse.de>2021-03-15 13:08:35 +0100
committerBorislav Petkov <bp@suse.de>2021-03-18 11:36:01 +0100
commite20f67026b5ead2afc5627e98b45e6b65e7fb38c (patch)
treecc2daafd2dc8234c51457061defba8da4996212a /tools/arch
parentf706bb59204ba1c47e896b456c97977fc97b7964 (diff)
tools/x86/kcpuid: Check last token too
Input lines like 0x8000001E, 0, EAX, 31:0, Extended APIC ID where the short name is missing lead to a segfault because the loop takes the long name for the short name and tokens[5] becomes NULL which explodes later in strcpy(). Check its value too before further processing. Signed-off-by: Borislav Petkov <bp@suse.de> Acked-by: Feng Tang <feng.tang@intel.com> Link: https://lkml.kernel.org/r/20210315125901.30315-1-bp@alien8.de
Diffstat (limited to 'tools/arch')
-rw-r--r--tools/arch/x86/kcpuid/kcpuid.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/tools/arch/x86/kcpuid/kcpuid.c b/tools/arch/x86/kcpuid/kcpuid.c
index 6048da34fcc6..dae75511fef7 100644
--- a/tools/arch/x86/kcpuid/kcpuid.c
+++ b/tools/arch/x86/kcpuid/kcpuid.c
@@ -324,6 +324,8 @@ static int parse_line(char *line)
str = NULL;
}
tokens[5] = strtok(str, "\n");
+ if (!tokens[5])
+ goto err_exit;
/* index/main-leaf */
index = strtoull(tokens[0], NULL, 0);