lscpu: fix possible buffer overflow in cpuinfo parser

Addresses: https://github.com/util-linux/util-linux/pull/3577
Signed-off-by: Karel Zak <kzak@redhat.com>
(cherry picked from commit ea04d719352add738251446315cebdada90171a9)

diff --git a/sys-utils/lscpu-cputype.c b/sys-utils/lscpu-cputype.c
index 33be3343172271b599f40dfc2926a488aec84444..9bb4ff79e53e6a398c10812efe076e4d9e337cc1 100644 (file)
--- a/sys-utils/lscpu-cputype.c
+++ b/sys-utils/lscpu-cputype.c
@@ -287,7 +287,7 @@ static const struct cpuinfo_pattern cache_patterns[] =
        DEF_PAT_CACHE("cache",  PAT_CACHE),
 };
 
-#define CPUTYPE_PATTERN_BUFSZ  32
+#define CPUTYPE_PATTERN_BUFSZ  128
 
 static int cmp_pattern(const void *a0, const void *b0)
 {
@@ -461,8 +461,7 @@ static const struct cpuinfo_pattern *cpuinfo_parse_line(char *str, char **value,
                return NULL;
 
        /* prepare name of the field */
-       xstrncpy(buf, p, sizeof(buf));
-       buf[v - p] = '\0';
+       xstrncpy(buf, p, min((size_t)(v - p)+1, sizeof(buf)));
        v++;
 
        /* prepare value */