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

Unverified Commit 8dc5886c authored by derfelot's avatar derfelot
Browse files

Merge Linux 4.4.249 kernel

Changes in 4.4.249: (131 commits)
        spi: bcm2835aux: Fix use-after-free on unbind
        spi: bcm2835aux: Restore err assignment in bcm2835aux_spi_probe
        ARC: stack unwinding: don't assume non-current task is sleeping
        platform/x86: acer-wmi: add automatic keyboard background light toggle key as KEY_LIGHTS_TOGGLE
        Input: cm109 - do not stomp on control URB
        Input: i8042 - add Acer laptops to the i8042 reset list
        pinctrl: amd: remove debounce filter setting in IRQ type setting
        spi: Prevent adding devices below an unregistering controller
        net/mlx4_en: Avoid scheduling restart task if it is already running
        tcp: fix cwnd-limited bug for TSO deferral where we send nothing
        net: stmmac: delete the eee_ctrl_timer after napi disabled
        net: bridge: vlan: fix error return code in __vlan_add()
        USB: dummy-hcd: Fix uninitialized array use in init()
        USB: add RESET_RESUME quirk for Snapscan 1212
        ALSA: usb-audio: Fix potential out-of-bounds shift
        ALSA: usb-audio: Fix control 'access overflow' errors from chmap
        xhci: Give USB2 ports time to enter U3 in bus suspend
        USB: sisusbvga: Make console support depend on BROKEN
        ALSA: pcm: oss: Fix potential out-of-bounds shift
        serial: 8250_omap: Avoid FIFO corruption caused by MDR1 access
        USB: serial: cp210x: enable usb generic throttle/unthrottle
        scsi: bnx2i: Requires MMU
        can: softing: softing_netdev_open(): fix error handling
        RDMA/cm: Fix an attempt to use non-valid pointer when cleaning timewait
        dm table: Remove BUG_ON(in_interrupt())
        soc/tegra: fuse: Fix index bug in get_process_id
        USB: serial: option: add interface-number sanity check to flag handling
        USB: gadget: f_rndis: fix bitrate for SuperSpeed and above
        usb: chipidea: ci_hdrc_imx: Pass DISABLE_DEVICE_STREAMING flag to imx6ul
        media: msi2500: assign SPI bus number dynamically
        Bluetooth: Fix slab-out-of-bounds read in hci_le_direct_adv_report_evt()
        drm/gma500: fix double free of gma_connector
        ARM: p2v: fix handling of LPAE translation in BE mode
        crypto: talitos - Fix return type of current_desc_hdr()
        spi: img-spfi: fix reference leak in img_spfi_resume
        ASoC: pcm: DRAIN support reactivation
        Bluetooth: Fix null pointer dereference in hci_event_packet()
        spi: spi-ti-qspi: fix reference leak in ti_qspi_setup
        spi: tegra20-slink: fix reference leak in slink ops of tegra20
        spi: tegra20-sflash: fix reference leak in tegra_sflash_resume
        spi: tegra114: fix reference leak in tegra spi ops
        RDMa/mthca: Work around -Wenum-conversion warning
        MIPS: BCM47XX: fix kconfig dependency bug for BCM47XX_BCMA
        media: solo6x10: fix missing snd_card_free in error handling case
        drm/omap: dmm_tiler: fix return error code in omap_dmm_probe()
        Input: ads7846 - fix integer overflow on Rt calculation
        Input: ads7846 - fix unaligned access on 7845
        powerpc/feature: Fix CPU_FTRS_ALWAYS by removing CPU_FTRS_GENERIC_32
        soc: ti: knav_qmss: fix reference leak in knav_queue_probe
        soc: ti: Fix reference imbalance in knav_dma_probe
        drivers: soc: ti: knav_qmss_queue: Fix error return code in knav_queue_probe
        memstick: fix a double-free bug in memstick_check
        ARM: dts: at91: sama5d4_xplained: add pincontrol for USB Host
        ARM: dts: at91: sama5d3_xplained: add pincontrol for USB Host
        orinoco: Move context allocation after processing the skb
        cw1200: fix missing destroy_workqueue() on error in cw1200_init_common
        mips: cdmm: fix use-after-free in mips_cdmm_bus_discover
        NFSv4.2: condition READDIR's mask for security label based on LSM state
        lockd: don't use interval-based rebinding over TCP
        NFS: switch nfsiod to be an UNBOUND workqueue.
        media: saa7146: fix array overflow in vidioc_s_audio()
        pinctrl: falcon: add missing put_device() call in pinctrl_falcon_probe()
        memstick: r592: Fix error return in r592_probe()
        ASoC: jz4740-i2s: add missed checks for clk_get()
        dm ioctl: fix error return code in target_message
        clocksource/drivers/arm_arch_timer: Correct fault programming of CNTKCTL_EL1.EVNTI
        cpufreq: highbank: Add missing MODULE_DEVICE_TABLE
        cpufreq: loongson1: Add missing MODULE_ALIAS
        cpufreq: scpi: Add missing MODULE_ALIAS
        scsi: pm80xx: Fix error return in pm8001_pci_probe()
        seq_buf: Avoid type mismatch for seq_buf_init
        scsi: fnic: Fix error return code in fnic_probe()
        powerpc/pseries/hibernation: drop pseries_suspend_begin() from suspend ops
        usb: ehci-omap: Fix PM disable depth umbalance in ehci_hcd_omap_probe
        usb: oxu210hp-hcd: Fix memory leak in oxu_create
        speakup: fix uninitialized flush_lock
        nfs_common: need lock during iterate through the list
        x86/kprobes: Restore BTF if the single-stepping is cancelled
        extcon: max77693: Fix modalias string
        ASoC: wm_adsp: remove "ctl" from list on error in wm_adsp_create_control()
        um: chan_xterm: Fix fd leak
        nfc: s3fwrn5: Release the nfc firmware
        powerpc/ps3: use dma_mapping_error()
        checkpatch: fix unescaped left brace
        net: bcmgenet: Fix a resource leak in an error handling path in the probe functin
        net: allwinner: Fix some resources leak in the error handling path of the probe and in the remove function
        net: korina: fix return value
        clk: ti: Fix memleak in ti_fapll_synth_setup
        perf record: Fix memory leak when using '--user-regs=?' to list registers
        qlcnic: Fix error code in probe
        clk: s2mps11: Fix a resource leak in error handling paths in the probe function
        cfg80211: initialize rekey_data
        Input: cros_ec_keyb - send 'scancodes' in addition to key events
        Input: goodix - add upside-down quirk for Teclast X98 Pro tablet
        media: gspca: Fix memory leak in probe
        media: sunxi-cir: ensure IR is handled when it is continuous
        media: netup_unidvb: Don't leak SPI master in probe error path
        Input: cyapa_gen6 - fix out-of-bounds stack access
        Revert "ACPI / resources: Use AE_CTRL_TERMINATE to terminate resources walks"
        ACPI: PNP: compare the string length in the matching_id()
        ALSA: pcm: oss: Fix a few more UBSAN fixes
        s390/dasd: fix list corruption of pavgroup group list
        s390/dasd: fix list corruption of lcu list
        staging: comedi: mf6x4: Fix AI end-of-conversion detection
        powerpc/perf: Exclude kernel samples while counting events in user space.
        USB: serial: mos7720: fix parallel-port state restore
        USB: serial: keyspan_pda: fix dropped unthrottle interrupts
        USB: serial: keyspan_pda: fix write deadlock
        USB: serial: keyspan_pda: fix stalled writes
        USB: serial: keyspan_pda: fix write-wakeup use-after-free
        USB: serial: keyspan_pda: fix tx-unthrottle use-after-free
        USB: serial: keyspan_pda: fix write unthrottling
        btrfs: quota: Set rescan progress to (u64)-1 if we hit last leaf
        btrfs: scrub: Don't use inode page cache in scrub_handle_errored_block()
        Btrfs: fix selftests failure due to uninitialized i_mode in test inodes
        btrfs: fix return value mixup in btrfs_get_extent
        ext4: fix a memory leak of ext4_free_data
        ceph: fix race in concurrent __ceph_remove_cap invocations
        jffs2: Fix GC exit abnormally
        jfs: Fix array index bounds check in dbAdjTree
        spi: rb4xx: Don't leak SPI master in probe error path
        mtd: parser: cmdline: Fix parsing of part-names with colons
        iio: adc: rockchip_saradc: fix missing clk_disable_unprepare() on error in rockchip_saradc_resume
        iio:pressure:mpl3115: Force alignment of buffer
        xen/xenbus: Allow watches discard events before queueing
        xen/xenbus: Add 'will_handle' callback support in xenbus_watch_path()
        xen/xenbus/xen_bus_type: Support will_handle watch callback
        xen/xenbus: Count pending messages for each watch
        xenbus/xenbus_backend: Disallow pending watch messages
        PCI: Fix pci_slot_release() NULL pointer dereference
        Linux 4.4.249
parents d6d65e81 c2fadcfc
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
VERSION = 4
PATCHLEVEL = 4
SUBLEVEL = 248
SUBLEVEL = 249
EXTRAVERSION =
NAME = Blurry Fish Butt

+15 −8
Original line number Diff line number Diff line
@@ -39,15 +39,15 @@

#ifdef CONFIG_ARC_DW2_UNWIND

static void seed_unwind_frame_info(struct task_struct *tsk,
				   struct pt_regs *regs,
static int
seed_unwind_frame_info(struct task_struct *tsk, struct pt_regs *regs,
		       struct unwind_frame_info *frame_info)
{
	/*
	 * synchronous unwinding (e.g. dump_stack)
	 *  - uses current values of SP and friends
	 */
	if (tsk == NULL && regs == NULL) {
	if (regs == NULL && (tsk == NULL || tsk == current)) {
		unsigned long fp, sp, blink, ret;
		frame_info->task = current;

@@ -66,11 +66,15 @@ static void seed_unwind_frame_info(struct task_struct *tsk,
		frame_info->call_frame = 0;
	} else if (regs == NULL) {
		/*
		 * Asynchronous unwinding of sleeping task
		 *  - Gets SP etc from task's pt_regs (saved bottom of kernel
		 *    mode stack of task)
		 * Asynchronous unwinding of a likely sleeping task
		 *  - first ensure it is actually sleeping
		 *  - if so, it will be in __switch_to, kernel mode SP of task
		 *    is safe-kept and BLINK at a well known location in there
		 */

		if (tsk->state == TASK_RUNNING)
			return -1;

		frame_info->task = tsk;

		frame_info->regs.r27 = TSK_K_FP(tsk);
@@ -104,6 +108,8 @@ static void seed_unwind_frame_info(struct task_struct *tsk,
		frame_info->regs.r63 = regs->ret;
		frame_info->call_frame = 0;
	}

	return 0;
}

#endif
@@ -117,7 +123,8 @@ arc_unwind_core(struct task_struct *tsk, struct pt_regs *regs,
	unsigned int address;
	struct unwind_frame_info frame_info;

	seed_unwind_frame_info(tsk, regs, &frame_info);
	if (seed_unwind_frame_info(tsk, regs, &frame_info))
		return 0;

	while (1) {
		address = UNW_PC(&frame_info);
+7 −0
Original line number Diff line number Diff line
@@ -231,6 +231,11 @@
						atmel,pins =
							<AT91_PIOE 9 AT91_PERIPH_GPIO AT91_PINCTRL_DEGLITCH>;	/* PE9, conflicts with A9 */
					};
					pinctrl_usb_default: usb_default {
						atmel,pins =
							<AT91_PIOE 3 AT91_PERIPH_GPIO AT91_PINCTRL_NONE
							 AT91_PIOE 4 AT91_PERIPH_GPIO AT91_PINCTRL_NONE>;
					};
				};
			};
		};
@@ -288,6 +293,8 @@
					   &pioE 3 GPIO_ACTIVE_LOW
					   &pioE 4 GPIO_ACTIVE_LOW
					  >;
			pinctrl-names = "default";
			pinctrl-0 = <&pinctrl_usb_default>;
			status = "okay";
		};

+7 −0
Original line number Diff line number Diff line
@@ -152,6 +152,11 @@
						atmel,pins =
							<AT91_PIOE 31 AT91_PERIPH_GPIO AT91_PINCTRL_DEGLITCH>;
					};
					pinctrl_usb_default: usb_default {
						atmel,pins =
							<AT91_PIOE 11 AT91_PERIPH_GPIO AT91_PINCTRL_NONE
							 AT91_PIOE 14 AT91_PERIPH_GPIO AT91_PINCTRL_NONE>;
					};
					pinctrl_key_gpio: key_gpio_0 {
						atmel,pins =
							<AT91_PIOE 8 AT91_PERIPH_GPIO AT91_PINCTRL_PULL_UP_DEGLITCH>;
@@ -177,6 +182,8 @@
					   &pioE 11 GPIO_ACTIVE_HIGH
					   &pioE 14 GPIO_ACTIVE_HIGH
					  >;
			pinctrl-names = "default";
			pinctrl-0 = <&pinctrl_usb_default>;
			status = "okay";
		};

+1 −5
Original line number Diff line number Diff line
@@ -673,12 +673,8 @@ ARM_BE8(rev16 ip, ip)
	ldrcc	r7, [r4], #4	@ use branch for delay slot
	bcc	1b
	bx	lr
#else
#ifdef CONFIG_CPU_ENDIAN_BE8
	moveq	r0, #0x00004000	@ set bit 22, mov to mvn instruction
#else
	moveq	r0, #0x400000	@ set bit 22, mov to mvn instruction
#endif
	b	2f
1:	ldr	ip, [r7, r3]
#ifdef CONFIG_CPU_ENDIAN_BE8
@@ -687,7 +683,7 @@ ARM_BE8(rev16 ip, ip)
	tst	ip, #0x000f0000	@ check the rotation field
	orrne	ip, ip, r6, lsl #24 @ mask in offset bits 31-24
	biceq	ip, ip, #0x00004000 @ clear bit 22
	orreq	ip, ip, r0      @ mask in offset bits 7-0
	orreq	ip, ip, r0, ror #8  @ mask in offset bits 7-0
#else
	bic	ip, ip, #0x000000ff
	tst	ip, #0xf00	@ check the rotation field
Loading