Unverified Commit 4c155af3 authored May 01, 2021 by derfelot

Merge Linux 4.4.268 kernel

Changes in 4.4.268: (34 commits)
        net/sctp: fix race condition in sctp_destroy_sock
        Input: nspire-keypad - enable interrupts only when opened
        dmaengine: dw: Make it dependent to HAS_IOMEM
        ARM: dts: Fix moving mmc devices with aliases for omap4 & 5
        arc: kernel: Return -EFAULT if copy_to_user() fails
        neighbour: Disregard DEAD dst in neigh_update
        ARM: keystone: fix integer overflow warning
        ASoC: fsl_esai: Fix TDM slot setup for I2S mode
        net: ieee802154: stop dump llsec keys for monitors
        net: ieee802154: stop dump llsec devs for monitors
        net: ieee802154: forbid monitor for add llsec dev
        net: ieee802154: stop dump llsec devkeys for monitors
        net: ieee802154: forbid monitor for add llsec devkey
        net: ieee802154: stop dump llsec seclevels for monitors
        net: ieee802154: forbid monitor for add llsec seclevel
        pcnet32: Use pci_resource_len to validate PCI resource
        Input: i8042 - fix Pegatron C15B ID entry
        scsi: libsas: Reset num_scatter if libata marks qc as NODATA
        net: davicom: Fix regulator not turned off on failed probe
        i40e: fix the panic when running bpf in xdpdrv mode
        ARM: 9071/1: uprobes: Don't hook on thumb instructions
        net: hso: fix null-ptr-deref during tty device unregistration
        ext4: correct error label in ext4_rename()
        ARM: dts: Fix swapped mmc order for omap3
        s390/entry: save the caller of psw_idle
        xen-netback: Check for hotplug-status existence before watching
        cavium/liquidio: Fix duplicate argument
        ia64: fix discontig.c section mismatches
        ia64: tools: remove duplicate definition of ia64_mf() on ia64
        compiler.h: enable builtin overflow checkers and add fallback code
        overflow.h: Add allocation size calculation helpers
        x86/crash: Fix crash_setup_memmap_entries() out-of-bounds access
        net: hso: fix NULL-deref on disconnect regression
        Linux 4.4.268

parents 46ae2bd9 47127fcd

Makefile

+1 −1

Original line number	Diff line number	Diff line
		VERSION = 4
		PATCHLEVEL = 4
		SUBLEVEL = 267
		SUBLEVEL = 268
		EXTRAVERSION =
		NAME = Blurry Fish Butt

arch/arc/kernel/signal.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -97,7 +97,7 @@ stash_usr_regs(struct rt_sigframe __user sf, struct pt_regs regs,
		sizeof(sf->uc.uc_mcontext.regs.scratch));
		err \|= __copy_to_user(&sf->uc.uc_sigmask, set, sizeof(sigset_t));

		return err;
		return err ? -EFAULT : 0;
		}

		static int restore_usr_regs(struct pt_regs regs, struct rt_sigframe __user sf)
		@@ -111,7 +111,7 @@ static int restore_usr_regs(struct pt_regs regs, struct rt_sigframe __user sf)
		&(sf->uc.uc_mcontext.regs.scratch),
		sizeof(sf->uc.uc_mcontext.regs.scratch));
		if (err)
		return err;
		return -EFAULT;

		set_current_blocked(&set);
		regs->bta = uregs.scratch.bta;

arch/arm/boot/dts/omap3.dtsi

+3 −0

Original line number	Diff line number	Diff line
		@@ -22,6 +22,9 @@
		i2c0 = &i2c1;
		i2c1 = &i2c2;
		i2c2 = &i2c3;
		mmc0 = &mmc1;
		mmc1 = &mmc2;
		mmc2 = &mmc3;
		serial0 = &uart1;
		serial1 = &uart2;
		serial2 = &uart3;

arch/arm/boot/dts/omap4.dtsi

+5 −0

Original line number	Diff line number	Diff line
		@@ -21,6 +21,11 @@
		i2c1 = &i2c2;
		i2c2 = &i2c3;
		i2c3 = &i2c4;
		mmc0 = &mmc1;
		mmc1 = &mmc2;
		mmc2 = &mmc3;
		mmc3 = &mmc4;
		mmc4 = &mmc5;
		serial0 = &uart1;
		serial1 = &uart2;
		serial2 = &uart3;

arch/arm/boot/dts/omap5.dtsi

+5 −0

Original line number	Diff line number	Diff line
		@@ -26,6 +26,11 @@
		i2c2 = &i2c3;
		i2c3 = &i2c4;
		i2c4 = &i2c5;
		mmc0 = &mmc1;
		mmc1 = &mmc2;
		mmc2 = &mmc3;
		mmc3 = &mmc4;
		mmc4 = &mmc5;
		serial0 = &uart1;
		serial1 = &uart2;
		serial2 = &uart3;