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

!10657 [openEuler-24.03-LTS][linux-6.6.y sync] Backport 6.6.40-6.6.44 LTS Patches 

Merge Pull Request from: @anred 
 
```
git log --oneline v6.6.40..v6.6.44 | wc -l
841
```
787 + 39 + 15 = 841
Merged commits(39)
```
e22ea60d2cab RDMA/hns: Fix insufficient extend DB for VFs.
7bf1e00d9516 RDMA/hns: Fix undifined behavior caused by invalid max_sge
b47c078787d9 RDMA/hns: Fix shift-out-bounds when max_inline_data is 0
4d480e45cb7f RDMA/hns: Fix missing pagesize and alignment check in FRMR
f098ad96ebb0 RDMA/hns: Fix unmatch exception handling when init eq table fails
72bbfe07f7ea RDMA/hns: Check atomic wr length
f543af2e0a6d media: dvb-usb: Fix unexpected infinite loop in dvb_usb_read_remote_control()
9d40fd516aea bpf: Fix null pointer dereference in resolve_prog_type() for BPF_PROG_TYPE_EXT
aa6a5704cab8 tap: add missing verification for short frame
d5ad89b7d01e tun: add missing verification for short frame
73ae349534eb filelock: Fix fcntl/close race recovery compat path
6ae7265a7b81 fs/ntfs3: Validate ff offset
f3124d51e4e7 fs/ntfs3: Add a check for attr_names and oatbl
4edb0a84e6b3 drm/amdgpu: Fix signedness bug in sdma_v4_0_process_trap_irq()
b0fc1bd2514b Bluetooth: L2CAP: Fix deadlock
b803f30ea23e bluetooth/l2cap: sync sock recv cb and release
d6cbce183706 Bluetooth: hci_core: cancel all works upon hci_unregister_dev()
f23c3d1ca9c4 powerpc/eeh: avoid possible crash when edev->pdev changes
1a13bf4d6a75 ASoC: topology: Do not assign fields that are already set
ab5a6208b4d6 ASoC: topology: Fix references to freed memory
fe9644efd867 wifi: cfg80211: wext: add extra SIOCSIWSCAN data check
7c6ec0827cfe cachefiles: make on-demand read killable
c32ee78fbc67 cachefiles: Set object to close if ondemand_id < 0 in copen
36d845ccd7bf cachefiles: add consistency check for copen/cread
b98090699319 NFSv4: Fix memory leak in nfs4_set_security_label
08f03186b96e null_blk: fix validation of block size
69a978c7fe2f arm64: armv8_deprecated: Fix warning in isndep cpuhp starting process
dfcdd7f89e40 tcp: avoid too many retransmit packets
b75f281bddeb tcp: use signed arithmetic in tcp_rtx_probe0_timed_out()
392cff2f86a2 firmware: cs_dsp: Use strnlen() on name fields in V1 wmfw files
9c9877a96e03 firmware: cs_dsp: Fix overflow checking of wmfw header
799a34901b63 net/sched: Fix UAF when resolving a clash
c5fd77ca13d6 udp: Set SOCK_RCU_FREE earlier in udp_lib_get_port().
099502ca4109 ppp: reject claimed-as-LCP but actually malformed packets
9d23909ae041 net: ethernet: lantiq_etop: fix double free in detach
b180739b45a3 skmsg: Skip zero length skb in sk_msg_recvmsg
230bb13650b0 bpf: Fix too early release of tcx_entry
432b06b69d1d filelock: fix potential use-after-free in posix_lock_inode
189438643427 cachefiles: narrow the scope of triggering EPOLLIN events in ondemand mode
```
conflicts commits(15)
```
721391060066 Linux 6.6.44
6d98741dbd13 ASoC: TAS2781: Fix tasdev_load_calibrated_data()
104e258a0040 perf: Fix event leak upon exec and file release
e22b88f234a1 PCI: loongson: Enable MSI in LS7A Root Complex
8fe6e8cb5fba sbitmap: fix io hung due to race on sbitmap_word::cleared
878c90b54b83 xfrm: Export symbol xfrm_dev_state_delete.
d5f53edd43da xfrm: Fix unregister netdevice hang on hardware offload.
96226fbed566 cgroup/cpuset: Prevent UAF in proc_cpuset_show()
aea95c68b745 kernfs: Convert kernfs_path_from_node_locked() from strlcpy() to strscpy()
58b0425ff5df Linux 6.6.43
31cf7ebee80a Linux 6.6.42
2eaf5c0d8191 Linux 6.6.41
448a2500d171 sched: Move psi_account_irqtime() out of update_rq_clock_task() hotpath
7e9092d7ac2d net: fix rc7's __skb_datagram_iter()
f476dffc52ea vfio/pci: Init the count variable in collecting hot-reset devices
``` 
 
Link:https://gitee.com/openeuler/kernel/pulls/10657

 

Reviewed-by: default avatarZheng Zengkai <zhengzengkai@huawei.com>
Signed-off-by: default avatarZheng Zengkai <zhengzengkai@huawei.com>
parents 46dd005d 3f3706ab

Documentation/admin-guide/cifs/usage.rst

+11 −25
Original line number Diff line number Diff line
@@ -722,40 +722,26 @@ Configuration pseudo-files: 
======================= =======================================================

SecurityFlags		Flags which control security negotiation and

			also packet signing. Authentication (may/must)

			flags (e.g. for NTLM and/or NTLMv2) may be combined with

			flags (e.g. for NTLMv2) may be combined with

			the signing flags.  Specifying two different password

			hashing mechanisms (as "must use") on the other hand

			does not make much sense. Default flags are::



				0x07007



			(NTLM, NTLMv2 and packet signing allowed).  The maximum

			allowable flags if you want to allow mounts to servers

			using weaker password hashes is 0x37037 (lanman,

			plaintext, ntlm, ntlmv2, signing allowed).  Some

			SecurityFlags require the corresponding menuconfig

			options to be enabled.  Enabling plaintext

			authentication currently requires also enabling

			lanman authentication in the security flags

			because the cifs module only supports sending

			laintext passwords using the older lanman dialect

			form of the session setup SMB.  (e.g. for authentication

			using plain text passwords, set the SecurityFlags

			to 0x30030)::

				0x00C5



			(NTLMv2 and packet signing allowed).  Some SecurityFlags

			may require enabling a corresponding menuconfig option.



			  may use packet signing			0x00001

			  must use packet signing			0x01001

			  may use NTLM (most common password hash)	0x00002

			  must use NTLM					0x02002

			  may use NTLMv2				0x00004

			  must use NTLMv2				0x04004

			  may use Kerberos security			0x00008

			  may use Kerberos security (krb5)		0x00008

			  must use Kerberos                             0x08008

			  may use lanman (weak) password hash		0x00010

			  must use lanman password hash			0x10010

			  may use plaintext passwords			0x00020

			  must use plaintext passwords			0x20020

			  (reserved for future packet encryption)	0x00040

			  may use NTLMSSP               		0x00080

			  must use NTLMSSP           			0x80080

			  seal (packet encryption)			0x00040

			  must seal (not implemented yet)               0x40040



cifsFYI			If set to non-zero value, additional debug information

			will be logged to the system error log.  This field

Documentation/cdrom/cdrom-standard.rst

+2 −2
Original line number Diff line number Diff line
@@ -217,7 +217,7 @@ current *struct* is:: 
		int (*media_changed)(struct cdrom_device_info *, int);

		int (*tray_move)(struct cdrom_device_info *, int);

		int (*lock_door)(struct cdrom_device_info *, int);

		int (*select_speed)(struct cdrom_device_info *, int);

		int (*select_speed)(struct cdrom_device_info *, unsigned long);

		int (*get_last_session) (struct cdrom_device_info *,

					 struct cdrom_multisession *);

		int (*get_mcn)(struct cdrom_device_info *, struct cdrom_mcn *);
@@ -396,7 +396,7 @@ action need be taken, and the return value should be 0. 


::



	int select_speed(struct cdrom_device_info *cdi, int speed)

	int select_speed(struct cdrom_device_info *cdi, unsigned long speed)



Some CD-ROM drives are capable of changing their head-speed. There

are several reasons for changing the speed of a CD-ROM drive. Badly

Documentation/devicetree/bindings/thermal/thermal-zones.yaml

+4 −1
Original line number Diff line number Diff line
@@ -49,7 +49,10 @@ properties: 
      to take when the temperature crosses those thresholds.



patternProperties:

  "^[a-zA-Z][a-zA-Z0-9\\-]{1,12}-thermal$":

  # Node name is limited in size due to Linux kernel requirements - 19

  # characters in total (see THERMAL_NAME_LENGTH, including terminating NUL

  # byte):

  "^[a-zA-Z][a-zA-Z0-9\\-]{1,10}-thermal$":

    type: object

    description:

      Each thermal zone node contains information about how frequently it

arch/arm/boot/dts/allwinner/Makefile

+0 −62
Original line number Diff line number Diff line
@@ -259,68 +259,6 @@ dtb-$(CONFIG_MACH_SUN8I) += \ 
	sun8i-v3s-licheepi-zero.dtb \

	sun8i-v3s-licheepi-zero-dock.dtb \

	sun8i-v40-bananapi-m2-berry.dtb

dtb-$(CONFIG_MACH_SUN8I) += \

	sun8i-a23-evb.dtb \

	sun8i-a23-gt90h-v4.dtb \

	sun8i-a23-inet86dz.dtb \

	sun8i-a23-ippo-q8h-v5.dtb \

	sun8i-a23-ippo-q8h-v1.2.dtb \

	sun8i-a23-polaroid-mid2407pxe03.dtb \

	sun8i-a23-polaroid-mid2809pxe04.dtb \

	sun8i-a23-q8-tablet.dtb \

	sun8i-a33-et-q8-v1.6.dtb \

	sun8i-a33-ga10h-v1.1.dtb \

	sun8i-a33-inet-d978-rev2.dtb \

	sun8i-a33-ippo-q8h-v1.2.dtb \

	sun8i-a33-olinuxino.dtb \

	sun8i-a33-q8-tablet.dtb \

	sun8i-a33-sinlinx-sina33.dtb \

	sun8i-a83t-allwinner-h8homlet-v2.dtb \

	sun8i-a83t-bananapi-m3.dtb \

	sun8i-a83t-cubietruck-plus.dtb \

	sun8i-a83t-tbs-a711.dtb \

	sun8i-h2-plus-bananapi-m2-zero.dtb \

	sun8i-h2-plus-libretech-all-h3-cc.dtb \

	sun8i-h2-plus-orangepi-r1.dtb \

	sun8i-h2-plus-orangepi-zero.dtb \

	sun8i-h3-bananapi-m2-plus.dtb \

	sun8i-h3-bananapi-m2-plus-v1.2.dtb \

	sun8i-h3-beelink-x2.dtb \

	sun8i-h3-libretech-all-h3-cc.dtb \

	sun8i-h3-mapleboard-mp130.dtb \

	sun8i-h3-nanopi-duo2.dtb \

	sun8i-h3-nanopi-m1.dtb\

	\

	sun8i-h3-nanopi-m1-plus.dtb \

	sun8i-h3-nanopi-neo.dtb \

	sun8i-h3-nanopi-neo-air.dtb \

	sun8i-h3-nanopi-r1.dtb \

	sun8i-h3-orangepi-2.dtb \

	sun8i-h3-orangepi-lite.dtb \

	sun8i-h3-orangepi-one.dtb \

	sun8i-h3-orangepi-pc.dtb \

	sun8i-h3-orangepi-pc-plus.dtb \

	sun8i-h3-orangepi-plus.dtb \

	sun8i-h3-orangepi-plus2e.dtb \

	sun8i-h3-orangepi-zero-plus2.dtb \

	sun8i-h3-rervision-dvk.dtb \

	sun8i-h3-zeropi.dtb \

	sun8i-h3-emlid-neutis-n5h3-devboard.dtb \

	sun8i-r16-bananapi-m2m.dtb \

	sun8i-r16-nintendo-nes-classic.dtb \

	sun8i-r16-nintendo-super-nes-classic.dtb \

	sun8i-r16-parrot.dtb \

	sun8i-r40-bananapi-m2-ultra.dtb \

	sun8i-r40-oka40i-c.dtb \

	sun8i-s3-elimo-initium.dtb \

	sun8i-s3-lichee-zero-plus.dtb \

	sun8i-s3-pinecube.dtb \

	sun8i-t113s-mangopi-mq-r-t113.dtb \

	sun8i-t3-cqa3t-bv3.dtb \

	sun8i-v3-sl631-imx179.dtb \

	sun8i-v3s-licheepi-zero.dtb \

	sun8i-v3s-licheepi-zero-dock.dtb \

	sun8i-v40-bananapi-m2-berry.dtb

dtb-$(CONFIG_MACH_SUN9I) += \

	sun9i-a80-optimus.dtb \

	sun9i-a80-cubieboard4.dtb

arch/arm/boot/dts/nxp/imx/imx6q-kontron-samx6i.dtsi

+0 −23
Original line number Diff line number Diff line
@@ -5,31 +5,8 @@ 


#include "imx6q.dtsi"

#include "imx6qdl-kontron-samx6i.dtsi"

#include <dt-bindings/gpio/gpio.h>



/ {

	model = "Kontron SMARC sAMX6i Quad/Dual";

	compatible = "kontron,imx6q-samx6i", "fsl,imx6q";

};
 


/* Quad/Dual SoMs have 3 chip-select signals */

&ecspi4 {

	cs-gpios = <&gpio3 24 GPIO_ACTIVE_LOW>,

		   <&gpio3 29 GPIO_ACTIVE_LOW>,

		   <&gpio3 25 GPIO_ACTIVE_LOW>;

};



&pinctrl_ecspi4 {

	fsl,pins = <

		MX6QDL_PAD_EIM_D21__ECSPI4_SCLK 0x100b1

		MX6QDL_PAD_EIM_D28__ECSPI4_MOSI 0x100b1

		MX6QDL_PAD_EIM_D22__ECSPI4_MISO 0x100b1



		/* SPI4_IMX_CS2# - connected to internal flash */

		MX6QDL_PAD_EIM_D24__GPIO3_IO24 0x1b0b0

		/* SPI4_IMX_CS0# - connected to SMARC SPI0_CS0# */

		MX6QDL_PAD_EIM_D29__GPIO3_IO29 0x1b0b0

		/* SPI4_CS3# - connected to  SMARC SPI0_CS1# */

		MX6QDL_PAD_EIM_D25__GPIO3_IO25 0x1b0b0

	>;

};