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

!357 Backport CVEs, bugfixes, performance and other 

Merge Pull Request from: @zhangjialin11 
 
Pull new CVEs:
CVE-2023-20928
CVE-2022-4696
CVE-2023-0210
CVE-2022-4842

fs bugfixes from Li Lingfeng, yangerkun and Zhihao Cheng
mm bugfixes from Ye Weihua, Ma Wupeng and Zheng Zucheng
tracing bugfixes from Zheng Yejian
performance from Jialin Zhang
other from Guo Mengqi






 
 
Link:https://gitee.com/openeuler/kernel/pulls/357

 

Reviewed-by: default avatarZheng Zengkai <zhengzengkai@huawei.com>
Signed-off-by: default avatarZheng Zengkai <zhengzengkai@huawei.com>
parents 46f89419 dfeb2b5b

arch/arm64/configs/openeuler_defconfig

+0 −1
Original line number Diff line number Diff line
@@ -3395,7 +3395,6 @@ CONFIG_TCG_TIS_ST33ZP24_I2C=m 
CONFIG_TCG_TIS_ST33ZP24_SPI=m

# CONFIG_XILLYBUS is not set

CONFIG_PIN_MEMORY_DEV=m

CONFIG_HISI_SVM=m

# CONFIG_RANDOM_TRUST_CPU is not set

# CONFIG_RANDOM_TRUST_BOOTLOADER is not set

# end of Character devices

drivers/android/binder.c

+1 −0
Original line number Diff line number Diff line
@@ -6081,6 +6081,7 @@ const struct file_operations binder_fops = { 
	.open = binder_open,

	.flush = binder_flush,

	.release = binder_release,

	.may_pollfree = true,

};



static int __init init_binder_device(const char *name)

drivers/android/binder_alloc.c

+3 −3
Original line number Diff line number Diff line
@@ -212,7 +212,7 @@ static int binder_update_page_range(struct binder_alloc *alloc, int allocate, 
		mm = alloc->vma_vm_mm;



	if (mm) {

		mmap_read_lock(mm);

		mmap_write_lock(mm);

		vma = alloc->vma;

	}
@@ -270,7 +270,7 @@ static int binder_update_page_range(struct binder_alloc *alloc, int allocate, 
		trace_binder_alloc_page_end(alloc, index);

	}

	if (mm) {

		mmap_read_unlock(mm);

		mmap_write_unlock(mm);

		mmput(mm);

	}

	return 0;
@@ -303,7 +303,7 @@ static int binder_update_page_range(struct binder_alloc *alloc, int allocate, 
	}

err_no_vma:

	if (mm) {

		mmap_read_unlock(mm);

		mmap_write_unlock(mm);

		mmput(mm);

	}

	return vma ? -ENOMEM : -ESRCH;

drivers/char/Kconfig

+0 −10
Original line number Diff line number Diff line
@@ -478,16 +478,6 @@ config PIN_MEMORY_DEV 
	help

	  pin memory driver



config HISI_SVM

	tristate "Hisilicon svm driver"

	depends on ARM64 && ARM_SMMU_V3 && MMU_NOTIFIER

	default m

	help

	  This driver provides character-level access to Hisilicon

	  SVM chipset. Typically, you can bind a task to the

	  svm and share the virtual memory with hisilicon svm device.

	  When in doubt, say "N".



config RANDOM_TRUST_CPU

	bool "Initialize RNG using CPU RNG instructions"

	default y

drivers/char/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -48,4 +48,3 @@ obj-$(CONFIG_XILLYBUS) += xillybus/ 
obj-$(CONFIG_POWERNV_OP_PANEL)	+= powernv-op-panel.o

obj-$(CONFIG_ADI)		+= adi.o

obj-$(CONFIG_PIN_MEMORY_DEV)	+= pin_memory.o
 
obj-$(CONFIG_HISI_SVM)		+= svm.o