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

Unverified Commit 4a4f0e5f authored by derfelot's avatar derfelot
Browse files

Merge Linux 4.4.231 kernel 

Changes in 4.4.231: (59 commits)
        KVM: s390: reduce number of IO pins to 1
        spi: spidev: fix a race between spidev_release and spidev_remove
        spi: spidev: fix a potential use-after-free in spidev_release()
        scsi: mptscsih: Fix read sense data size
        net: cxgb4: fix return error value in t4_prep_fw
        smsc95xx: check return value of smsc95xx_reset
        smsc95xx: avoid memory leak in smsc95xx_bind
        ALSA: compress: fix partial_drain completion state
        arm64: kgdb: Fix single-step exception handling oops
        ALSA: opl3: fix infoleak in opl3
        ALSA: hda - let hs_mic be picked ahead of hp_mic
        ALSA: usb-audio: add quirk for MacroSilicon MS2109
        KVM: x86: bit 8 of non-leaf PDPEs is not reserved
        Revert "ath9k: Fix general protection fault in ath9k_hif_usb_rx_cb"
        btrfs: fix fatal extent_buffer readahead vs releasepage race
        drm/radeon: fix double free
        ARC: entry: fix potential EFA clobber when TIF_SYSCALL_TRACE
        ARC: elf: use right ELF_ARCH
        bnxt_en: fix NULL dereference in case SR-IOV configuration fails
        ipv4: fill fl4_icmp_{type,code} in ping_v4_sendmsg
        l2tp: remove skb_dst_set() from l2tp_xmit_skb()
        llc: make sure applications use ARPHRD_ETHER
        net: Added pointer check for dst->ops->neigh_lookup in dst_neigh_lookup_skb
        genetlink: remove genl_bind
        tcp: make sure listeners don't initialize congestion-control state
        tcp: md5: add missing memory barriers in tcp_md5_do_add()/tcp_md5_hash_key()
        tcp: md5: refine tcp_md5_do_add()/tcp_md5_hash_key() barriers
        tcp: md5: allow changing MD5 keys in all socket states
        i2c: eg20t: Load module automatically if ID matches
        Revert "usb/ehci-platform: Set PM runtime as active on resume"
        Revert "usb/xhci-plat: Set PM runtime as active on resume"
        Revert "usb/ohci-platform: Fix a warning when hibernating"
        usb: gadget: udc: atmel: fix uninitialized read in debug printk
        staging: comedi: verify array index is correct before using it
        perf stat: Zero all the 'ena' and 'run' array slot stats for interval mode
        mtd: rawnand: brcmnand: fix CS0 layout
        HID: magicmouse: do not set up autorepeat
        usb: core: Add a helper function to check the validity of EP type in URB
        ALSA: line6: Perform sanity check for each URB creation
        ALSA: usb-audio: Fix race against the error recovery URB submission
        USB: c67x00: fix use after free in c67x00_giveback_urb
        usb: chipidea: core: add wakeup support for extcon
        usb: gadget: function: fix missing spinlock in f_uac1_legacy
        USB: serial: iuu_phoenix: fix memory corruption
        USB: serial: cypress_m8: enable Simply Automated UPB PIM
        USB: serial: ch341: add new Product ID for CH340
        USB: serial: option: add GosunCn GM500 series
        USB: serial: option: add Quectel EG95 LTE modem
        virtio: virtio_console: add missing MODULE_DEVICE_TABLE() for rproc serial
        fuse: Fix parameter for FS_IOC_{GET,SET}FLAGS
        mei: bus: don't clean driver pointer
        Input: i8042 - add Lenovo XiaoXin Air 12 to i8042 nomux list
        uio_pdrv_genirq: fix use without device tree and no interrupt
        MIPS: Fix build for LTS kernel caused by backporting lpj adjustment
        hwmon: (emc2103) fix unable to change fan pwm1_enable attribute
        dmaengine: fsl-edma: Fix NULL pointer exception in fsl_edma_tx_handler
        misc: atmel-ssc: lock with mutex instead of spinlock
        sched/fair: handle case of task_h_load() returning 0
        Linux 4.4.231

Conflicts:
	drivers/usb/gadget/function/f_uac1.c
	drivers/usb/host/xhci-plat.c
	net/netlink/genetlink.c
	sound/core/compress_offload.c
parents d5f990f2 554bbfc0

Makefile

+1 −1
Original line number Diff line number Diff line 
VERSION = 4

PATCHLEVEL = 4

SUBLEVEL = 230

SUBLEVEL = 231

EXTRAVERSION =

NAME = Blurry Fish Butt

arch/arc/include/asm/elf.h

+1 −1
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ 
#define  R_ARC_S25W_PCREL	0x11



/*to set parameters in the core dumps */

#define ELF_ARCH		EM_ARCOMPACT

#define ELF_ARCH		EM_ARC_INUSE

#define ELF_CLASS		ELFCLASS32



#ifdef CONFIG_CPU_BIG_ENDIAN

arch/arc/kernel/entry.S

+5 −11
Original line number Diff line number Diff line
@@ -168,7 +168,6 @@ END(EV_Extension) 
tracesys:

	; save EFA in case tracer wants the PC of traced task

	; using ERET won't work since next-PC has already committed

	lr  r12, [efa]

	GET_CURR_TASK_FIELD_PTR   TASK_THREAD, r11

	st  r12, [r11, THREAD_FAULT_ADDR]	; thread.fault_address
@@ -211,15 +210,9 @@ tracesys_exit: 
; Breakpoint TRAP

; ---------------------------------------------

trap_with_param:



	; stop_pc info by gdb needs this info

	lr  r0, [efa]

	mov r0, r12	; EFA in case ptracer/gdb wants stop_pc

	mov r1, sp



	; Now that we have read EFA, it is safe to do "fake" rtie

	;   and get out of CPU exception mode

	FAKE_RET_FROM_EXCPN



	; Save callee regs in case gdb wants to have a look

	; SP will grow up by size of CALLEE Reg-File

	; NOTE: clobbers r12
@@ -246,6 +239,10 @@ ENTRY(EV_Trap) 


	EXCEPTION_PROLOGUE



	lr  r12, [efa]



	FAKE_RET_FROM_EXCPN



	;============ TRAP 1   :breakpoints

	; Check ECR for trap with arg (PROLOGUE ensures r9 has ECR)

	bmsk.f 0, r9, 7
@@ -253,9 +250,6 @@ ENTRY(EV_Trap) 


	;============ TRAP  (no param): syscall top level



	; First return from Exception to pure K mode (Exception/IRQs renabled)

	FAKE_RET_FROM_EXCPN



	; If syscall tracing ongoing, invoke pre-post-hooks

	GET_CURR_THR_INFO_FLAGS   r10

	btst r10, TIF_SYSCALL_TRACE

arch/arm64/kernel/kgdb.c

+1 −1
Original line number Diff line number Diff line
@@ -241,7 +241,7 @@ static int kgdb_step_brk_fn(struct pt_regs *regs, unsigned int esr) 
	if (user_mode(regs))

		return DBG_HOOK_ERROR;



	kgdb_handle_exception(1, SIGTRAP, 0, regs);

	kgdb_handle_exception(0, SIGTRAP, 0, regs);

	return DBG_HOOK_HANDLED;

}

NOKPROBE_SYMBOL(kgdb_step_brk_fn);

arch/mips/kernel/time.c

+4 −9
Original line number Diff line number Diff line
@@ -40,10 +40,8 @@ static unsigned long glb_lpj_ref_freq; 
static int cpufreq_callback(struct notifier_block *nb,

			    unsigned long val, void *data)

{

	struct cpufreq_freqs *freq = data;

	struct cpumask *cpus = freq->policy->cpus;

	unsigned long lpj;

	int cpu;

	struct cpufreq_freqs *freq = data;



	/*

	 * Skip lpj numbers adjustment if the CPU-freq transition is safe for
@@ -64,6 +62,7 @@ static int cpufreq_callback(struct notifier_block *nb, 
		}

	}



	cpu = freq->cpu;

	/*

	 * Adjust global lpj variable and per-CPU udelay_val number in

	 * accordance with the new CPU frequency.
@@ -74,12 +73,8 @@ static int cpufreq_callback(struct notifier_block *nb, 
						glb_lpj_ref_freq,

						freq->new);



		for_each_cpu(cpu, cpus) {

			lpj = cpufreq_scale(per_cpu(pcp_lpj_ref, cpu),

					    per_cpu(pcp_lpj_ref_freq, cpu),

					    freq->new);

			cpu_data[cpu].udelay_val = (unsigned int)lpj;

		}

		cpu_data[cpu].udelay_val = cpufreq_scale(per_cpu(pcp_lpj_ref, cpu),

					   per_cpu(pcp_lpj_ref_freq, cpu), freq->new);

	}



	return NOTIFY_OK;