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

!1822 Backport 5.10.168 LTS patches from upstream 

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


Conflicts(1):
556959327b19 mm: hugetlb: proc: check for hugetlb shared PMD in /proc/PID/smaps

Already merged(8):
9bd6074e1872 bpf, sockmap: Check for any of tcp_bpf_prots when cloning a listener
dd6991251a13 netrom: Fix use-after-free caused by accept on already connected socket
9758ffe1c07b scsi: iscsi_tcp: Fix UAF during login when accessing the shost ipaddress
55515d7d8743 vc_screen: move load of struct vc_data pointer in vcs_read() to avoid UAF
28d190882ba5 fbcon: Check font dimension limits
30187be29052 mm/swapfile: add cond_resched() in get_swap_pages()
c53f34ec3fbf rds: rds_rm_zerocopy_callback() use list_first_entry()
2b693fe3f760 cifs: Fix use-after-free in rdata->read_into_pages()

Total patches: 132 - 8  = 124 
 
Link:https://gitee.com/openeuler/kernel/pulls/1822

 

Reviewed-by: default avatarsanglipeng <sanglipeng1@jd.com>
Signed-off-by: default avatarJialin Zhang <zhangjialin11@huawei.com>
parents e62dada5 8b8629d4

arch/arm64/boot/dts/amlogic/meson-axg.dtsi

+2 −2
Original line number Diff line number Diff line
@@ -1754,7 +1754,7 @@ 
			sd_emmc_b: sd@5000 {

				compatible = "amlogic,meson-axg-mmc";

				reg = <0x0 0x5000 0x0 0x800>;

				interrupts = <GIC_SPI 217 IRQ_TYPE_EDGE_RISING>;

				interrupts = <GIC_SPI 217 IRQ_TYPE_LEVEL_HIGH>;

				status = "disabled";

				clocks = <&clkc CLKID_SD_EMMC_B>,

					<&clkc CLKID_SD_EMMC_B_CLK0>,
@@ -1766,7 +1766,7 @@ 
			sd_emmc_c: mmc@7000 {

				compatible = "amlogic,meson-axg-mmc";

				reg = <0x0 0x7000 0x0 0x800>;

				interrupts = <GIC_SPI 218 IRQ_TYPE_EDGE_RISING>;

				interrupts = <GIC_SPI 218 IRQ_TYPE_LEVEL_HIGH>;

				status = "disabled";

				clocks = <&clkc CLKID_SD_EMMC_C>,

					<&clkc CLKID_SD_EMMC_C_CLK0>,

arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi

+3 −3
Original line number Diff line number Diff line
@@ -2317,7 +2317,7 @@ 
		sd_emmc_a: sd@ffe03000 {

			compatible = "amlogic,meson-axg-mmc";

			reg = <0x0 0xffe03000 0x0 0x800>;

			interrupts = <GIC_SPI 189 IRQ_TYPE_EDGE_RISING>;

			interrupts = <GIC_SPI 189 IRQ_TYPE_LEVEL_HIGH>;

			status = "disabled";

			clocks = <&clkc CLKID_SD_EMMC_A>,

				 <&clkc CLKID_SD_EMMC_A_CLK0>,
@@ -2329,7 +2329,7 @@ 
		sd_emmc_b: sd@ffe05000 {

			compatible = "amlogic,meson-axg-mmc";

			reg = <0x0 0xffe05000 0x0 0x800>;

			interrupts = <GIC_SPI 190 IRQ_TYPE_EDGE_RISING>;

			interrupts = <GIC_SPI 190 IRQ_TYPE_LEVEL_HIGH>;

			status = "disabled";

			clocks = <&clkc CLKID_SD_EMMC_B>,

				 <&clkc CLKID_SD_EMMC_B_CLK0>,
@@ -2341,7 +2341,7 @@ 
		sd_emmc_c: mmc@ffe07000 {

			compatible = "amlogic,meson-axg-mmc";

			reg = <0x0 0xffe07000 0x0 0x800>;

			interrupts = <GIC_SPI 191 IRQ_TYPE_EDGE_RISING>;

			interrupts = <GIC_SPI 191 IRQ_TYPE_LEVEL_HIGH>;

			status = "disabled";

			clocks = <&clkc CLKID_SD_EMMC_C>,

				 <&clkc CLKID_SD_EMMC_C_CLK0>,

arch/arm64/boot/dts/amlogic/meson-gx.dtsi

+3 −3
Original line number Diff line number Diff line
@@ -595,21 +595,21 @@ 
			sd_emmc_a: mmc@70000 {

				compatible = "amlogic,meson-gx-mmc", "amlogic,meson-gxbb-mmc";

				reg = <0x0 0x70000 0x0 0x800>;

				interrupts = <GIC_SPI 216 IRQ_TYPE_EDGE_RISING>;

				interrupts = <GIC_SPI 216 IRQ_TYPE_LEVEL_HIGH>;

				status = "disabled";

			};



			sd_emmc_b: mmc@72000 {

				compatible = "amlogic,meson-gx-mmc", "amlogic,meson-gxbb-mmc";

				reg = <0x0 0x72000 0x0 0x800>;

				interrupts = <GIC_SPI 217 IRQ_TYPE_EDGE_RISING>;

				interrupts = <GIC_SPI 217 IRQ_TYPE_LEVEL_HIGH>;

				status = "disabled";

			};



			sd_emmc_c: mmc@74000 {

				compatible = "amlogic,meson-gx-mmc", "amlogic,meson-gxbb-mmc";

				reg = <0x0 0x74000 0x0 0x800>;

				interrupts = <GIC_SPI 218 IRQ_TYPE_EDGE_RISING>;

				interrupts = <GIC_SPI 218 IRQ_TYPE_LEVEL_HIGH>;

				status = "disabled";

			};

		};

arch/arm64/boot/dts/freescale/imx8mm-pinfunc.h

+1 −1
Original line number Diff line number Diff line
@@ -601,7 +601,7 @@ 
#define MX8MM_IOMUXC_UART1_RXD_GPIO5_IO22                                   0x234 0x49C 0x000 0x5 0x0

#define MX8MM_IOMUXC_UART1_RXD_TPSMP_HDATA24                                0x234 0x49C 0x000 0x7 0x0

#define MX8MM_IOMUXC_UART1_TXD_UART1_DCE_TX                                 0x238 0x4A0 0x000 0x0 0x0

#define MX8MM_IOMUXC_UART1_TXD_UART1_DTE_RX                                 0x238 0x4A0 0x4F4 0x0 0x0

#define MX8MM_IOMUXC_UART1_TXD_UART1_DTE_RX                                 0x238 0x4A0 0x4F4 0x0 0x1

#define MX8MM_IOMUXC_UART1_TXD_ECSPI3_MOSI                                  0x238 0x4A0 0x000 0x1 0x0

#define MX8MM_IOMUXC_UART1_TXD_GPIO5_IO23                                   0x238 0x4A0 0x000 0x5 0x0

#define MX8MM_IOMUXC_UART1_TXD_TPSMP_HDATA25                                0x238 0x4A0 0x000 0x7 0x0

arch/parisc/kernel/firmware.c

+3 −2
Original line number Diff line number Diff line
@@ -1230,7 +1230,7 @@ static char __attribute__((aligned(64))) iodc_dbuf[4096]; 
 */

int pdc_iodc_print(const unsigned char *str, unsigned count)

{

	unsigned int i;

	unsigned int i, found = 0;

	unsigned long flags;



	for (i = 0; i < count;) {
@@ -1239,6 +1239,7 @@ int pdc_iodc_print(const unsigned char *str, unsigned count) 
			iodc_dbuf[i+0] = '\r';

			iodc_dbuf[i+1] = '\n';

			i += 2;

			found = 1;

			goto print;

		default:

			iodc_dbuf[i] = str[i];
@@ -1255,7 +1256,7 @@ int pdc_iodc_print(const unsigned char *str, unsigned count) 
                    __pa(iodc_retbuf), 0, __pa(iodc_dbuf), i, 0);

        spin_unlock_irqrestore(&pdc_lock, flags);



	return i;

	return i - found;

}



#if !defined(BOOTLOADER)