Linux 4.14.219
Greg Kroah-Hartman
maintainerI'm announcing the release of the 4.14.219 kernel.
All users of the 4.14 kernel series must upgrade.
The updated 4.14.y git tree can be found at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git linux-4.14.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/boot/dts/imx6qdl-gw52xx.dtsi | 2 - arch/arm/mach-imx/suspend-imx6.S | 1 arch/x86/entry/entry_64_compat.S | 8 ++-- arch/x86/kvm/pmu_intel.c | 2 - arch/x86/kvm/x86.c | 5 ++ drivers/acpi/device_sysfs.c | 20 +++------- drivers/block/nbd.c | 8 ++++ drivers/block/xen-blkfront.c | 20 +++------- drivers/infiniband/hw/cxgb4/qp.c | 2 - drivers/iommu/dmar.c | 45 ++++++++++++++++-------- drivers/leds/led-triggers.c | 10 +++-- drivers/net/can/dev.c | 2 - drivers/net/team/team.c | 6 +-- drivers/net/usb/qmi_wwan.c | 1 drivers/net/wireless/intel/iwlwifi/pcie/trans.c | 14 ++++--- drivers/net/wireless/mediatek/mt7601u/dma.c | 5 +- drivers/soc/atmel/soc.c | 13 ++++++ drivers/xen/xenbus/xenbus_probe.c | 31 ++++++++++++++++ include/linux/intel-iommu.h | 2 + include/net/tcp.h | 2 - net/ipv4/tcp_input.c | 10 +++-- net/ipv4/tcp_recovery.c | 5 +- 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 - tools/testing/selftests/x86/test_syscall_vdso.c | 35 +++++++++++------- 31 files changed, 180 insertions(+), 92 deletions(-)
Andrea Righi (1):
leds: trigger: fix potential deadlock with libata
Andy Lutomirski (2):
x86/entry/64/compat: Preserve r8-r11 in int $0x80
x86/entry/64/compat: Fix "x86/entry/64/compat: Preserve r8-r11 in int $0x80"Bartosz Golaszewski (1):
iommu/vt-d: Don't dereference iommu_device if IOMMU_API is not built
Claudiu Beznea (1):
drivers: soc: atmel: add null entry at the end of at91_soc_allowed_list[]
Dan Carpenter (1):
can: dev: prevent potential information leak in can_fill_info()
David Woodhouse (2):
xen: Fix XenStore initialisation for XS_LOCAL
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.14.219
Ivan Vecera (1):
team: protect features update by RCU to avoid deadlock
Jay Zhou (1):
KVM: x86: get smi pending status correctly
Johannes Berg (4):
wext: fix NULL-ptr-dereference with cfg80211's lack of commit()
iwlwifi: pcie: use jiffies for memory read spin time limit
iwlwifi: pcie: reschedule in long-running memory reads
mac80211: pause TX while changing interface type
Josef Bacik (1):
nbd: freeze the queue while we're adding connections
Kai-Heng Feng (1):
ACPI: sysfs: Prefer "compatible" modalias
Kamal Heib (1):
RDMA/cxgb4: Fix the reported max_recv_sge value
Koen Vandeputte (1):
ARM: dts: imx6qdl-gw52xx: fix duplicate regulator naming
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
Pengcheng Yang (1):
tcp: fix TLP timer not set when CA_STATE changes from DISORDER to OPEN
Roger Pau Monne (1):
xen-blkfront: allow discard-* nodes to be optional
Shmulik Ladkani (1):
xfrm: Fix oops in xfrm_replay_advance_bmp
Sudeep Holla (1):
drivers: soc: atmel: Avoid calling at91_soc_init on non AT91 SoCs
Greg Kroah-Hartman
maintainerMakefile +1 -1
@@ -1,7 +1,7 @@ # SPDX-License-Identifier: GPL-2.0 VERSION = 4 PATCHLEVEL = 14 -SUBLEVEL = 218 +SUBLEVEL = 219 EXTRAVERSION = NAME = Petit Gorille
arch/arm/boot/dts/imx6qdl-gw52xx.dtsi +1 -1
@@ -278,7 +278,7 @@ /* VDD_AUD_1P8: Audio codec */ reg_aud_1p8v: ldo3 { - regulator-name = "vdd1p8"; + regulator-name = "vdd1p8a"; regulator-min-microvolt = <1800000>; regulator-max-microvolt = <1800000>; regulator-boot-on;
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/entry/entry_64_compat.S +4 -4
@@ -357,13 +357,13 @@ ENTRY(entry_INT80_compat) pushq %rdx /* pt_regs->dx */ pushq %rcx /* pt_regs->cx */ pushq $-ENOSYS /* pt_regs->ax */ - pushq $0 /* pt_regs->r8 = 0 */ + pushq %r8 /* pt_regs->r8 */ xorl %r8d, %r8d /* nospec r8 */ - pushq $0 /* pt_regs->r9 = 0 */ + pushq %r9 /* pt_regs->r9 */ xorl %r9d, %r9d /* nospec r9 */ - pushq $0 /* pt_regs->r10 = 0 */ + pushq %r10 /* pt_regs->r10*/ xorl %r10d, %r10d /* nospec r10 */ - pushq $0 /* pt_regs->r11 = 0 */ + pushq %r11 /* pt_regs->r11 */ xorl %r11d, %r11d /* nospec r11 */ pushq %rbx /* pt_regs->rbx */ xorl %ebx, %ebx /* nospec rbx */
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 */
arch/x86/kvm/x86.c +5 -0
@@ -98,6 +98,7 @@ static u64 __read_mostly efer_reserved_bits = ~((u64)EFER_SCE);static void update_cr8_intercept (struct kvm_vcpu *vcpu);static void process_nmi (struct kvm_vcpu *vcpu); +static void process_smi (struct kvm_vcpu *vcpu);static void enter_smm (struct kvm_vcpu *vcpu);static void __kvm_set_rflags (struct kvm_vcpu *vcpu,unsigned long rflags);
@@ -3290,6 +3291,10 @@ static void kvm_vcpu_ioctl_x86_get_vcpu_events(struct kvm_vcpu *vcpu, struct kvm_vcpu_events *events) {process_nmi (vcpu); + +if (kvm_check_request (KVM_REQ_SMI , vcpu)) +process_smi (vcpu); +/* * FIXME: pass injected and pending separately. This is only * needed for nested virtualization, whose state cannot be
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/block/nbd.c +8 -0
@@ -952,6 +952,12 @@ static int nbd_add_socket(struct nbd_device *nbd, unsigned long arg,if (!sock)return err; +/* +* We need to make sure we don't get any errant requests while we're +* reallocating the ->socks array. +*/ +blk_mq_freeze_queue (nbd->disk->queue); +if (!netlink && !nbd->task_setup && !test_bit (NBD_BOUND , &config->runtime_flags)) nbd->task_setup = current;
@@ -990,10 +996,12 @@ static int nbd_add_socket(struct nbd_device *nbd, unsigned long arg, nsock->cookie =0 ; socks[config->num_connections++] = nsock;atomic_inc (&config->live_connections); +blk_mq_unfreeze_queue (nbd->disk->queue);return 0 ; put_socket: +blk_mq_unfreeze_queue (nbd->disk->queue);sockfd_put (sock);return err; }
drivers/block/xen-blkfront.c +7 -13
@@ -937,7 +937,8 @@ static void blkif_set_queue_limits(struct blkfront_info *info)if (info->feature_discard) {queue_flag_set_unlocked (QUEUE_FLAG_DISCARD , rq);blk_queue_max_discard_sectors (rq,get_capacity (gd)); - rq->limits.discard_granularity = info->discard_granularity; + rq->limits.discard_granularity = info->discard_granularity ?: + info->physical_sector_size; rq->limits.discard_alignment = info->discard_alignment;if (info->feature_secdiscard)queue_flag_set_unlocked (QUEUE_FLAG_SECERASE , rq);
@@ -2155,19 +2156,12 @@ static void blkfront_closing(struct blkfront_info *info)static void blkfront_setup_discard (struct blkfront_info *info) { -int err; -unsigned int discard_granularity; -unsigned int discard_alignment; - info->feature_discard =1 ; - err =xenbus_gather (XBT_NIL , info->xbdev->otherend, -"discard-granularity" ,"%u" , &discard_granularity, -"discard-alignment" ,"%u" , &discard_alignment, -NULL ); -if (!err) { - info->discard_granularity = discard_granularity; - info->discard_alignment = discard_alignment; - } + info->discard_granularity =xenbus_read_unsigned (info->xbdev->otherend, +"discard-granularity" , +0 ); + info->discard_alignment =xenbus_read_unsigned (info->xbdev->otherend, +"discard-alignment" ,0 ); info->feature_secdiscard = !!xenbus_read_unsigned (info->xbdev->otherend,"discard-secure" ,0 );
drivers/infiniband/hw/cxgb4/qp.c +1 -1
@@ -2117,7 +2117,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 +31 -14
76 lines not on this page · raw message
drivers/leds/led-triggers.c +6 -4
@@ -283,14 +283,15 @@ void led_trigger_event(struct led_trigger *trig, enum led_brightness brightness) {struct led_classdev *led_cdev; +unsigned long flags;if (!trig)return ; -read_lock (&trig->leddev_list_lock); +read_lock_irqsave (&trig->leddev_list_lock, flags);list_for_each_entry (led_cdev, &trig->led_cdevs, trig_list)led_set_brightness (led_cdev, brightness); -read_unlock (&trig->leddev_list_lock); +read_unlock_irqrestore (&trig->leddev_list_lock, flags); }EXPORT_SYMBOL_GPL (led_trigger_event);
@@ -301,11 +302,12 @@ static void led_trigger_blink_setup(struct led_trigger *trig, int invert) {struct led_classdev *led_cdev; +unsigned long flags;if (!trig)return ; -read_lock (&trig->leddev_list_lock); +read_lock_irqsave (&trig->leddev_list_lock, flags);list_for_each_entry (led_cdev, &trig->led_cdevs, trig_list) {if (oneshot) led_blink_set_oneshot(led_cdev, delay_on, delay_off,
@@ -313,7 +315,7 @@ static void led_trigger_blink_setup(struct led_trigger *trig,else led_blink_set (led_cdev, delay_on, delay_off); } -read_unlock (&trig->leddev_list_lock); +read_unlock_irqrestore (&trig->leddev_list_lock, flags); } void led_trigger_blink(struct led_trigger *trig,
drivers/net/can/dev.c +1 -1
@@ -1102,7 +1102,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/team/team.c +3 -3
@@ -1002,7 +1002,8 @@ static void __team_compute_features(struct team *team)unsigned int dst_release_flag =IFF_XMIT_DST_RELEASE |IFF_XMIT_DST_RELEASE_PERM ; -list_for_each_entry (port, &team->port_list, list) { +rcu_read_lock (); +list_for_each_entry_rcu (port, &team->port_list, list) { vlan_features =netdev_increment_features (vlan_features, port->dev->vlan_features,TEAM_VLAN_FEATURES );
@@ -1016,6 +1017,7 @@ static void __team_compute_features(struct team *team)if (port->dev->hard_header_len > max_hard_header_len) max_hard_header_len = port->dev->hard_header_len; } +rcu_read_unlock (); team->dev->vlan_features = vlan_features; team->dev->hw_enc_features = enc_features | NETIF_F_GSO_ENCAP_ALL |
@@ -1030,9 +1032,7 @@ static void __team_compute_features(struct team *team)static void team_compute_features (struct team *team) { -mutex_lock (&team->lock);__team_compute_features (team); -mutex_unlock (&team->lock);netdev_change_features (team->dev); }
drivers/net/usb/qmi_wwan.c +1 -0
@@ -1273,6 +1273,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, 0x0063, 10)}, /* Cinterion ALASxx (1 RmNet) */ {QMI_FIXED_INTF(0x1e2d, 0x0082, 4)}, /* Cinterion PHxx,PXxx (2 RmNet) */
drivers/net/wireless/intel/iwlwifi/pcie/trans.c +8 -6
@@ -1932,7 +1932,8 @@ static int iwl_trans_pcie_read_mem(struct iwl_trans *trans, u32 addr,while (offs < dwords) {/* limit the time we spin here under lock to 1/2s */ -ktime_t timeout =ktime_add_us (ktime_get (),500 *USEC_PER_MSEC ); +unsigned long end = jiffies +HZ /2 ; +bool resched = false;if (iwl_trans_grab_nic_access (trans, &flags)) { iwl_write32(trans, HBUS_TARG_MEM_RADDR,
@@ -1943,14 +1944,15 @@ static int iwl_trans_pcie_read_mem(struct iwl_trans *trans, u32 addr, HBUS_TARG_MEM_RDAT); offs++; -/* calling ktime_get is expensive so -* do it once in 128 reads -*/ -if (offs %128 ==0 &&ktime_after (ktime_get (), - timeout)) +if (time_after (jiffies, end)) { + resched = true;break ; + } }iwl_trans_release_nic_access (trans, &flags); + +if (resched) +cond_resched (); }else {return -EBUSY ; }
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));
drivers/soc/atmel/soc.c +13 -0
@@ -246,8 +246,21 @@ struct soc_device * __init at91_soc_init(const struct at91_soc *socs)return soc_dev; } +static const struct of_device_id at91_soc_allowed_list[]__initconst = { + { .compatible ="atmel,at91rm9200" , }, + { .compatible ="atmel,at91sam9" , }, + { .compatible ="atmel,sama5" , }, + { .compatible ="atmel,samv7" , }, + { } +}; +static int __init atmel_soc_device_init (void ) { +struct device_node *np =of_find_node_by_path ("/" ); + +if (!of_match_node (at91_soc_allowed_list, np)) +return 0 ; +at91_soc_init (socs);return 0 ;
drivers/xen/xenbus/xenbus_probe.c +31 -0
@@ -705,6 +705,23 @@ static bool xs_hvm_defer_init_for_callback(void)#endif } +static int xenbus_probe_thread (void *unused) +{ +DEFINE_WAIT (w); + +/* +* We actually just want to wait for *any* trigger of xb_waitq, +* and run xenbus_probe() the moment it occurs. +*/ +prepare_to_wait (&xb_waitq, &w,TASK_INTERRUPTIBLE ); +schedule (); +finish_wait (&xb_waitq, &w); + +DPRINTK ("probing" ); +xenbus_probe (); +return 0 ; +} +static int __init xenbus_probe_initcall (void ) {/*
@@ -716,6 +733,20 @@ static int __init xenbus_probe_initcall(void) !xs_hvm_defer_init_for_callback()))xenbus_probe (); +/* +* For XS_LOCAL, spawn a thread which will wait for xenstored +* or a xenstore-stubdom to be started, then probe. It will be +* triggered when communication starts happening, by waiting +* on xb_waitq. +*/ +if (xen_store_domain_type ==XS_LOCAL ) { +struct task_struct *probe_task; + + probe_task =kthread_run (xenbus_probe_thread,NULL , +"xenbus_probe" ); +if (IS_ERR (probe_task)) +return PTR_ERR (probe_task); + }return 0 ; }device_initcall (xenbus_probe_initcall);
include/linux/intel-iommu.h +2 -0
@@ -434,6 +434,8 @@ struct intel_iommu {struct iommu_device iommu;/* IOMMU core code handle */ int node;u32 flags;/* Software defined flags */ + +struct dmar_drhd_unit *drhd; }; static inline void __iommu_flush_cache(
include/net/tcp.h +1 -1
@@ -1969,7 +1969,7 @@ void tcp_v4_init(void);void tcp_init (void );/* tcp_recovery.c */ -extern void tcp_rack_mark_lost (struct sock *sk); +extern bool tcp_rack_mark_lost (struct sock *sk);extern void tcp_rack_advance (struct tcp_sock *tp,u8 sacked,u32 end_seq,u64 xmit_time);extern void tcp_rack_reo_timeout (struct sock *sk);
net/ipv4/tcp_input.c +6 -4
@@ -2803,7 +2803,8 @@ static void tcp_rack_identify_loss(struct sock *sk, int *ack_flag)if (sysctl_tcp_recovery &TCP_RACK_LOSS_DETECTION ) {u32 prior_retrans = tp->retrans_out; -tcp_rack_mark_lost (sk); +if (tcp_rack_mark_lost (sk)) + *ack_flag &= ~FLAG_SET_XMIT_TIMER ;if (prior_retrans > tp->retrans_out) *ack_flag |=FLAG_LOST_RETRANS ; }
@@ -3688,15 +3689,16 @@ static int tcp_ack(struct sock *sk, const struct sk_buff *skb, int flag)if (tp->tlp_high_seq)tcp_process_tlp_ack (sk, ack, flag); -/* If needed, reset TLP/RTO timer; RACK may later override this. */ -if (flag &FLAG_SET_XMIT_TIMER ) -tcp_set_xmit_timer (sk);if (tcp_ack_is_dubious (sk, flag)) { is_dupack = !(flag & (FLAG_SND_UNA_ADVANCED |FLAG_NOT_DUP ));tcp_fastretrans_alert (sk, acked, is_dupack, &flag, &rexmit); } +/* If needed, reset TLP/RTO timer when RACK doesn't set. */ +if (flag &FLAG_SET_XMIT_TIMER ) +tcp_set_xmit_timer (sk); +if ((flag &FLAG_FORWARD_PROGRESS ) || !(flag &FLAG_NOT_DUP ))sk_dst_confirm (sk);
net/ipv4/tcp_recovery.c +3 -2
@@ -102,13 +102,13 @@ static void tcp_rack_detect_loss(struct sock *sk, u32 *reo_timeout) } } -void tcp_rack_mark_lost (struct sock *sk) +bool tcp_rack_mark_lost (struct sock *sk) {struct tcp_sock *tp =tcp_sk (sk);u32 timeout;if (!tp->rack.advanced) -return ; +return false;/* Reset the advanced flag to avoid unnecessary queue scanning */ tp->rack.advanced =0 ;
@@ -118,6 +118,7 @@ void tcp_rack_mark_lost(struct sock *sk)inet_csk_reset_xmit_timer (sk,ICSK_TIME_REO_TIMEOUT , timeout,inet_csk (sk)->icsk_rto); } +return !!timeout; }/* Record the most recently (re)sent time among the (s)acked packets
net/mac80211/ieee80211_i.h +1 -0
@@ -1047,6 +1047,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
@@ -1559,6 +1559,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);
@@ -1579,6 +1583,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
@@ -205,8 +205,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
@@ -884,6 +884,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
@@ -898,8 +898,9 @@ static int ioctl_standard_iw_point(struct iw_point *iwp, unsigned int cmd,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
@@ -415,7 +415,7 @@ int xfrm_input(struct sk_buff *skb, int nexthdr, __be32 spi, int encap_type)/* 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; }
tools/testing/selftests/x86/test_syscall_vdso.c +21 -14
@@ -100,12 +100,19 @@ asm (" shl $32, %r8\n" " orq $0x7f7f7f7f, %r8\n" " movq %r8, %r9\n" -" movq %r8, %r10\n" -" movq %r8, %r11\n" -" movq %r8, %r12\n" -" movq %r8, %r13\n" -" movq %r8, %r14\n" -" movq %r8, %r15\n" +" incq %r9\n" +" movq %r9, %r10\n" +" incq %r10\n" +" movq %r10, %r11\n" +" incq %r11\n" +" movq %r11, %r12\n" +" incq %r12\n" +" movq %r12, %r13\n" +" incq %r13\n" +" movq %r13, %r14\n" +" incq %r14\n" +" movq %r14, %r15\n" +" incq %r15\n" " ret\n" " .code32\n" " .popsection\n"
@@ -128,12 +135,13 @@ int check_regs64(void)int err =0 ;int num =8 ;uint64_t *r64 = ®s64.r8; +uint64_t expected =0x7f7f7f7f7f7f7f7fULL ;if (!kernel_is_64bit)return 0 ; do { - if (*r64 == 0x7f7f7f7f7f7f7f7fULL) + if (*r64 == expected++) continue; /* register did not change */ if (syscall_addr != (long)&int80) { /*
@@ -147,18 +155,17 @@ int check_regs64(void)continue ; } }else { -/* INT80 syscall entrypoint can be used by +/* +* INT80 syscall entrypoint can be used by * 64-bit programs too, unlike SYSCALL/SYSENTER. * Therefore it must preserve R12+ * (they are callee-saved registers in 64-bit C ABI). * -* This was probably historically not intended, -* but R8..11 are clobbered (cleared to 0). -* IOW: they are the only registers which aren't -* preserved across INT80 syscall. +* Starting in Linux 4.17 (and any kernel that +* backports the change), R8..11 are preserved. +* Historically (and probably unintentionally), they +* were clobbered or zeroed. */ -if (*r64 ==0 && num <=11 ) -continue ; }printf ("[FAIL]\tR%d has changed:%016llx\n" , num, *r64); err++;