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

!4600 Backport 5.10.190 LTS patches from upstream 

Merge Pull Request from: @sanglipeng 
 
https://gitee.com/openeuler/kernel/issues/I928UI


Conflicts:
Already merged(16):
ab5a97a94b57 netfilter: nf_tables: skip immediate deactivate in _PREPARE_ERROR
b4256c99a711 net/sched: cls_u32: No longer copy tcf_result on update to avoid use-after-free
a8d478200b10 net/sched: cls_fw: No longer copy tcf_result on update to avoid use-after-free
aaa71c4e8ad9 net/sched: cls_route: No longer copy tcf_result on update to avoid use-after-free
5ea23f1cb67e net: tun_chr_open(): set sk_uid from current_fsuid()
33a339e717be net: tap_open(): set sk_uid from current_fsuid()
c9c78b91c783 open: make RESOLVE_CACHED correctly test for O_TMPFILE
06f87c96216b Bluetooth: L2CAP: Fix use-after-free in l2cap_sock_ready_cb
381f7df0f3c3 exfat: check if filename entries exceeds max filename length
b6fc2fbf8908 x86/CPU/AMD: Do not leak quotient data after a division by 0
076f786f0414 net: hns3: fix wrong bw weight of disabled tc issue
0cd74fbd3b83 tcp: Reduce chance of collisions in inet6_hashfn().
308a43f1521d netfilter: nf_tables: disallow rule addition to bound chain via NFTA_RULE_CHAIN_ID
a6d2fd1703cd tracing: Fix warning in trace_buffered_event_disable()
c08de20e7041 selftests/rseq: check if libc rseq support is registered
832a4d4cdb3f loop: Select I/O scheduler 'none' from inside add_disk()

Rejected(6):
344b7c000398 net: hns3: reconstruct function hclge_ets_validate()
ba7d1dae9fe8 x86/kprobes: Use int3 instead of debug trap for single-step
2b5afe25f5b6 x86/kprobes: Fix to identify indirect jmp and others using range case
f07f3938c813 x86/kprobes: Move 'inline' to the beginning of the kprobe_is_ss() declaration
edc2ac7c7265 x86/kprobes: Update kcb status flag after singlestepping
058c0cbd251a x86/kprobes: Fix JNG/JNLE emulation


Kabi broken(10):
5f6d5b58c59e drm/ttm: add ttm_bo_pin()/ttm_bo_unpin() v2
8996b13051f0 drm/ttm: never consider pinned BOs for eviction&swap
4148f28f9824 drm/ttm: make ttm_bo_unpin more defensive
d39971d902d0 drm/ttm: check null pointer before accessing when swapping
840ce9cfc86f tracing: Show real address for trace event arguments
426656e8dd03 tracing: Fix sleeping while atomic in kdb ftdump
5601d812c8d8 kprobes/x86: Fix fall-through warnings for Clang
ff97a14c8a86 x86/kprobes: Do not decode opcode in resume_execution()
41db23bad952 x86/kprobes: Retrieve correct opcode for group
2c57553a77e1 x86/kprobes: Identify far indirect JMP correctly


Total patches: 202 - 16 - 6 - 10 = 170 
 
Link:https://gitee.com/openeuler/kernel/pulls/4600

 

Reviewed-by: default avatarAichun Shi <aichun.shi@intel.com>
Reviewed-by: default avatarJialin Zhang <zhangjialin11@huawei.com>
Signed-off-by: default avatarJialin Zhang <zhangjialin11@huawei.com>
parents 4ef17653 c234112e

Documentation/admin-guide/security-bugs.rst

+18 −21
Original line number Diff line number Diff line
@@ -63,31 +63,28 @@ information submitted to the security list and any followup discussions 
of the report are treated confidentially even after the embargo has been

lifted, in perpetuity.



Coordination

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



Fixes for sensitive bugs, such as those that might lead to privilege

escalations, may need to be coordinated with the private

<linux-distros@vs.openwall.org> mailing list so that distribution vendors

are well prepared to issue a fixed kernel upon public disclosure of the

upstream fix. Distros will need some time to test the proposed patch and

will generally request at least a few days of embargo, and vendor update

publication prefers to happen Tuesday through Thursday. When appropriate,

the security team can assist with this coordination, or the reporter can

include linux-distros from the start. In this case, remember to prefix

the email Subject line with "[vs]" as described in the linux-distros wiki:

<http://oss-security.openwall.org/wiki/mailing-lists/distros#how-to-use-the-lists>

Coordination with other groups

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



The kernel security team strongly recommends that reporters of potential

security issues NEVER contact the "linux-distros" mailing list until

AFTER discussing it with the kernel security team.  Do not Cc: both

lists at once.  You may contact the linux-distros mailing list after a

fix has been agreed on and you fully understand the requirements that

doing so will impose on you and the kernel community.



The different lists have different goals and the linux-distros rules do

not contribute to actually fixing any potential security problems.



CVE assignment

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



The security team does not normally assign CVEs, nor do we require them

for reports or fixes, as this can needlessly complicate the process and

may delay the bug handling. If a reporter wishes to have a CVE identifier

assigned ahead of public disclosure, they will need to contact the private

linux-distros list, described above. When such a CVE identifier is known

before a patch is provided, it is desirable to mention it in the commit

message if the reporter agrees.

The security team does not assign CVEs, nor do we require them for

reports or fixes, as this can needlessly complicate the process and may

delay the bug handling.  If a reporter wishes to have a CVE identifier

assigned, they should find one by themselves, for example by contacting

MITRE directly.  However under no circumstances will a patch inclusion

be delayed to wait for a CVE identifier to arrive.



Non-disclosure agreements

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

arch/arm/boot/dts/imx6qdl.dtsi

+4 −0
Original line number Diff line number Diff line
@@ -45,6 +45,10 @@ 
		spi1 = &ecspi2;

		spi2 = &ecspi3;

		spi3 = &ecspi4;

		usb0 = &usbotg;

		usb1 = &usbh1;

		usb2 = &usbh2;

		usb3 = &usbh3;

		usbphy0 = &usbphy1;

		usbphy1 = &usbphy2;

	};

arch/arm/boot/dts/imx6sl.dtsi

+3 −0
Original line number Diff line number Diff line
@@ -39,6 +39,9 @@ 
		spi1 = &ecspi2;

		spi2 = &ecspi3;

		spi3 = &ecspi4;

		usb0 = &usbotg1;

		usb1 = &usbotg2;

		usb2 = &usbh;

		usbphy0 = &usbphy1;

		usbphy1 = &usbphy2;

	};

arch/arm/boot/dts/imx6sll.dtsi

+13 −13
Original line number Diff line number Diff line
@@ -36,6 +36,8 @@ 
		spi1 = &ecspi2;

		spi3 = &ecspi3;

		spi4 = &ecspi4;

		usb0 = &usbotg1;

		usb1 = &usbotg2;

		usbphy0 = &usbphy1;

		usbphy1 = &usbphy2;

	};
@@ -49,20 +51,18 @@ 
			device_type = "cpu";

			reg = <0>;

			next-level-cache = <&L2>;

			operating-points = <

			operating-points =

				/* kHz    uV */

				996000  1275000

				792000  1175000

				396000  1075000

				198000	975000

			>;

			fsl,soc-operating-points = <

				<996000  1275000>,

				<792000  1175000>,

				<396000  1075000>,

				<198000	  975000>;

			fsl,soc-operating-points =

				/* ARM kHz      SOC-PU uV */

				996000          1175000

				792000          1175000

				396000          1175000

				198000		1175000

			>;

				<996000         1175000>,

				<792000         1175000>,

				<396000         1175000>,

				<198000		1175000>;

			clock-latency = <61036>; /* two CLK32 periods */

			#cooling-cells = <2>;

			clocks = <&clks IMX6SLL_CLK_ARM>,
@@ -552,7 +552,7 @@ 
				reg = <0x020ca000 0x1000>;

				interrupts = <GIC_SPI 41 IRQ_TYPE_LEVEL_HIGH>;

				clocks = <&clks IMX6SLL_CLK_USBPHY2>;

				phy-reg_3p0-supply = <&reg_3p0>;

				phy-3p0-supply = <&reg_3p0>;

				fsl,anatop = <&anatop>;

			};

arch/arm/boot/dts/imx6sx.dtsi

+3 −0
Original line number Diff line number Diff line
@@ -49,6 +49,9 @@ 
		spi2 = &ecspi3;

		spi3 = &ecspi4;

		spi4 = &ecspi5;

		usb0 = &usbotg1;

		usb1 = &usbotg2;

		usb2 = &usbh;

		usbphy0 = &usbphy1;

		usbphy1 = &usbphy2;

	};