Linux 4.4.255
Greg Kroah-Hartman
maintainerI'm announcing the release of the 4.4.255 kernel.
All users of the 4.4 kernel series must upgrade.
The updated 4.4.y git tree can be found at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git linux-4.4.y
and can be browsed at the normal kernel.org git web browser:
https://git.kernel.org/?p=linux/kernel/git/stable/linux-stable.git;a=summary
thanks,
greg k-h
------------
Makefile | 2 arch/arm/mach-imx/suspend-imx6.S | 1 arch/x86/kvm/pmu_intel.c | 2 drivers/acpi/device_sysfs.c | 20 - drivers/infiniband/hw/cxgb4/qp.c | 2 drivers/iommu/dmar.c | 43 +- drivers/net/can/dev.c | 2 drivers/net/usb/qmi_wwan.c | 1 drivers/net/wireless/mediatek/mt7601u/dma.c | 5 fs/exec.c | 2 include/linux/compat.h | 2 include/linux/futex.h | 44 +- include/linux/intel-iommu.h | 2 include/linux/sched.h | 9 kernel/Makefile | 3 kernel/exit.c | 25 - kernel/fork.c | 40 -- kernel/futex.c | 446 +++++++++++++++++++++++++--- kernel/futex_compat.c | 201 ------------ net/mac80211/ieee80211_i.h | 1 net/mac80211/iface.c | 6 net/netfilter/nft_dynset.c | 4 net/nfc/netlink.c | 1 net/nfc/rawsock.c | 2 net/wireless/wext-core.c | 5 net/xfrm/xfrm_input.c | 2 26 files changed, 525 insertions(+), 348 deletions(-)
Arnd Bergmann (1):
y2038: futex: Move compat implementation into futex.c
Bartosz Golaszewski (1):
iommu/vt-d: Don't dereference iommu_device if IOMMU_API is not built
Dan Carpenter (1):
can: dev: prevent potential information leak in can_fill_info()
David Woodhouse (1):
iommu/vt-d: Gracefully handle DMAR units with no supported address widths
Giacinto Cifelli (1):
net: usb: qmi_wwan: added support for Thales Cinterion PLSx3 modem family
Greg Kroah-Hartman (1):
Linux 4.4.255
Johannes Berg (2):
wext: fix NULL-ptr-dereference with cfg80211's lack of commit()
mac80211: pause TX while changing interface type
Kai-Heng Feng (1):
ACPI: sysfs: Prefer "compatible" modalias
Kamal Heib (1):
RDMA/cxgb4: Fix the reported max_recv_sge value
Like Xu (1):
KVM: x86/pmu: Fix HW_REF_CPU_CYCLES event pseudo-encoding in intel_arch_events[]
Lorenzo Bianconi (2):
mt7601u: fix kernel crash unplugging the device
mt7601u: fix rx buffer refcounting
Max Krummenacher (1):
ARM: imx: build suspend-imx6.S with arm instruction set
Pablo Neira Ayuso (1):
netfilter: nft_dynset: add timeout extension to template
Pan Bian (2):
NFC: fix resource leak when target index is invalid
NFC: fix possible resource leak
Shmulik Ladkani (1):
xfrm: Fix oops in xfrm_replay_advance_bmp
Thomas Gleixner (11):
futex: Move futex exit handling into futex code
futex: Replace PF_EXITPIDONE with a state
exit/exec: Seperate mm_release()
futex: Split futex_mm_release() for exit/exec
futex: Set task::futex_state to DEAD right after handling futex exit
futex: Mark the begin of futex exit explicitly
futex: Sanitize exit state handling
futex: Provide state handling for exec() as well
futex: Add mutex around futex exit
futex: Provide distinct return value when owner is exiting
futex: Prevent exit livelock
Greg Kroah-Hartman
maintainerMakefile +1 -1
@@ -1,6 +1,6 @@ VERSION = 4 PATCHLEVEL = 4 -SUBLEVEL = 254 +SUBLEVEL = 255 EXTRAVERSION = NAME = Blurry Fish Butt
arch/arm/mach-imx/suspend-imx6.S +1 -0
@@ -73,6 +73,7 @@ #define MX6Q_CCM_CCR 0x0 .align 3 + .arm .macro sync_l2_cache
arch/x86/kvm/pmu_intel.c +1 -1
@@ -29,7 +29,7 @@ static struct kvm_event_hw_type_mapping intel_arch_events[] = { [4] = { 0x2e, 0x41, PERF_COUNT_HW_CACHE_MISSES }, [5] = { 0xc4, 0x00, PERF_COUNT_HW_BRANCH_INSTRUCTIONS }, [6] = { 0xc5, 0x00, PERF_COUNT_HW_BRANCH_MISSES }, - [7] = { 0x00, 0x30, PERF_COUNT_HW_REF_CPU_CYCLES }, + [7] = { 0x00, 0x03, PERF_COUNT_HW_REF_CPU_CYCLES }, };/* mapping between fixed pmc index and intel_arch_events array */
drivers/acpi/device_sysfs.c +6 -14
@@ -259,20 +259,12 @@ int __acpi_device_uevent_modalias(struct acpi_device *adev,if (add_uevent_var (env,"MODALIAS=" ))return -ENOMEM ; - len =create_pnp_modalias (adev, &env->buf[env->buflen -1 ], -sizeof (env->buf) - env->buflen); -if (len <0 ) -return len; - - env->buflen += len; -if (!adev->data.of_compatible) -return 0 ; - -if (len >0 &&add_uevent_var (env,"MODALIAS=" )) -return -ENOMEM ; - - len =create_of_modalias (adev, &env->buf[env->buflen -1 ], -sizeof (env->buf) - env->buflen); +if (adev->data.of_compatible) + len =create_of_modalias (adev, &env->buf[env->buflen -1 ], +sizeof (env->buf) - env->buflen); +else + len =create_pnp_modalias (adev, &env->buf[env->buflen -1 ], +sizeof (env->buf) - env->buflen);if (len <0 )return len;
drivers/infiniband/hw/cxgb4/qp.c +1 -1
@@ -1898,7 +1898,7 @@ int c4iw_ib_query_qp(struct ib_qp *ibqp, struct ib_qp_attr *attr, init_attr->cap.max_send_wr = qhp->attr.sq_num_entries; init_attr->cap.max_recv_wr = qhp->attr.rq_num_entries; init_attr->cap.max_send_sge = qhp->attr.sq_max_sges; - init_attr->cap.max_recv_sge = qhp->attr.sq_max_sges; + init_attr->cap.max_recv_sge = qhp->attr.rq_max_sges; init_attr->cap.max_inline_data =T4_MAX_SEND_INLINE ; init_attr->sq_sig_type = qhp->sq_sig_all ?IB_SIGNAL_ALL_WR :0 ;return 0 ;
drivers/iommu/dmar.c +27 -16
75 lines not on this page · raw message
drivers/net/can/dev.c +1 -1
@@ -987,7 +987,7 @@ static int can_fill_info(struct sk_buff *skb, const struct net_device *dev) {struct can_priv *priv =netdev_priv (dev);struct can_ctrlmode cm = {.flags = priv->ctrlmode}; -struct can_berr_counter bec; +struct can_berr_counter bec = { };enum can_state state = priv->state;if (priv->do_get_state)
drivers/net/usb/qmi_wwan.c +1 -0
@@ -934,6 +934,7 @@ static const struct usb_device_id products[] = { {QMI_FIXED_INTF(0x0b3c, 0xc00a, 6)}, /* Olivetti Olicard 160 */ {QMI_FIXED_INTF(0x0b3c, 0xc00b, 4)}, /* Olivetti Olicard 500 */ {QMI_FIXED_INTF(0x1e2d, 0x0060, 4)}, /* Cinterion PLxx */ + {QMI_QUIRK_SET_DTR(0x1e2d, 0x006f, 8)}, /* Cinterion PLS83/PLS63 */ {QMI_FIXED_INTF(0x1e2d, 0x0053, 4)}, /* Cinterion PHxx,PXxx */ {QMI_FIXED_INTF(0x1e2d, 0x0082, 4)}, /* Cinterion PHxx,PXxx (2 RmNet) */ {QMI_FIXED_INTF(0x1e2d, 0x0082, 5)}, /* Cinterion PHxx,PXxx (2 RmNet) */
drivers/net/wireless/mediatek/mt7601u/dma.c +2 -3
@@ -160,8 +160,7 @@ mt7601u_rx_process_entry(struct mt7601u_dev *dev, struct mt7601u_dma_buf_rx *e)if (new_p) {/* we have one extra ref from the allocator */ -__free_pages (e->p,MT_RX_ORDER ); - +put_page (e->p); e->p = new_p; } }
@@ -318,7 +317,6 @@ static int mt7601u_dma_submit_tx(struct mt7601u_dev *dev, } e = &q->e[q->end]; - e->skb = skb;usb_fill_bulk_urb (e->urb, usb_dev, snd_pipe, skb->data, skb->len, mt7601u_complete_tx, q); ret =usb_submit_urb (e->urb,GFP_ATOMIC );
@@ -336,6 +334,7 @@ static int mt7601u_dma_submit_tx(struct mt7601u_dev *dev, q->end = (q->end +1 ) % q->entries; q->used++; + e->skb = skb;if (q->used >= q->entries)ieee80211_stop_queue (dev->hw,skb_get_queue_mapping (skb));
fs/exec.c +1 -1
@@ -875,7 +875,7 @@ static int exec_mmap(struct mm_struct *mm)/* Notify parent that we're no longer interested in the old VM */ tsk = current; old_mm = current->mm; -mm_release (tsk, old_mm); +exec_mm_release (tsk, old_mm);if (old_mm) {sync_mm_rss (old_mm);
include/linux/compat.h +0 -2
@@ -306,8 +306,6 @@ struct compat_kexec_segment;struct compat_mq_attr ;struct compat_msgbuf ; -extern void compat_exit_robust_list (struct task_struct *curr); -asmlinkage long compat_sys_set_robust_list (struct compat_robust_list_head __user *head,compat_size_t len);
include/linux/futex.h +29 -15
63 lines not on this page · raw message
include/linux/intel-iommu.h +2 -0
@@ -447,6 +447,8 @@ struct intel_iommu {struct device *iommu_dev;/* IOMMU-sysfs device */ int node;u32 flags;/* Software defined flags */ + +struct dmar_drhd_unit *drhd; }; static inline void __iommu_flush_cache(
include/linux/sched.h +6 -3
@@ -1704,6 +1704,8 @@ struct task_struct {#endif struct list_head pi_state_list;struct futex_pi_state *pi_state_cache; +struct mutex futex_exit_mutex; +unsigned int futex_state;#endif #ifdef CONFIG_PERF_EVENTS struct perf_event_context *perf_event_ctxp[perf_nr_task_contexts];
@@ -2099,7 +2101,6 @@ extern void thread_group_cputime_adjusted(struct task_struct *p, cputime_t *ut,* Per process flags */ #define PF_EXITING 0x00000004/* getting shut down */ -#define PF_EXITPIDONE 0x00000008/* pi exit done on shut down */ #define PF_VCPU 0x00000010/* I'm a virtual CPU */ #define PF_WQ_WORKER 0x00000020/* I'm a workqueue worker */ #define PF_FORKNOEXEC 0x00000040/* forked but didn't exec */
@@ -2647,8 +2648,10 @@ extern struct mm_struct *get_task_mm(struct task_struct *task);* succeeds. */ extern struct mm_struct *mm_access (struct task_struct *task,unsigned int mode); -/* Remove the current tasks stale references to the old mm_struct */ -extern void mm_release (struct task_struct *,struct mm_struct *); +/* Remove the current tasks stale references to the old mm_struct on exit() */ +extern void exit_mm_release (struct task_struct *,struct mm_struct *); +/* Remove the current tasks stale references to the old mm_struct on exec() */ +extern void exec_mm_release (struct task_struct *,struct mm_struct *);#ifdef CONFIG_HAVE_COPY_THREAD_TLS extern int copy_thread_tls(unsigned long, unsigned long, unsigned long,
kernel/Makefile +0 -3
@@ -36,9 +36,6 @@ obj-$(CONFIG_PROFILING) += profile.o obj-$(CONFIG_STACKTRACE) += stacktrace.o obj-y += time/ obj-$(CONFIG_FUTEX) += futex.o -ifeq ($(CONFIG_COMPAT),y) -obj-$(CONFIG_FUTEX) += futex_compat.o -endif obj-$(CONFIG_GENERIC_ISA_DMA) += dma.o obj-$(CONFIG_SMP) += smp.o ifneq ($(CONFIG_SMP),y)
kernel/exit.c +2 -23
@@ -389,7 +389,7 @@ static void exit_mm(struct task_struct *tsk)struct mm_struct *mm = tsk->mm;struct core_state *core_state; -mm_release (tsk, mm); +exit_mm_release (tsk, mm);if (!mm)return ;sync_mm_rss (mm);
@@ -695,27 +695,12 @@ void do_exit(long code)*/ if (unlikely (tsk->flags &PF_EXITING )) {pr_alert ("Fixing recursive fault but reboot is needed!\n" ); -/* -* We can do this unlocked here. The futex code uses -* this flag just to verify whether the pi state -* cleanup has been done or not. In the worst case it -* loops once more. We pretend that the cleanup was -* done as there is no way to return. Either the -* OWNER_DIED bit is set by now or we push the blocked -* task into the wait for ever nirwana as well. -*/ - tsk->flags |=PF_EXITPIDONE ; +futex_exit_recursive (tsk);set_current_state (TASK_UNINTERRUPTIBLE );schedule (); }exit_signals (tsk);/* sets PF_EXITING */ -/* -* tsk->flags are checked in the futex code to protect against -* an exiting task cleaning up the robust pi futexes. -*/ -smp_mb (); -raw_spin_unlock_wait (&tsk->pi_lock);if (unlikely (in_atomic ())) { pr_info("note: %s[%d] exited with preempt_count %d\n",
@@ -793,12 +778,6 @@ void do_exit(long code)* Make sure we are holding no locks: */ debug_check_no_locks_held (); -/* -* We can do this unlocked here. The futex code uses this flag -* just to verify whether the pi state cleanup has been done -* or not. In the worst case it loops once more. -*/ - tsk->flags |=PF_EXITPIDONE ;if (tsk->io_context)exit_io_context (tsk);
kernel/fork.c +15 -25
@@ -887,24 +887,8 @@ static int wait_for_vfork_done(struct task_struct *child,* restoring the old one. . . * Eric Biederman 10 January 1998 */ -void mm_release (struct task_struct *tsk,struct mm_struct *mm) +static void mm_release (struct task_struct *tsk,struct mm_struct *mm) { -/* Get rid of any futexes when releasing the mm */ -#ifdef CONFIG_FUTEX -if (unlikely (tsk->robust_list)) { -exit_robust_list (tsk); - tsk->robust_list =NULL ; - } -#ifdef CONFIG_COMPAT -if (unlikely (tsk->compat_robust_list)) { -compat_exit_robust_list (tsk); - tsk->compat_robust_list =NULL ; - } -#endif -if (unlikely (!list_empty (&tsk->pi_state_list))) -exit_pi_state_list (tsk); -#endif -uprobe_free_utask (tsk);/* Get rid of any cached register state */
@@ -937,6 +921,18 @@ void mm_release(struct task_struct *tsk, struct mm_struct *mm)complete_vfork_done (tsk); } +void exit_mm_release (struct task_struct *tsk,struct mm_struct *mm) +{ +futex_exit_release (tsk); +mm_release (tsk, mm); +} + +void exec_mm_release (struct task_struct *tsk,struct mm_struct *mm) +{ +futex_exec_release (tsk); +mm_release (tsk, mm); +} +/* * Allocate a new mm structure and copy contents from the * mm structure of the passed in task structure.
@@ -1511,14 +1507,8 @@ static struct task_struct *copy_process(unsigned long clone_flags,#ifdef CONFIG_BLOCK p->plug =NULL ;#endif -#ifdef CONFIG_FUTEX - p->robust_list =NULL ; -#ifdef CONFIG_COMPAT - p->compat_robust_list =NULL ; -#endif -INIT_LIST_HEAD (&p->pi_state_list); - p->pi_state_cache =NULL ; -#endif +futex_init_task (p); +/* * sigaltstack should be cleared when sharing the same VM */
kernel/futex.c +413 -33
633 lines not on this page · raw message
kernel/futex_compat.c deleted +0 -201
201 lines not on this page · raw message
net/mac80211/ieee80211_i.h +1 -0
@@ -1027,6 +1027,7 @@ enum queue_stop_reason {IEEE80211_QUEUE_STOP_REASON_FLUSH ,IEEE80211_QUEUE_STOP_REASON_TDLS_TEARDOWN ,IEEE80211_QUEUE_STOP_REASON_RESERVE_TID , +IEEE80211_QUEUE_STOP_REASON_IFTYPE_CHANGE , IEEE80211_QUEUE_STOP_REASONS, };
net/mac80211/iface.c +6 -0
@@ -1507,6 +1507,10 @@ static int ieee80211_runtime_change_iftype(struct ieee80211_sub_if_data *sdata,if (ret)return ret; +ieee80211_stop_vif_queues (local, sdata, +IEEE80211_QUEUE_STOP_REASON_IFTYPE_CHANGE ); +synchronize_net (); +ieee80211_do_stop (sdata, false);ieee80211_teardown_sdata (sdata);
@@ -1527,6 +1531,8 @@ static int ieee80211_runtime_change_iftype(struct ieee80211_sub_if_data *sdata, err =ieee80211_do_open (&sdata->wdev, false);WARN (err,"type change: do_open returned %d" , err); +ieee80211_wake_vif_queues (local, sdata, +IEEE80211_QUEUE_STOP_REASON_IFTYPE_CHANGE );return ret; }
net/netfilter/nft_dynset.c +3 -1
@@ -189,8 +189,10 @@ static int nft_dynset_init(const struct nft_ctx *ctx,nft_set_ext_add_length (&priv->tmpl,NFT_SET_EXT_EXPR , priv->expr->ops->size);if (set->flags &NFT_SET_TIMEOUT ) { -if (timeout || set->timeout) +if (timeout || set->timeout) { +nft_set_ext_add (&priv->tmpl,NFT_SET_EXT_TIMEOUT );nft_set_ext_add (&priv->tmpl,NFT_SET_EXT_EXPIRATION ); + } } priv->timeout = timeout;
net/nfc/netlink.c +1 -0
@@ -850,6 +850,7 @@ static int nfc_genl_stop_poll(struct sk_buff *skb, struct genl_info *info)if (!dev->polling) {device_unlock (&dev->dev); +nfc_put_device (dev);return -EINVAL ; }
net/nfc/rawsock.c +1 -1
@@ -117,7 +117,7 @@ static int rawsock_connect(struct socket *sock, struct sockaddr *_addr,if (addr->target_idx > dev->target_next_idx -1 || addr->target_idx < dev->target_next_idx - dev->n_targets) { rc = -EINVAL ; - goto error; + goto put_dev; } rc =nfc_activate_target (dev, addr->target_idx, addr->nfc_protocol);
net/wireless/wext-core.c +3 -2
@@ -895,8 +895,9 @@ out:int call_commit_handler (struct net_device *dev) {#ifdef CONFIG_WIRELESS_EXT -if ((netif_running (dev)) && - (dev->wireless_handlers->standard[0 ] !=NULL )) +if (netif_running (dev) && + dev->wireless_handlers && + dev->wireless_handlers->standard[0 ])/* Call the commit handler on the driver */ return dev->wireless_handlers->standard[0 ](dev,NULL ,NULL ,NULL );
net/xfrm/xfrm_input.c +1 -1
@@ -315,7 +315,7 @@ resume:/* only the first xfrm gets the encap type */ encap_type =0 ; -if (async && x->repl->recheck (x, skb, seq)) { +if (x->repl->recheck (x, skb, seq)) {XFRM_INC_STATS (net,LINUX_MIB_XFRMINSTATESEQERROR ); goto drop_unlock; }