ligang/vpp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

vppinfra: fix cpu flag string overflow

Browse Source 
Type: fix

Change-Id: Idb1fff8a172034044bb33d5b271a84d1fd672ef5
Signed-off-by: Benoît Ganne <bganne@cisco.com>
(cherry picked from commit a7cb357491bc8adeac23a329685e8ea9aa2d2f33)
This commit is contained in:
Benoît Ganne 2019-12-16 16:00:14 +01:00 committed by Andrew Yourtchenko
parent 6051aa4924
commit 280079fb99
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/vppinfra/cpu.c
View File

@ -183,12 +183,10 @@ format_cpu_model_name (u8 * s, va_list * args)
static inline char const *
flag_skip_prefix (char const *flag)
flag_skip_prefix (char const *flag, const char *pfx, int len)
{
if (memcmp (flag, "x86_", sizeof ("x86_") - 1) == 0)
return flag + sizeof ("x86_") - 1;
if (memcmp (flag, "aarch64_", sizeof ("aarch64_") - 1) == 0)
return flag + sizeof ("aarch64_") - 1;
if (0 == strncmp (flag, pfx, len - 1))
return flag + len - 1;
return flag;
}
@ -198,13 +196,13 @@ format_cpu_flags (u8 * s, va_list * args)
#if defined(__x86_64__)
#define _(flag, func, reg, bit) \
if (clib_cpu_supports_ ## flag()) \
s = format (s, "%s ", flag_skip_prefix(#flag));
s = format (s, "%s ", flag_skip_prefix(#flag, "x86_", sizeof("x86_")));
foreach_x86_64_flags return s;
#undef _
#elif defined(__aarch64__)
#define _(flag, bit) \
if (clib_cpu_supports_ ## flag()) \
s = format (s, "%s ", flag_skip_prefix(#flag));
s = format (s, "%s ", flag_skip_prefix(#flag, "aarch64_", sizeof("aarch64_")));
foreach_aarch64_flags return s;
#undef _
#else /* ! ! __x86_64__ && ! __aarch64__ */