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

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

Merge Linux 4.4.267 kernel 

Changes in 4.4.267: (39 commits)
        iio: hid-sensor-prox: Fix scale not correct issue
        ALSA: aloop: Fix initialization of controls
        nfc: fix refcount leak in llcp_sock_bind()
        nfc: fix refcount leak in llcp_sock_connect()
        nfc: fix memory leak in llcp_sock_connect()
        nfc: Avoid endless loops caused by repeated llcp_sock_connect()
        xen/evtchn: Change irq_info lock to raw_spinlock_t
        net: ipv6: check for validity before dereferencing cfg->fc_nlinfo.nlh
        ia64: fix user_stack_pointer() for ptrace()
        fs: direct-io: fix missing sdio->boundary
        parisc: parisc-agp requires SBA IOMMU driver
        batman-adv: initialize "struct batadv_tvlv_tt_vlan_data"->reserved field
        net: sched: sch_teql: fix null-pointer dereference
        sch_red: fix off-by-one checks in red_check_params()
        gianfar: Handle error code at MAC address change
        net:tipc: Fix a double free in tipc_sk_mcast_rcv
        clk: fix invalid usage of list cursor in unregister
        workqueue: Move the position of debug_work_activate() in __queue_work()
        s390/cpcmd: fix inline assembly register clobbering
        RDMA/cxgb4: check for ipv6 address properly while destroying listener
        clk: socfpga: fix iomem pointer cast on 64-bit
        cfg80211: remove WARN_ON() in cfg80211_sme_connect
        net: tun: set tun->dev->addr_len during TUNSETLINK processing
        drivers: net: fix memory leak in atusb_probe
        drivers: net: fix memory leak in peak_usb_create_dev
        net: mac802154: Fix general protection fault
        net: ieee802154: nl-mac: fix check on panid
        net: ieee802154: fix nl802154 del llsec key
        net: ieee802154: fix nl802154 del llsec dev
        net: ieee802154: fix nl802154 add llsec key
        net: ieee802154: fix nl802154 del llsec devkey
        net: ieee802154: forbid monitor for set llsec params
        net: ieee802154: forbid monitor for del llsec seclevel
        net: ieee802154: stop dump llsec params for monitors
        drm/imx: imx-ldb: fix out of bounds array access warning
        netfilter: x_tables: fix compat match/target pad out-of-bound write
        perf map: Tighten snprintf() string precision to pass gcc check on some 32-bit arches
        xen/events: fix setting irq affinity
        Linux 4.4.267
parents 797048d0 6a75b675

Makefile

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

PATCHLEVEL = 4

SUBLEVEL = 266

SUBLEVEL = 267

EXTRAVERSION =

NAME = Blurry Fish Butt

arch/ia64/include/asm/ptrace.h

+1 −7
Original line number Diff line number Diff line
@@ -53,8 +53,7 @@ 


static inline unsigned long user_stack_pointer(struct pt_regs *regs)

{

	/* FIXME: should this be bspstore + nr_dirty regs? */

	return regs->ar_bspstore;

	return regs->r12;

}



static inline int is_syscall_success(struct pt_regs *regs)
@@ -78,11 +77,6 @@ static inline long regs_return_value(struct pt_regs *regs) 
	unsigned long __ip = instruction_pointer(regs);			\

	(__ip & ~3UL) + ((__ip & 3UL) << 2);				\

})

/*

 * Why not default?  Because user_stack_pointer() on ia64 gives register

 * stack backing store instead...

 */

#define current_user_stack_pointer() (current_pt_regs()->r12)



  /* given a pointer to a task_struct, return the user's pt_regs */

# define task_pt_regs(t)		(((struct pt_regs *) ((char *) (t) + IA64_STK_OFFSET)) - 1)

arch/s390/kernel/cpcmd.c

+4 −2
Original line number Diff line number Diff line
@@ -37,10 +37,12 @@ static int diag8_noresponse(int cmdlen) 


static int diag8_response(int cmdlen, char *response, int *rlen)

{

	unsigned long _cmdlen = cmdlen | 0x40000000L;

	unsigned long _rlen = *rlen;

	register unsigned long reg2 asm ("2") = (addr_t) cpcmd_buf;

	register unsigned long reg3 asm ("3") = (addr_t) response;

	register unsigned long reg4 asm ("4") = cmdlen | 0x40000000L;

	register unsigned long reg5 asm ("5") = *rlen;

	register unsigned long reg4 asm ("4") = _cmdlen;

	register unsigned long reg5 asm ("5") = _rlen;



	asm volatile(

		"	sam31\n"

drivers/char/agp/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -124,7 +124,7 @@ config AGP_HP_ZX1 


config AGP_PARISC

	tristate "HP Quicksilver AGP support"

	depends on AGP && PARISC && 64BIT

	depends on AGP && PARISC && 64BIT && IOMMU_SBA

	help

	  This option gives you AGP GART support for the HP Quicksilver

	  AGP bus adapter on HP PA-RISC machines (Ok, just on the C8000

drivers/clk/clk.c

+13 −17
Original line number Diff line number Diff line
@@ -3716,18 +3716,15 @@ EXPORT_SYMBOL_GPL(clk_notifier_register); 
 */

int clk_notifier_unregister(struct clk *clk, struct notifier_block *nb)

{

	struct clk_notifier *cn = NULL;

	int ret = -EINVAL;

	struct clk_notifier *cn;

	int ret = -ENOENT;



	if (!clk || !nb)

		return -EINVAL;



	clk_prepare_lock();



	list_for_each_entry(cn, &clk_notifier_list, node)

		if (cn->clk == clk)

			break;



	list_for_each_entry(cn, &clk_notifier_list, node) {

		if (cn->clk == clk) {

			ret = srcu_notifier_chain_unregister(&cn->notifier_head, nb);
@@ -3739,9 +3736,8 @@ int clk_notifier_unregister(struct clk *clk, struct notifier_block *nb) 
				list_del(&cn->node);

				kfree(cn);

			}



	} else {

		ret = -ENOENT;

			break;

		}

	}



	clk_prepare_unlock();