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

!1624 Backport 5.10.163 LTS patches from upstream 

Merge Pull Request from: @hitmoon 
 
issue: https://gitee.com/openeuler/kernel/issues/I7PJ9N

Backport 5.10.163 LTS patches from upstream

Conflicts(5):
d5b227f0d28d: ima: Fix fall-through warnings for Clang
9620f8a5c72f: ARM: renumber bits related to _TIF_WORK_MASK
60d4383c1bda: mm/highmem: Lift memcpy_[to|from]_page to core
4c363e2961cd: ext4: use kmemdup() to replace kmalloc + memcpy
b57d7b1dcda1: efi: random: combine bootloader provided RNG seed with RNG protocol output

Already merged(59):
c61650b869e0 libbpf: Fix use-after-free in btf_dump_name_dups
85b297d7986c libbpf: Fix null-pointer dereference in find_prog_by_sec_insn()
c4b035b1f036 ima: Handle -ESTALE returned by ima_filter_rule_match()
f9d19f3a044c media: vivid: fix compose size exceed boundary
559891d430e3 media: dvb-usb: az6027: fix null-ptr-deref in az6027_i2c_xfer()
28e4a763cd4a bpf, sockmap: Fix repeated calls to sock_put() when msg has more_data
c58df40e3e67 bpf, sockmap: Fix data loss caused by using apply_bytes on ingress redirect
be719496ae6a bpf, sockmap: fix race in sock_map_free()
ed97ade655ea crypto: hisilicon/qm - add missing pci_dev_put() in q_num_set()
8b5f1af3352a RDMA/hns: Fix ext_sge num error when post send
164fa80330a8 RDMA/hns: fix memory leak in hns_roce_alloc_mr()
83b2c33b53b2 RDMA/hns: Fix PBL page MTR find
0f67ed565f20 misc: sgi-gru: fix use-after-free error in gru_set_context_option, gru_fault and gru_handle_user_call_os
50aaa6b1742c genirq: Add IRQF_NO_AUTOEN for request_irq/nmi()
9ac541a0898e i2c: ismt: Fix an out-of-bounds bug in ismt_access()
490b233677de dmaengine: idxd: Fix crc_val field for completion record
67349025f00d net: switch to storing KCOV handle directly in sk_buff
4794d07fe635 net: add inline function skb_csum_is_sctp
ae5d96bae3cc net: igc: use skb_csum_is_sctp instead of protocol check
648cdb8bf376 drm/amd/display: prevent memory leak
6d935a02658b bpf: make sure skb->len != 0 when redirecting to a tunneling device
10d713532ffc md/raid1: stop mdx_raid1 thread when raid1 array run failed
148dcbd3af03 ppp: associate skb with a device at tx
329a76635548 bpf: Prevent decl_tag from being referenced in func_proto arg
7691fa41024e ima: Simplify ima_lsm_copy_rule
740c537f52c1 ovl: fix use inode directly in rcu-walk mode
c2137d565ceb net/af_packet: add VLAN support for AF_PACKET SOCK_RAW GSO
25dbd87379f8 net/af_packet: make sure to pull mac header
7e3757806973 dm thin: Fix ABBA deadlock between shrink_slab and dm_pool_abort_metadata
94f01ecc2aa0 dm thin: Use last transaction's pmd->root when commit failed
43dd254853aa KVM: nVMX: Inject #GP, not #UD, if "generic" VMXON CR0/CR4 check fails
b677629caebb x86/microcode/intel: Do not retry microcode reloading on the APs
3df07728abde media: dvb-core: Fix UAF due to refcount races at releasing
bfe1e039a0fd ima: Fix a potential NULL pointer access in ima_restore_measurement_list
439cbbc15195 drm/vmwgfx: Validate the box size for the snooped cursor
7223d5e75f26 ext4: fix use-after-free in ext4_orphan_cleanup
c0a738875c2e ext4: add EXT4_IGET_BAD flag to prevent unexpected bad inode
20af66617eef ext4: add helper to check quota inums
98004f926d27 ext4: fix bug_on in __es_tree_search caused by bad quota inode
71e99ec1315f ext4: fix bug_on in __es_tree_search caused by bad boot loader inode
95eaa8a95358 ext4: move functions in super.c
adfefe804b1f ext4: simplify ext4 error translation
4226ce95a934 net: hns3: add interrupts re-initialization while doing VF FLR
5f65f48516bf net: sched: atm: dont intepret cls results when asked to drop
b2c917e510e5 net: sched: cbq: dont intepret cls results when asked to drop
67e39c4f4cb3 x86/bugs: Flush IBP in ib_prctl_set()
9f7bc28a6b8a net: sched: disallow noqueue for qdisc classes
f8ed0a93b5d5 net/ulp: prevent ULP without clone op from entering the LISTEN status
df02234e6b87 ALSA: pcm: Move rwsem lock inside snd_ctl_elem_read to prevent UAF
0e6fbc566fcc ext4: remove EA inode entry from mbcache on inode eviction
4cc218e217bf ext4: unindent codeblock in ext4_xattr_block_set()
1a56cd972ce1 ext4: fix race when reusing xattr blocks
fb59d12ae7f9 mbcache: don't reclaim used entries
27c08673978e mbcache: add functions to delete entry if unused
15ca14894018 RDMA/hns: Fix page size cap from firmware
cc5e9153586a RDMA/hns: Repacing 'dseg_len' by macros in fill_ext_sge_inl_data()
c84d1ca2285b dm thin: resume even if in FAIL mode
f5d8738fbe33 nvme-pci: fix doorbell buffer value endianness
dfb6d54893d5 nvme-pci: fix mempool alloc size


Rejected(1):
b314f6c35121: net: sched: fix memory leak in tcindex_set_parms

Kabi broken(1):
037db10e3f93: net: add atomic_long_t to net_device_stats fields

Total patches: 786 - 59 - 1 - 1 = 725
 
 
Link:https://gitee.com/openeuler/kernel/pulls/1624

 

Reviewed-by: default avatarsanglipeng <sanglipeng1@jd.com>
Signed-off-by: default avatarJialin Zhang <zhangjialin11@huawei.com>
parents 141542da 9458e4e6

Documentation/devicetree/bindings/sound/qcom,wcd9335.txt

+1 −1
Original line number Diff line number Diff line
@@ -109,7 +109,7 @@ audio-codec@1{ 
	reg  = <1 0>;

	interrupts = <&msmgpio 54 IRQ_TYPE_LEVEL_HIGH>;

	interrupt-names = "intr2"

	reset-gpios = <&msmgpio 64 0>;

	reset-gpios = <&msmgpio 64 GPIO_ACTIVE_LOW>;

	slim-ifc-dev  = <&wc9335_ifd>;

	clock-names = "mclk", "native";

	clocks = <&rpmcc RPM_SMD_DIV_CLK1>,

Documentation/driver-api/spi.rst

+2 −2
Original line number Diff line number Diff line
@@ -25,8 +25,8 @@ hardware, which may be as simple as a set of GPIO pins or as complex as 
a pair of FIFOs connected to dual DMA engines on the other side of the

SPI shift register (maximizing throughput). Such drivers bridge between

whatever bus they sit on (often the platform bus) and SPI, and expose

the SPI side of their device as a :c:type:`struct spi_master

<spi_master>`. SPI devices are children of that master,

the SPI side of their device as a :c:type:`struct spi_controller

<spi_controller>`. SPI devices are children of that master,

represented as a :c:type:`struct spi_device <spi_device>` and

manufactured from :c:type:`struct spi_board_info

<spi_board_info>` descriptors which are usually provided by

Documentation/fault-injection/fault-injection.rst

+9 −7
Original line number Diff line number Diff line
@@ -78,8 +78,8 @@ configuration of fault-injection capabilities. 


- /sys/kernel/debug/fail*/times:



	specifies how many times failures may happen at most.

	A value of -1 means "no limit".

	specifies how many times failures may happen at most. A value of -1

	means "no limit".



- /sys/kernel/debug/fail*/space:
@@ -167,11 +167,13 @@ configuration of fault-injection capabilities. 
	- ERRNO: retval must be -1 to -MAX_ERRNO (-4096).

	- ERR_NULL: retval must be 0 or -1 to -MAX_ERRNO (-4096).



- /sys/kernel/debug/fail_function/<functiuon-name>/retval:

- /sys/kernel/debug/fail_function/<function-name>/retval:



	specifies the "error" return value to inject to the given

	function for given function. This will be created when

	user specifies new injection entry.

	specifies the "error" return value to inject to the given function.

	This will be created when the user specifies a new injection entry.

	Note that this file only accepts unsigned values. So, if you want to

	use a negative errno, you better use 'printf' instead of 'echo', e.g.:

	$ printf %#x -12 > retval



Boot option

^^^^^^^^^^^
@@ -336,7 +338,7 @@ Application Examples 
    FAILTYPE=fail_function

    FAILFUNC=open_ctree

    echo $FAILFUNC > /sys/kernel/debug/$FAILTYPE/inject

    echo -12 > /sys/kernel/debug/$FAILTYPE/$FAILFUNC/retval

    printf %#x -12 > /sys/kernel/debug/$FAILTYPE/$FAILFUNC/retval

    echo N > /sys/kernel/debug/$FAILTYPE/task-filter

    echo 100 > /sys/kernel/debug/$FAILTYPE/probability

    echo 0 > /sys/kernel/debug/$FAILTYPE/interval

MAINTAINERS

+1 −1
Original line number Diff line number Diff line
@@ -7293,7 +7293,7 @@ F: Documentation/locking/*futex* 
F:	include/asm-generic/futex.h

F:	include/linux/futex.h

F:	include/uapi/linux/futex.h

F:	kernel/futex.c

F:	kernel/futex/*

F:	tools/perf/bench/futex*

F:	tools/testing/selftests/futex/
































Makefile



+40
−63






























Original line number
Diff line number
Diff line







@@ -1441,7 +1441,6 @@ endif

















PHONY += modules









modules: $(if $(KBUILD_BUILTIN),vmlinux) modules_check modules_prepare









	$(Q)$(MAKE) -f $(srctree)/scripts/Makefile.modpost



















PHONY += modules_check









modules_check: modules.order








@@ -1459,12 +1458,9 @@ PHONY += modules_prepare







modules_prepare: prepare









	$(Q)$(MAKE) $(build)=scripts scripts/module.lds



















# Target to install modules









PHONY += modules_install









modules_install: _modinst_ _modinst_post



















PHONY += _modinst_









_modinst_:









modules_install: __modinst_pre









PHONY += __modinst_pre









__modinst_pre:









	@rm -rf $(MODLIB)/kernel









	@rm -f $(MODLIB)/source









	@mkdir -p $(MODLIB)/kernel








@@ -1476,14 +1472,6 @@ _modinst_:







	@sed 's:^:kernel/:' modules.order > $(MODLIB)/modules.order









	@cp -f modules.builtin $(MODLIB)/









	@cp -f $(objtree)/modules.builtin.modinfo $(MODLIB)/









	$(Q)$(MAKE) -f $(srctree)/scripts/Makefile.modinst



















# This depmod is only for convenience to give the initial









# boot a modules.dep even before / is mounted read-write.  However the









# boot script depmod is the master version.









PHONY += _modinst_post









_modinst_post: _modinst_









	$(call cmd,depmod)



















ifeq ($(CONFIG_MODULE_SIG), y)









PHONY += modules_sign








@@ -1491,20 +1479,6 @@ modules_sign:







	$(Q)$(MAKE) -f $(srctree)/scripts/Makefile.modsign









endif



















else # CONFIG_MODULES



















# Modules not configured









# ---------------------------------------------------------------------------



















PHONY += modules modules_install









modules modules_install:









	@echo >&2









	@echo >&2 "The present kernel configuration has modules disabled."









	@echo >&2 "Type 'make config' and enable loadable module support."









	@echo >&2 "Then build a kernel with module support enabled."









	@echo >&2









	@exit 1



















endif # CONFIG_MODULES



















###








@@ -1752,26 +1726,9 @@ KBUILD_BUILTIN :=







KBUILD_MODULES := 1



















build-dirs := $(KBUILD_EXTMOD)









PHONY += modules









modules: $(MODORDER)









	$(Q)$(MAKE) -f $(srctree)/scripts/Makefile.modpost



















$(MODORDER): descend









	@:



















PHONY += modules_install









modules_install: _emodinst_ _emodinst_post



















install-dir := $(if $(INSTALL_MOD_DIR),$(INSTALL_MOD_DIR),extra)









PHONY += _emodinst_









_emodinst_:









	$(Q)mkdir -p $(MODLIB)/$(install-dir)









	$(Q)$(MAKE) -f $(srctree)/scripts/Makefile.modinst



















PHONY += _emodinst_post









_emodinst_post: _emodinst_









	$(call cmd,depmod)



















compile_commands.json: $(extmod-prefix)compile_commands.json









PHONY += compile_commands.json


















@@ -1794,6 +1751,41 @@ PHONY += prepare modules_prepare

















endif # KBUILD_EXTMOD



















# ---------------------------------------------------------------------------









# Modules



















PHONY += modules modules_install



















ifdef CONFIG_MODULES



















modules: $(MODORDER)









	$(Q)$(MAKE) -f $(srctree)/scripts/Makefile.modpost



















quiet_cmd_depmod = DEPMOD  $(KERNELRELEASE)









      cmd_depmod = $(CONFIG_SHELL) $(srctree)/scripts/depmod.sh $(DEPMOD) \









                   $(KERNELRELEASE)



















modules_install:









	$(Q)$(MAKE) -f $(srctree)/scripts/Makefile.modinst









	$(call cmd,depmod)



















else # CONFIG_MODULES



















# Modules not configured









# ---------------------------------------------------------------------------



















modules modules_install:









	@echo >&2 '***'









	@echo >&2 '*** The present kernel configuration has modules disabled.'









	@echo >&2 '*** To use the module feature, please run "make menuconfig" etc.'









	@echo >&2 '*** to enable CONFIG_MODULES.'









	@echo >&2 '***'









	@exit 1



















KBUILD_MODULES :=



















endif # CONFIG_MODULES



















# Single targets









# ---------------------------------------------------------------------------









# To build individual files in subdirectories, you can do like this:








@@ -1817,18 +1809,12 @@ $(single-ko): single_modpost







$(single-no-ko): descend









	@:



















ifeq ($(KBUILD_EXTMOD),)









# For the single build of in-tree modules, use a temporary file to avoid









# the situation of modules_install installing an invalid modules.order.









MODORDER := .modules.tmp









endif



















# Remove MODORDER when done because it is not the real one.









PHONY += single_modpost









single_modpost: $(single-no-ko) modules_prepare









	$(Q){ $(foreach m, $(single-ko), echo $(extmod-prefix)$m;) } > $(MODORDER)









	$(Q)$(MAKE) -f $(srctree)/scripts/Makefile.modpost



















KBUILD_MODULES := 1









	$(Q)rm -f $(MODORDER)



















export KBUILD_SINGLE_TARGETS := $(addprefix $(extmod-prefix), $(single-no-ko))


















@@ -1838,10 +1824,6 @@ build-dirs := $(foreach d, $(build-dirs), \

















endif



















ifndef CONFIG_MODULES









KBUILD_MODULES :=









endif



















# Handle descending into subdirectories listed in $(build-dirs)









# Preset locale variables to speed up the build process. Limit locale









# tweaks to this spot to avoid wrong language settings when running








@@ -1981,11 +1963,6 @@ tools/%: FORCE







quiet_cmd_rmfiles = $(if $(wildcard $(rm-files)),CLEAN   $(wildcard $(rm-files)))









      cmd_rmfiles = rm -rf $(rm-files)



















# Run depmod only if we have System.map and depmod is executable









quiet_cmd_depmod = DEPMOD  $(KERNELRELEASE)









      cmd_depmod = $(CONFIG_SHELL) $(srctree)/scripts/depmod.sh $(DEPMOD) \









                   $(KERNELRELEASE)



















# read saved command lines for existing targets









existing-targets := $(wildcard $(sort $(targets)))