Unverified Commit 6d789c0c authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!414 Backport CVEs and bugfixes 

Merge Pull Request from: @zhangjialin11 
 
Pull new CVEs:
CVE-2023-0597
CVE-2023-0615

Huawei BMA bugfix from Huajingjing
mm bugfixes from Lu Jialin and Zhang Peng
vfio bugfixes from Kunkun Jiang
net bugfixes from Baisong Zhong, Liu Jian, Ziyang Xuan and Zhengchao Shao
arm32 kaslr bugfix from Cui GaoSheng
fs bugfix from ZhaoLong Wang 
 
Link:https://gitee.com/openeuler/kernel/pulls/414

 

Reviewed-by: default avatarZheng Zengkai <zhengzengkai@huawei.com>
Signed-off-by: default avatarZheng Zengkai <zhengzengkai@huawei.com>
parents 570b6bca c689e357

arch/arm/Makefile

+2 −1
Original line number Diff line number Diff line
@@ -49,7 +49,8 @@ KBUILD_LDFLAGS += -EL 
endif



ifeq ($(CONFIG_RELOCATABLE),y)

KBUILD_CFLAGS		+= -fpic -include $(srctree)/include/linux/hidden.h

KBUILD_CFLAGS		+= -include $(srctree)/include/linux/hidden.h

CFLAGS_KERNEL		+= -fpic

CFLAGS_MODULE		+= -fno-pic

LDFLAGS_vmlinux		+= -pie -shared -Bsymbolic

endif

arch/x86/include/asm/cpu_entry_area.h

+0 −4
Original line number Diff line number Diff line
@@ -130,10 +130,6 @@ struct cpu_entry_area { 
};



#define CPU_ENTRY_AREA_SIZE		(sizeof(struct cpu_entry_area))

#define CPU_ENTRY_AREA_ARRAY_SIZE	(CPU_ENTRY_AREA_SIZE * NR_CPUS)



/* Total size includes the readonly IDT mapping page as well: */

#define CPU_ENTRY_AREA_TOTAL_SIZE	(CPU_ENTRY_AREA_ARRAY_SIZE + PAGE_SIZE)



DECLARE_PER_CPU(struct cpu_entry_area *, cpu_entry_area);

DECLARE_PER_CPU(struct cea_exception_stacks *, cea_exception_stacks);

arch/x86/include/asm/kasan.h

+3 −0
Original line number Diff line number Diff line
@@ -28,9 +28,12 @@ 
#ifdef CONFIG_KASAN

void __init kasan_early_init(void);

void __init kasan_init(void);

void __init kasan_populate_shadow_for_vaddr(void *va, size_t size, int nid);

#else

static inline void kasan_early_init(void) { }

static inline void kasan_init(void) { }

static inline void kasan_populate_shadow_for_vaddr(void *va, size_t size,

						   int nid) { }

#endif



#endif

arch/x86/include/asm/pgtable_areas.h

+7 −1
Original line number Diff line number Diff line
@@ -11,6 +11,12 @@ 


#define CPU_ENTRY_AREA_RO_IDT_VADDR	((void *)CPU_ENTRY_AREA_RO_IDT)



#define CPU_ENTRY_AREA_MAP_SIZE		(CPU_ENTRY_AREA_PER_CPU + CPU_ENTRY_AREA_ARRAY_SIZE - CPU_ENTRY_AREA_BASE)

#ifdef CONFIG_X86_32

#define CPU_ENTRY_AREA_MAP_SIZE		(CPU_ENTRY_AREA_PER_CPU +		\

					 (CPU_ENTRY_AREA_SIZE * NR_CPUS) -	\

					 CPU_ENTRY_AREA_BASE)

#else

#define CPU_ENTRY_AREA_MAP_SIZE		P4D_SIZE

#endif



#endif /* _ASM_X86_PGTABLE_AREAS_H */

arch/x86/kernel/hw_breakpoint.c

+1 −1
Original line number Diff line number Diff line
@@ -266,7 +266,7 @@ static inline bool within_cpu_entry(unsigned long addr, unsigned long end) 


	/* CPU entry erea is always used for CPU entry */

	if (within_area(addr, end, CPU_ENTRY_AREA_BASE,

			CPU_ENTRY_AREA_TOTAL_SIZE))

			CPU_ENTRY_AREA_MAP_SIZE))

		return true;



	/*