Commit bd3c6fdb authored by Borislav Petkov (AMD)'s avatar Borislav Petkov (AMD) Committed by Jialin Zhang
Browse files

x86/bugs: Increase the x86 bugs vector size to two u32s 

stable inclusion
from stable-v5.10.189
commit 073a28a9b50662991e7d6956c2cf2fc5d54f28cd
category: bugfix
bugzilla: https://gitee.com/src-openeuler/kernel/issues/I7RQ67
CVE: CVE-2023-20569

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=073a28a9b50662991e7d6956c2cf2fc5d54f28cd



--------------------------------

Upstream commit: 0e52740f

There was never a doubt in my mind that they would not fit into a single
u32 eventually.

Signed-off-by: default avatarBorislav Petkov (AMD) <bp@alien8.de>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>

 Conflicts:
	arch/x86/include/asm/cpufeatures.h
	tools/arch/x86/include/asm/cpufeatures.h

Signed-off-by: default avatarJialin Zhang <zhangjialin11@huawei.com>
parent c8ba64d2

arch/x86/include/asm/cpufeatures.h

+1 −1
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ 
 * Defines x86 CPU feature bits

 */

#define NCAPINTS			19     /* N 32-bit words worth of info */

#define NBUGINTS			1	   /* N 32-bit bug flags */

#define NBUGINTS			2	   /* N 32-bit bug flags */



/*

 * Note: If the comment begins with a quoted string, that string is used

tools/arch/x86/include/asm/cpufeatures.h

+1 −1
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ 
 * Defines x86 CPU feature bits

 */

#define NCAPINTS			19	   /* N 32-bit words worth of info */

#define NBUGINTS			1	   /* N 32-bit bug flags */

#define NBUGINTS			2	   /* N 32-bit bug flags */



/*

 * Note: If the comment begins with a quoted string, that string is used