Commit 6d6982b5 authored Jun 20, 2023 by Greg Kroah-Hartman

Merge 5.4.246 into android11-5.4-lts



Changes in 5.4.246
	RDMA/efa: Fix unsupported page sizes in device
	RDMA/bnxt_re: Enable SRIOV VF support on Broadcom's 57500 adapter series
	RDMA/bnxt_re: Refactor queue pair creation code
	RDMA/bnxt_re: Fix return value of bnxt_re_process_raw_qp_pkt_rx
	iommu/rockchip: Fix unwind goto issue
	iommu/amd: Don't block updates to GATag if guest mode is on
	dmaengine: pl330: rename _start to prevent build error
	net/mlx5: fw_tracer, Fix event handling
	netrom: fix info-leak in nr_write_internal()
	af_packet: Fix data-races of pkt_sk(sk)->num.
	amd-xgbe: fix the false linkup in xgbe_phy_status
	mtd: rawnand: ingenic: fix empty stub helper definitions
	af_packet: do not use READ_ONCE() in packet_bind()
	tcp: deny tcp_disconnect() when threads are waiting
	tcp: Return user_mss for TCP_MAXSEG in CLOSE/LISTEN state if user_mss set
	net/sched: sch_ingress: Only create under TC_H_INGRESS
	net/sched: sch_clsact: Only create under TC_H_CLSACT
	net/sched: Reserve TC_H_INGRESS (TC_H_CLSACT) for ingress (clsact) Qdiscs
	net/sched: Prohibit regrafting ingress or clsact Qdiscs
	net: sched: fix NULL pointer dereference in mq_attach
	ocfs2/dlm: move BITS_TO_BYTES() to bitops.h for wider use
	net/netlink: fix NETLINK_LIST_MEMBERSHIPS length report
	udp6: Fix race condition in udp6_sendmsg & connect
	net/sched: flower: fix possible OOB write in fl_set_geneve_opt()
	net: dsa: mv88e6xxx: Increase wait after reset deactivation
	mtd: rawnand: marvell: ensure timing values are written
	mtd: rawnand: marvell: don't set the NAND frequency select
	watchdog: menz069_wdt: fix watchdog initialisation
	mailbox: mailbox-test: Fix potential double-free in mbox_test_message_write()
	ARM: 9295/1: unwind:fix unwind abort for uleb128 case
	media: rcar-vin: Select correct interrupt mode for V4L2_FIELD_ALTERNATE
	fbdev: modedb: Add 1920x1080 at 60 Hz video mode
	fbdev: stifb: Fix info entry in sti_struct on error path
	nbd: Fix debugfs_create_dir error checking
	ASoC: dwc: limit the number of overrun messages
	xfrm: Check if_id in inbound policy/secpath match
	ASoC: ssm2602: Add workaround for playback distortions
	media: dvb_demux: fix a bug for the continuity counter
	media: dvb-usb: az6027: fix three null-ptr-deref in az6027_i2c_xfer()
	media: dvb-usb-v2: ec168: fix null-ptr-deref in ec168_i2c_xfer()
	media: dvb-usb-v2: ce6230: fix null-ptr-deref in ce6230_i2c_master_xfer()
	media: dvb-usb-v2: rtl28xxu: fix null-ptr-deref in rtl28xxu_i2c_xfer
	media: dvb-usb: digitv: fix null-ptr-deref in digitv_i2c_xfer()
	media: dvb-usb: dw2102: fix uninit-value in su3000_read_mac_address
	media: netup_unidvb: fix irq init by register it at the end of probe
	media: dvb_ca_en50221: fix a size write bug
	media: ttusb-dec: fix memory leak in ttusb_dec_exit_dvb()
	media: mn88443x: fix !CONFIG_OF error by drop of_match_ptr from ID table
	media: dvb-core: Fix use-after-free due on race condition at dvb_net
	media: dvb-core: Fix kernel WARNING for blocking operation in wait_event*()
	media: dvb-core: Fix use-after-free due to race condition at dvb_ca_en50221
	wifi: rtl8xxxu: fix authentication timeout due to incorrect RCR value
	ARM: dts: stm32: add pin map for CAN controller on stm32f7
	arm64/mm: mark private VM_FAULT_X defines as vm_fault_t
	scsi: core: Decrease scsi_device's iorequest_cnt if dispatch failed
	wifi: b43: fix incorrect __packed annotation
	netfilter: conntrack: define variables exp_nat_nla_policy and any_addr with CONFIG_NF_NAT
	ALSA: oss: avoid missing-prototype warnings
	atm: hide unused procfs functions
	mailbox: mailbox-test: fix a locking issue in mbox_test_message_write()
	iio: adc: mxs-lradc: fix the order of two cleanup operations
	HID: google: add jewel USB id
	HID: wacom: avoid integer overflow in wacom_intuos_inout()
	iio: light: vcnl4035: fixed chip ID check
	iio: dac: mcp4725: Fix i2c_master_send() return value handling
	iio: dac: build ad5758 driver when AD5758 is selected
	net: usb: qmi_wwan: Set DTR quirk for BroadMobi BM818
	usb: gadget: f_fs: Add unbind event before functionfs_unbind
	misc: fastrpc: return -EPIPE to invocations on device removal
	misc: fastrpc: reject new invocations during device removal
	scsi: stex: Fix gcc 13 warnings
	ata: libata-scsi: Use correct device no in ata_find_dev()
	flow_dissector: work around stack frame size warning
	x86/boot: Wrap literal addresses in absolute_pointer()
	ACPI: thermal: drop an always true check
	gcc-12: disable '-Wdangling-pointer' warning for now
	eth: sun: cassini: remove dead code
	kernel/extable.c: use address-of operator on section symbols
	treewide: Remove uninitialized_var() usage
	lib/dynamic_debug.c: use address-of operator on section symbols
	wifi: rtlwifi: remove always-true condition pointed out by GCC 12
	mmc: vub300: fix invalid response handling
	tty: serial: fsl_lpuart: use UARTCTRL_TXINV to send break instead of UARTCTRL_SBK
	selinux: don't use make's grouped targets feature yet
	tracing/probe: trace_probe_primary_from_call(): checked list_first_entry
	ext4: add EA_INODE checking to ext4_iget()
	ext4: set lockdep subclass for the ea_inode in ext4_xattr_inode_cache_find()
	ext4: disallow ea_inodes with extended attributes
	ext4: add lockdep annotations for i_data_sem for ea_inode's
	fbcon: Fix null-ptr-deref in soft_cursor
	test_firmware: fix the memory leak of the allocated firmware buffer
	regmap: Account for register length when chunking
	scsi: dpt_i2o: Remove broken pass-through ioctl (I2OUSERCMD)
	scsi: dpt_i2o: Do not process completions with invalid addresses
	RDMA/bnxt_re: Remove set but not used variable 'dev_attr'
	RDMA/bnxt_re: Remove the qp from list only if the qp destroy succeeds
	drm/edid: Fix uninitialized variable in drm_cvt_modes()
	wifi: rtlwifi: 8192de: correct checking of IQK reload
	drm/edid: fix objtool warning in drm_cvt_modes()
	Linux 5.4.246

Change-Id: I8721e40543af31c56dbbd47910dd3b474e3a79ab
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>

parents acebb475 f568a20f

Makefile

+5 −1

Original line number	Diff line number	Diff line
		# SPDX-License-Identifier: GPL-2.0
		VERSION = 5
		PATCHLEVEL = 4
		SUBLEVEL = 245
		SUBLEVEL = 246
		EXTRAVERSION =
		NAME = Kleptomaniac Octopus

		@@ -797,6 +797,10 @@ endif
		KBUILD_CFLAGS += $(call cc-disable-warning, unused-but-set-variable)

		KBUILD_CFLAGS += $(call cc-disable-warning, unused-const-variable)

		# These result in bogus false positives
		KBUILD_CFLAGS += $(call cc-disable-warning, dangling-pointer)

		ifdef CONFIG_FRAME_POINTER
		KBUILD_CFLAGS += -fno-omit-frame-pointer -fno-optimize-sibling-calls
		else

arch/arm/boot/dts/stm32f7-pinctrl.dtsi

+82 −0

Original line number	Diff line number	Diff line
		@@ -284,6 +284,88 @@
		slew-rate = <2>;
		};
		};

		can1_pins_a: can1-0 {
		pins1 {
		pinmux = <STM32_PINMUX('A', 12, AF9)>; /* CAN1_TX */
		};
		pins2 {
		pinmux = <STM32_PINMUX('A', 11, AF9)>; /* CAN1_RX */
		bias-pull-up;
		};
		};

		can1_pins_b: can1-1 {
		pins1 {
		pinmux = <STM32_PINMUX('B', 9, AF9)>; /* CAN1_TX */
		};
		pins2 {
		pinmux = <STM32_PINMUX('B', 8, AF9)>; /* CAN1_RX */
		bias-pull-up;
		};
		};

		can1_pins_c: can1-2 {
		pins1 {
		pinmux = <STM32_PINMUX('D', 1, AF9)>; /* CAN1_TX */
		};
		pins2 {
		pinmux = <STM32_PINMUX('D', 0, AF9)>; /* CAN1_RX */
		bias-pull-up;

		};
		};

		can1_pins_d: can1-3 {
		pins1 {
		pinmux = <STM32_PINMUX('H', 13, AF9)>; /* CAN1_TX */
		};
		pins2 {
		pinmux = <STM32_PINMUX('H', 14, AF9)>; /* CAN1_RX */
		bias-pull-up;

		};
		};

		can2_pins_a: can2-0 {
		pins1 {
		pinmux = <STM32_PINMUX('B', 6, AF9)>; /* CAN2_TX */
		};
		pins2 {
		pinmux = <STM32_PINMUX('B', 5, AF9)>; /* CAN2_RX */
		bias-pull-up;
		};
		};

		can2_pins_b: can2-1 {
		pins1 {
		pinmux = <STM32_PINMUX('B', 13, AF9)>; /* CAN2_TX */
		};
		pins2 {
		pinmux = <STM32_PINMUX('B', 12, AF9)>; /* CAN2_RX */
		bias-pull-up;
		};
		};

		can3_pins_a: can3-0 {
		pins1 {
		pinmux = <STM32_PINMUX('A', 15, AF11)>; /* CAN3_TX */
		};
		pins2 {
		pinmux = <STM32_PINMUX('A', 8, AF11)>; /* CAN3_RX */
		bias-pull-up;
		};
		};

		can3_pins_b: can3-1 {
		pins1 {
		pinmux = <STM32_PINMUX('B', 4, AF11)>; /* CAN3_TX */
		};
		pins2 {
		pinmux = <STM32_PINMUX('B', 3, AF11)>; /* CAN3_RX */
		bias-pull-up;
		};
		};
		};
		};
		};

arch/arm/kernel/unwind.c

+24 −1

Original line number	Diff line number	Diff line
		@@ -300,6 +300,29 @@ static int unwind_exec_pop_subset_r0_to_r3(struct unwind_ctrl_block *ctrl,
		return URC_OK;
		}

		static unsigned long unwind_decode_uleb128(struct unwind_ctrl_block *ctrl)
		{
		unsigned long bytes = 0;
		unsigned long insn;
		unsigned long result = 0;

		/*
		* unwind_get_byte() will advance `ctrl` one instruction at a time, so
		* loop until we get an instruction byte where bit 7 is not set.
		*
		* Note: This decodes a maximum of 4 bytes to output 28 bits data where
		* max is 0xfffffff: that will cover a vsp increment of 1073742336, hence
		* it is sufficient for unwinding the stack.
		*/
		do {
		insn = unwind_get_byte(ctrl);
		result \|= (insn & 0x7f) << (bytes * 7);
		bytes++;
		} while (!!(insn & 0x80) && (bytes != sizeof(result)));

		return result;
		}

		/*
		* Execute the current unwind instruction.
		*/
		@@ -353,7 +376,7 @@ static int unwind_exec_insn(struct unwind_ctrl_block *ctrl)
		if (ret)
		goto error;
		} else if (insn == 0xb2) {
		unsigned long uleb128 = unwind_get_byte(ctrl);
		unsigned long uleb128 = unwind_decode_uleb128(ctrl);

		ctrl->vrs[SP] += 0x204 + (uleb128 << 2);
		} else {

arch/arm/mach-sa1100/assabet.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -653,7 +653,7 @@ static void __init map_sa1100_gpio_regs( void )
		*/
		static void __init get_assabet_scr(void)
		{
		unsigned long uninitialized_var(scr), i;
		unsigned long scr, i;

		GPDR \|= 0x3fc; /* Configure GPIO 9:2 as outputs */
		GPSR = 0x3fc; /* Write 0xFF to GPIO 9:2 */

arch/arm/mm/alignment.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -799,7 +799,7 @@ static int alignment_get_thumb(struct pt_regs regs, u16 ip, u16 *inst)
		static int
		do_alignment(unsigned long addr, unsigned int fsr, struct pt_regs *regs)
		{
		union offset_union uninitialized_var(offset);
		union offset_union offset;
		unsigned long instrptr;
		int (handler)(unsigned long addr, u32 instr, struct pt_regs regs);
		unsigned int type;