Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Unverified Commit fcb30fd6 authored by derfelot's avatar derfelot
Browse files

Merge Linux 4.4.274 kernel 

Changes in 4.4.274: (56 commits)
        HID: hid-sensor-hub: Return error for hid_set_field() failure
        HID: Add BUS_VIRTUAL to hid_connect logging
        HID: usbhid: fix info leak in hid_submit_ctrl
        ARM: OMAP2+: Fix build warning when mmc_omap is not built
        HID: gt683r: add missing MODULE_DEVICE_TABLE
        gfs2: Fix use-after-free in gfs2_glock_shrink_scan
        scsi: target: core: Fix warning on realtime kernels
        ethernet: myri10ge: Fix missing error code in myri10ge_probe()
        net: ipconfig: Don't override command-line hostnames or domains
        rtnetlink: Fix missing error code in rtnl_bridge_notify()
        net/x25: Return the correct errno code
        net: Return the correct errno code
        fib: Return the correct errno code
        dmaengine: stedma40: add missing iounmap() on error in d40_probe()
        net: ipv4: fix memory leak in netlbl_cipsov4_add_std
        net: rds: fix memory leak in rds_recvmsg
        rtnetlink: Fix regression in bridge VLAN configuration
        netfilter: synproxy: Fix out of bounds when parsing TCP options
        net: stmmac: dwmac1000: Fix extended MAC address registers definition
        qlcnic: Fix an error handling path in 'qlcnic_probe()'
        netxen_nic: Fix an error handling path in 'netxen_nic_probe()'
        net: cdc_ncm: switch to eth%d interface naming
        net: usb: fix possible use-after-free in smsc75xx_bind
        net/af_unix: fix a data-race in unix_dgram_sendmsg / unix_release_sock
        be2net: Fix an error handling path in 'be_probe()'
        net: hamradio: fix memory leak in mkiss_close
        net: cdc_eem: fix tx fixup skb leak
        net: ethernet: fix potential use-after-free in ec_bhf_remove
        scsi: core: Put .shost_dev in failure path if host state changes to RUNNING
        radeon: use memcpy_to/fromio for UVD fw upload
        can: bcm: fix infoleak in struct bcm_msg_head
        tracing: Do no increment trace_clock_global() by one
        PCI: Mark TI C667X to avoid bus reset
        PCI: Mark some NVIDIA GPUs to avoid bus reset
        dmaengine: pl330: fix wrong usage of spinlock flags in dma_cyclc
        net: fec_ptp: add clock rate zero check
        can: bcm/raw/isotp: use per module netdevice notifier
        tracing: Do not stop recording cmdlines when tracing is off
        tracing: Do not stop recording comms if the trace file is being read
        x86/fpu: Reset state for all signal restore failures
        inet: use bigger hash table for IP ID generation
        ARM: 9081/1: fix gcc-10 thumb2-kernel regression
        Makefile: Move -Wno-unused-but-set-variable out of GCC only block
        Revert "PCI: PM: Do not read power state in pci_enable_device_flags()"
        cfg80211: call cfg80211_leave_ocb when switching away from OCB
        mac80211: drop multicast fragments
        ping: Check return value of function 'ping_queue_rcv_skb'
        inet: annotate date races around sk->sk_txhash
        net: caif: fix memory leak in ldisc_open
        r8152: Avoid memcpy() over-reading of ETH_SS_STATS
        sh_eth: Avoid memcpy() over-reading of ETH_SS_STATS
        r8169: Avoid memcpy() over-reading of ETH_SS_STATS
        net: ll_temac: Avoid ndo_start_xmit returning NETDEV_TX_BUSY
        nilfs2: fix memory leak in nilfs_sysfs_delete_device_group
        i2c: robotfuzz-osif: fix control-request directions
        Linux 4.4.274
parents 2806b4f9 200ecf50

Makefile

+2 −3
Original line number Diff line number Diff line 
VERSION = 4

PATCHLEVEL = 4

SUBLEVEL = 273

SUBLEVEL = 274

EXTRAVERSION =

NAME = Blurry Fish Butt
@@ -743,12 +743,11 @@ KBUILD_CFLAGS += $(call cc-disable-warning, tautological-compare) 
# See modpost pattern 2

KBUILD_CFLAGS += $(call cc-option, -mno-global-merge,)

KBUILD_CFLAGS += $(call cc-option, -fcatch-undefined-behavior)

else

endif



# These warnings generated too much noise in a regular build.

# Use make W=1 to enable them (see scripts/Makefile.extrawarn)

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

endif



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

ifdef CONFIG_FRAME_POINTER

arch/arm/kernel/setup.c

+9 −7
Original line number Diff line number Diff line
@@ -488,9 +488,11 @@ void notrace cpu_init(void) 
	 * In Thumb-2, msr with an immediate value is not allowed.

	 */

#ifdef CONFIG_THUMB2_KERNEL

#define PLC	"r"

#define PLC_l	"l"

#define PLC_r	"r"

#else

#define PLC	"I"

#define PLC_l	"I"

#define PLC_r	"I"

#endif



	/*
@@ -512,15 +514,15 @@ void notrace cpu_init(void) 
	"msr	cpsr_c, %9"

	    :

	    : "r" (stk),

	      PLC (PSR_F_BIT | PSR_I_BIT | IRQ_MODE),

	      PLC_r (PSR_F_BIT | PSR_I_BIT | IRQ_MODE),

	      "I" (offsetof(struct stack, irq[0])),

	      PLC (PSR_F_BIT | PSR_I_BIT | ABT_MODE),

	      PLC_r (PSR_F_BIT | PSR_I_BIT | ABT_MODE),

	      "I" (offsetof(struct stack, abt[0])),

	      PLC (PSR_F_BIT | PSR_I_BIT | UND_MODE),

	      PLC_r (PSR_F_BIT | PSR_I_BIT | UND_MODE),

	      "I" (offsetof(struct stack, und[0])),

	      PLC (PSR_F_BIT | PSR_I_BIT | FIQ_MODE),

	      PLC_r (PSR_F_BIT | PSR_I_BIT | FIQ_MODE),

	      "I" (offsetof(struct stack, fiq[0])),

	      PLC (PSR_F_BIT | PSR_I_BIT | SVC_MODE)

	      PLC_l (PSR_F_BIT | PSR_I_BIT | SVC_MODE)

	    : "r14");

#endif

}

arch/arm/mach-omap2/board-n8x0.c

+1 −1
Original line number Diff line number Diff line
@@ -328,6 +328,7 @@ static int n8x0_mmc_get_cover_state(struct device *dev, int slot) 


static void n8x0_mmc_callback(void *data, u8 card_mask)

{

#ifdef CONFIG_MMC_OMAP

	int bit, *openp, index;



	if (board_is_n800()) {
@@ -345,7 +346,6 @@ static void n8x0_mmc_callback(void *data, u8 card_mask) 
	else

		*openp = 0;



#ifdef CONFIG_MMC_OMAP

	omap_mmc_notify_cover_event(mmc_device, index, *openp);

#else

	pr_warn("MMC: notify cover event not available\n");

arch/x86/kernel/fpu/signal.c

+13 −5
Original line number Diff line number Diff line
@@ -262,15 +262,23 @@ static int __fpu__restore_sig(void __user *buf, void __user *buf_fx, int size) 
		return 0;

	}



	if (!access_ok(VERIFY_READ, buf, size))

	if (!access_ok(VERIFY_READ, buf, size)) {

		fpu__clear(fpu);

		return -EACCES;

	}



	fpu__activate_curr(fpu);



	if (!static_cpu_has(X86_FEATURE_FPU))

		return fpregs_soft_set(current, NULL,

				       0, sizeof(struct user_i387_ia32_struct),

				       NULL, buf) != 0;

	if (!static_cpu_has(X86_FEATURE_FPU)) {

		int ret = fpregs_soft_set(current, NULL, 0,

					  sizeof(struct user_i387_ia32_struct),

					  NULL, buf);



		if (ret)

			fpu__clear(fpu);



		return ret != 0;

	}



	if (use_xsave()) {

		struct _fpx_sw_bytes fx_sw_user;

drivers/dma/pl330.c

+4 −2
Original line number Diff line number Diff line
@@ -2531,13 +2531,15 @@ static struct dma_async_tx_descriptor *pl330_prep_dma_cyclic( 
	for (i = 0; i < len / period_len; i++) {

		desc = pl330_get_desc(pch);

		if (!desc) {

			unsigned long iflags;



			dev_err(pch->dmac->ddma.dev, "%s:%d Unable to fetch desc\n",

				__func__, __LINE__);



			if (!first)

				return NULL;



			spin_lock_irqsave(&pl330->pool_lock, flags);

			spin_lock_irqsave(&pl330->pool_lock, iflags);



			while (!list_empty(&first->node)) {

				desc = list_entry(first->node.next,
@@ -2547,7 +2549,7 @@ static struct dma_async_tx_descriptor *pl330_prep_dma_cyclic( 


			list_move_tail(&first->node, &pl330->desc_pool);



			spin_unlock_irqrestore(&pl330->pool_lock, flags);

			spin_unlock_irqrestore(&pl330->pool_lock, iflags);



			return NULL;

		}