Linux 5.4.95
Greg Kroah-Hartman
maintainerI'm announcing the release of the 5.4.95 kernel.
All users of the 5.4 kernel series must upgrade.
The updated 5.4.y git tree can be found at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git linux-5.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
------------
Documentation/virt/kvm/api.txt | 3 Makefile | 2 arch/arm/boot/dts/imx6qdl-gw52xx.dtsi | 2 arch/arm/boot/dts/imx6qdl-kontron-samx6i.dtsi | 4 arch/arm/mach-imx/suspend-imx6.S | 1 arch/arm64/boot/dts/broadcom/stingray/stingray-usb.dtsi | 7 arch/arm64/boot/dts/freescale/fsl-ls1028a.dtsi | 2 arch/x86/kvm/vmx/nested.c | 13 + arch/x86/kvm/vmx/pmu_intel.c | 6 arch/x86/kvm/x86.c | 5 drivers/acpi/device_sysfs.c | 20 -- drivers/block/nbd.c | 8 + drivers/block/xen-blkfront.c | 20 -- drivers/firmware/imx/Kconfig | 1 drivers/gpu/drm/i915/i915_drv.h | 2 drivers/gpu/drm/nouveau/nouveau_svm.c | 4 drivers/infiniband/hw/cxgb4/qp.c | 2 drivers/iommu/dmar.c | 45 ++++- drivers/leds/led-triggers.c | 10 - drivers/media/rc/rc-main.c | 4 drivers/net/can/dev.c | 2 drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c | 11 - drivers/net/ethernet/intel/igc/igc_ethtool.c | 24 ++- drivers/net/ethernet/mellanox/mlx5/core/en_tc.c | 15 + drivers/net/ethernet/mellanox/mlx5/core/fs_core.c | 1 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/nvme/host/multipath.c | 2 drivers/s390/crypto/vfio_ap_drv.c | 6 drivers/s390/crypto/vfio_ap_ops.c | 100 ++++++++----- drivers/s390/crypto/vfio_ap_private.h | 12 - drivers/soc/atmel/soc.c | 13 + drivers/tee/optee/call.c | 4 drivers/xen/xenbus/xenbus_probe.c | 31 ++++ fs/btrfs/block-group.c | 10 + fs/btrfs/ctree.h | 3 fs/btrfs/free-space-tree.c | 10 + fs/nfs/pnfs.c | 1 include/linux/intel-iommu.h | 2 include/net/tcp.h | 2 include/uapi/linux/icmpv6.h | 1 kernel/kexec_core.c | 2 kernel/power/swap.c | 2 net/ipv4/tcp_input.c | 10 - net/ipv4/tcp_recovery.c | 5 net/ipv6/icmp.c | 8 - net/ipv6/reassembly.c | 33 ++++ 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/rxrpc/call_accept.c | 1 net/wireless/wext-core.c | 5 net/xfrm/xfrm_input.c | 2 net/xfrm/xfrm_policy.c | 30 ++- sound/pci/hda/patch_realtek.c | 1 sound/pci/hda/patch_via.c | 2 sound/soc/intel/skylake/skl-topology.c | 13 - sound/soc/soc-topology.c | 2 tools/testing/selftests/net/forwarding/router_mpath_nh.sh | 2 tools/testing/selftests/net/forwarding/router_multipath.sh | 2 tools/testing/selftests/net/xfrm_policy.sh | 45 +++++ virt/kvm/kvm_main.c | 1 66 files changed, 434 insertions(+), 183 deletions(-)
Andrea Righi (1):
leds: trigger: fix potential deadlock with libata
Baoquan He (1):
kernel: kexec: remove the lock operation of system_transition_mutex
Bartosz Golaszewski (1):
iommu/vt-d: Don't dereference iommu_device if IOMMU_API is not built
Bharat Gooty (1):
arm64: dts: broadcom: Fix USB DMA address translation for Stingray
Claudiu Beznea (1):
drivers: soc: atmel: add null entry at the end of at91_soc_allowed_list[]
Corinna Vinschen (1):
igc: fix link speed advertising
Dan Carpenter (2):
can: dev: prevent potential information leak in can_fill_info()
ASoC: topology: Fix memory corruption in soc_tplg_denum_create_values()
Daniel Wagner (1):
nvme-multipath: Early exit if no path is available
Danielle Ratson (1):
selftests: forwarding: Specify interface when invoking mausezahn
David Woodhouse (2):
xen: Fix XenStore initialisation for XS_LOCAL
iommu/vt-d: Gracefully handle DMAR units with no supported address widths
Eyal Birger (1):
xfrm: fix disable_xfrm sysctl when used on xfrm interfaces
Giacinto Cifelli (1):
net: usb: qmi_wwan: added support for Thales Cinterion PLSx3 modem family
Greg Kroah-Hartman (1):
Linux 5.4.95
Hangbin Liu (2):
ICMPv6: Add ICMPv6 Parameter Problem, code 3 definition
IPv6: reply ICMP error if the first fragment don't include all headers
Ivan Vecera (1):
team: protect features update by RCU to avoid deadlock
Jay Zhou (1):
KVM: x86: get smi pending status correctly
Jian-Hong Pan (1):
ALSA: hda/realtek: Enable headset of ASUS B1400CEPE with ALC256
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 (2):
nbd: freeze the queue while we're adding connections
btrfs: fix possible free space tree corruption with online conversion
Kai-Heng Feng (1):
ACPI: sysfs: Prefer "compatible" modalias
Kamal Heib (1):
RDMA/cxgb4: Fix the reported max_recv_sge value
Karol Herbst (1):
drm/nouveau/svm: fail NOUVEAU_SVM_INIT ioctl on unsupported devices
Koen Vandeputte (1):
ARM: dts: imx6qdl-gw52xx: fix duplicate regulator naming
Laurent Badel (1):
PM: hibernate: flush swap writer after marking
Like Xu (2):
KVM: x86/pmu: Fix HW_REF_CPU_CYCLES event pseudo-encoding in intel_arch_events[]
KVM: x86/pmu: Fix UBSAN shift-out-of-bounds warning in intel_pmu_refresh()
Lorenzo Bianconi (2):
mt7601u: fix kernel crash unplugging the device
mt7601u: fix rx buffer refcounting
Maor Dickman (1):
net/mlx5e: Reduce tc unsupported key print level
Marc Zyngier (1):
KVM: Forbid the use of tagged userspace addresses for memslots
Marco Felsch (1):
ARM: dts: imx6qdl-kontron-samx6i: fix i2c_lcd/cam default status
Max Krummenacher (1):
ARM: imx: build suspend-imx6.S with arm instruction set
Maxim Levitsky (1):
KVM: nVMX: Sync unsync'd vmcs02 state to vmcs12 on migration
Michael Walle (1):
arm64: dts: ls1028a: fix the offset of the reset register
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
Parav Pandit (1):
net/mlx5e: E-switch, Fix rate calculation for overflow
Pengcheng Yang (1):
tcp: fix TLP timer not set when CA_STATE changes from DISORDER to OPEN
Po-Hsu Lin (1):
selftests: xfrm: fix test return value override issue in xfrm_policy.sh
Randy Dunlap (1):
firmware: imx: select SOC_BUS to fix firmware build
Ricardo Ribalda (1):
ASoC: Intel: Skylake: skl-topology: Fix OOPs ib skl_tplg_complete
Roger Pau Monne (1):
xen-blkfront: allow discard-* nodes to be optional
Roi Dayan (1):
net/mlx5: Fix memory leak on flow table creation error flow
Rouven Czerwinski (1):
tee: optee: replace might_sleep with cond_resched
Sean Young (1):
media: rc: ensure that uevent can be read directly after rc device register
Shmulik Ladkani (1):
xfrm: Fix oops in xfrm_replay_advance_bmp
Stefan Assmann (1):
i40e: acquire VSI pointer only after VF is initialized
Sudeep Holla (1):
drivers: soc: atmel: Avoid calling at91_soc_init on non AT91 SoCs
Takashi Iwai (1):
ALSA: hda/via: Apply the workaround generically for Clevo machines
Takeshi Misawa (1):
rxrpc: Fix memory leak in rxrpc_lookup_local
Tony Krowiak (1):
s390/vfio-ap: No need to disable IRQ after queue reset
Trond Myklebust (1):
pNFS/NFSv4: Fix a layout segment leak in pnfs_layout_process()
Umesh Nerlige Ramappa (1):
drm/i915: Check for all subplatform bits
Visa Hankala (1):
xfrm: Fix wraparound in xfrm_policy_addr_delta()
Greg Kroah-Hartman
maintainerDocumentation/virt/kvm/api.txt +3 -0
@@ -1132,6 +1132,9 @@ field userspace_addr, which must point at user addressable memory for the entire memory slot size. Any object may back this memory, including anonymous memory, ordinary files, and hugetlbfs. +On architectures that support a form of address tagging, userspace_addr must +be an untagged address. + It is recommended that the lower 21 bits of guest_phys_addr and userspace_addr be identical. This allows large pages in the guest to be backed by large pages in the host.
Makefile +1 -1
@@ -1,7 +1,7 @@ # SPDX-License-Identifier: GPL-2.0 VERSION = 5 PATCHLEVEL = 4 -SUBLEVEL = 94 +SUBLEVEL = 95 EXTRAVERSION = NAME = Kleptomaniac Octopus
arch/arm/boot/dts/imx6qdl-gw52xx.dtsi +1 -1
@@ -273,7 +273,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/boot/dts/imx6qdl-kontron-samx6i.dtsi +2 -2
@@ -167,7 +167,7 @@ i2c-gpio,delay-us = <2>; /* ~100 kHz */ #address-cells = <1>; #size-cells = <0>; - status = "disabld"; + status = "disabled"; }; i2c_cam: i2c-gpio-cam {
@@ -179,7 +179,7 @@ i2c-gpio,delay-us = <2>; /* ~100 kHz */ #address-cells = <1>; #size-cells = <0>; - status = "disabld"; + status = "disabled"; }; };
arch/arm/mach-imx/suspend-imx6.S +1 -0
@@ -67,6 +67,7 @@ #define MX6Q_CCM_CCR 0x0 .align 3 + .arm .macro sync_l2_cache
arch/arm64/boot/dts/broadcom/stingray/stingray-usb.dtsi +6 -1
@@ -4,11 +4,16 @@ */ usb { compatible = "simple-bus"; - dma-ranges; #address-cells = <2>; #size-cells = <2>; ranges = <0x0 0x0 0x0 0x68500000 0x0 0x00400000>; + /* + * Internally, USB bus to the interconnect can only address up + * to 40-bit + */ + dma-ranges = <0 0 0 0 0x100 0x0>; + usbphy0: usb-phy@0 { compatible = "brcm,sr-usb-combo-phy"; reg = <0x0 0x00000000 0x0 0x100>;
arch/arm64/boot/dts/freescale/fsl-ls1028a.dtsi +1 -1
@@ -103,7 +103,7 @@ reboot { compatible ="syscon-reboot"; regmap = <&rst>; - offset = <0xb0>; + offset = <0>; mask = <0x02>; };
arch/x86/kvm/vmx/nested.c +8 -5
@@ -5579,11 +5579,14 @@ static int vmx_get_nested_state(struct kvm_vcpu *vcpu,if (is_guest_mode (vcpu)) {sync_vmcs02_to_vmcs12 (vcpu, vmcs12);sync_vmcs02_to_vmcs12_rare (vcpu, vmcs12); - }else if (!vmx->nested.need_vmcs12_to_shadow_sync) { -if (vmx->nested.hv_evmcs) -copy_enlightened_to_vmcs12 (vmx); -else if (enable_shadow_vmcs) -copy_shadow_to_vmcs12 (vmx); + }else { +copy_vmcs02_to_vmcs12_rare (vcpu,get_vmcs12 (vcpu)); +if (!vmx->nested.need_vmcs12_to_shadow_sync) { +if (vmx->nested.hv_evmcs) +copy_enlightened_to_vmcs12 (vmx); +else if (enable_shadow_vmcs) +copy_shadow_to_vmcs12 (vmx); + } }BUILD_BUG_ON (sizeof (user_vmx_nested_state->vmcs12) <VMCS12_SIZE );
arch/x86/kvm/vmx/pmu_intel.c +5 -1
@@ -26,7 +26,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 */
@@ -296,7 +296,9 @@ static void intel_pmu_refresh(struct kvm_vcpu *vcpu) pmu->nr_arch_gp_counters =min_t (int, eax.split.num_counters, x86_pmu.num_counters_gp); + eax.split.bit_width =min_t (int, eax.split.bit_width, x86_pmu.bit_width_gp); pmu->counter_bitmask[KVM_PMC_GP ] = ((u64 )1 << eax.split.bit_width) -1 ; + eax.split.mask_length =min_t (int, eax.split.mask_length, x86_pmu.events_mask_len); pmu->available_event_types = ~entry->ebx & ((1ull << eax.split.mask_length) -1 );
@@ -306,6 +308,8 @@ static void intel_pmu_refresh(struct kvm_vcpu *vcpu) pmu->nr_arch_fixed_counters =min_t (int, edx.split.num_counters_fixed, x86_pmu.num_counters_fixed); + edx.split.bit_width_fixed =min_t (int, + edx.split.bit_width_fixed, x86_pmu.bit_width_fixed); pmu->counter_bitmask[KVM_PMC_FIXED ] = ((u64 )1 << edx.split.bit_width_fixed) -1 ; }
arch/x86/kvm/x86.c +5 -0
@@ -102,6 +102,7 @@ static u64 __read_mostly cr4_reserved_bits = CR4_RESERVED_BITS;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);static void store_regs (struct kvm_vcpu *vcpu);
@@ -3772,6 +3773,10 @@ static void kvm_vcpu_ioctl_x86_get_vcpu_events(struct kvm_vcpu *vcpu, {process_nmi (vcpu); + +if (kvm_check_request (KVM_REQ_SMI , vcpu)) +process_smi (vcpu); +/* * The API doesn't provide the instruction length for software * exceptions, so don't report them. As long as the guest RIP
drivers/acpi/device_sysfs.c +6 -14
@@ -251,20 +251,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
@@ -1014,6 +1014,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_RT_BOUND , &config->runtime_flags)) nbd->task_setup = current;
@@ -1052,10 +1058,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
@@ -936,7 +936,8 @@ static void blkif_set_queue_limits(struct blkfront_info *info)if (info->feature_discard) {blk_queue_flag_set (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)blk_queue_flag_set (QUEUE_FLAG_SECERASE , rq);
@@ -2169,19 +2170,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/firmware/imx/Kconfig +1 -0
@@ -13,6 +13,7 @@ config IMX_DSP config IMX_SCU bool "IMX SCU Protocol driver" depends on IMX_MBOX + select SOC_BUS help The System Controller Firmware (SCFW) is a low-level system function which runs on a dedicated Cortex-M core to provide power, clock, and
drivers/gpu/drm/i915/i915_drv.h +1 -1
@@ -1894,7 +1894,7 @@ intel_subplatform(const struct intel_runtime_info *info, enum intel_platform p) {const unsigned int pi =__platform_mask_index (info, p); -return info->platform_mask[pi] &INTEL_SUBPLATFORM_BITS ; +return info->platform_mask[pi] & ((1 <<INTEL_SUBPLATFORM_BITS ) -1 ); }static __always_inline bool
drivers/gpu/drm/nouveau/nouveau_svm.c +4 -0
@@ -306,6 +306,10 @@ nouveau_svmm_init(struct drm_device *dev, void *data,struct drm_nouveau_svm_init *args = data;int ret; +/* We need to fail if svm is disabled */ +if (!cli->drm->svm) +return -ENOSYS ; +/* Allocate tracking for SVM-enabled VMM. */ if (!(svmm =kzalloc (sizeof (*svmm),GFP_KERNEL )))return -ENOMEM ;
drivers/infiniband/hw/cxgb4/qp.c +1 -1
@@ -2471,7 +2471,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
@@ -318,14 +318,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);
@@ -336,11 +337,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,
@@ -348,7 +350,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/media/rc/rc-main.c +2 -2
@@ -1892,6 +1892,8 @@ int rc_register_device(struct rc_dev *dev) goto out_raw; } + dev->registered = true; + rc =device_add (&dev->dev);if (rc) goto out_rx_free;
@@ -1901,8 +1903,6 @@ int rc_register_device(struct rc_dev *dev) dev->device_name ?: "Unspecified device", path ?: "N/A");kfree (path); - dev->registered = true; -/* * once the the input device is registered in rc_setup_rx_device, * userspace can open the input device and rc_open() will be called
drivers/net/can/dev.c +1 -1
@@ -1134,7 +1134,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/ethernet/intel/i40e/i40e_virtchnl_pf.c +4 -7
@@ -3980,20 +3980,16 @@ int i40e_ndo_set_vf_mac(struct net_device *netdev, int vf_id, u8 *mac) goto error_param; vf = &pf->vf[vf_id]; - vsi = pf->vsi[vf->lan_vsi_idx];/* When the VF is resetting wait until it is done. * It can take up to 200 milliseconds, * but wait for up to 300 milliseconds to be safe. -* If the VF is indeed in reset, the vsi pointer has -* to show on the newly loaded vsi under pf->vsi[id]. +* Acquire the VSI pointer only after the VF has been +* properly initialized. */ for (i =0 ; i <15 ; i++) { -if (test_bit (I40E_VF_STATE_INIT , &vf->vf_states)) { -if (i >0 ) - vsi = pf->vsi[vf->lan_vsi_idx]; +if (test_bit (I40E_VF_STATE_INIT , &vf->vf_states))break ; - }msleep (20 ); }if (!test_bit (I40E_VF_STATE_INIT , &vf->vf_states)) {
@@ -4002,6 +3998,7 @@ int i40e_ndo_set_vf_mac(struct net_device *netdev, int vf_id, u8 *mac) ret = -EAGAIN ; goto error_param; } + vsi = pf->vsi[vf->lan_vsi_idx];if (is_multicast_ether_addr (mac)) { dev_err(&pf->pdev->dev,
drivers/net/ethernet/intel/igc/igc_ethtool.c +18 -6
@@ -1670,12 +1670,18 @@ static int igc_get_link_ksettings(struct net_device *netdev, cmd->base.phy_address = hw->phy.addr;/* advertising link modes */ - ethtool_link_ksettings_add_link_mode(cmd, advertising, 10baseT_Half); - ethtool_link_ksettings_add_link_mode(cmd, advertising, 10baseT_Full); - ethtool_link_ksettings_add_link_mode(cmd, advertising, 100baseT_Half); - ethtool_link_ksettings_add_link_mode(cmd, advertising, 100baseT_Full); - ethtool_link_ksettings_add_link_mode(cmd, advertising, 1000baseT_Full); - ethtool_link_ksettings_add_link_mode(cmd, advertising, 2500baseT_Full); +if (hw->phy.autoneg_advertised &ADVERTISE_10_HALF ) + ethtool_link_ksettings_add_link_mode(cmd, advertising, 10baseT_Half); +if (hw->phy.autoneg_advertised &ADVERTISE_10_FULL ) + ethtool_link_ksettings_add_link_mode(cmd, advertising, 10baseT_Full); +if (hw->phy.autoneg_advertised &ADVERTISE_100_HALF ) + ethtool_link_ksettings_add_link_mode(cmd, advertising, 100baseT_Half); +if (hw->phy.autoneg_advertised &ADVERTISE_100_FULL ) + ethtool_link_ksettings_add_link_mode(cmd, advertising, 100baseT_Full); +if (hw->phy.autoneg_advertised &ADVERTISE_1000_FULL ) + ethtool_link_ksettings_add_link_mode(cmd, advertising, 1000baseT_Full); +if (hw->phy.autoneg_advertised &ADVERTISE_2500_FULL ) + ethtool_link_ksettings_add_link_mode(cmd, advertising, 2500baseT_Full);/* set autoneg settings */ if (hw->mac.autoneg ==1 ) {
@@ -1786,6 +1792,12 @@ static int igc_set_link_ksettings(struct net_device *netdev,ethtool_convert_link_mode_to_legacy_u32 (&advertising, cmd->link_modes.advertising); +/* Converting to legacy u32 drops ETHTOOL_LINK_MODE_2500baseT_Full_BIT. +* We have to check this and convert it to ADVERTISE_2500_FULL +* (aka ETHTOOL_LINK_MODE_2500baseX_Full_BIT) explicitly. +*/ + if (ethtool_link_ksettings_test_link_mode(cmd, advertising, 2500baseT_Full)) + advertising |=ADVERTISE_2500_FULL ;if (cmd->base.autoneg ==AUTONEG_ENABLE ) { hw->mac.autoneg =1 ;
drivers/net/ethernet/mellanox/mlx5/core/en_tc.c +10 -5
@@ -57,6 +57,7 @@#include "lib/devcom.h" #include "lib/geneve.h" #include "diag/en_tc_tracepoint.h" +#include <asm/div64.h> struct mlx5_nic_flow_attr {u32 action;
@@ -1837,8 +1838,8 @@ static int __parse_cls_flower(struct mlx5e_priv *priv, BIT(FLOW_DISSECTOR_KEY_ENC_IP) | BIT(FLOW_DISSECTOR_KEY_ENC_OPTS))) {NL_SET_ERR_MSG_MOD (extack,"Unsupported key" ); -netdev_warn (priv->netdev,"Unsupported key used: 0x%x\n" , - dissector->used_keys); +netdev_dbg (priv->netdev,"Unsupported key used: 0x%x\n" , + dissector->used_keys);return -EOPNOTSUPP ; }
@@ -3943,13 +3944,13 @@ int mlx5e_stats_flower(struct net_device *dev, struct mlx5e_priv *priv,return err; } -static int apply_police_params (struct mlx5e_priv *priv,u32 rate, +static int apply_police_params (struct mlx5e_priv *priv,u64 rate,struct netlink_ext_ack *extack) {struct mlx5e_rep_priv *rpriv = priv->ppriv;struct mlx5_eswitch *esw; +u32 rate_mbps =0 ;u16 vport_num; -u32 rate_mbps;int err; vport_num = rpriv->rep->vport;
@@ -3966,7 +3967,11 @@ static int apply_police_params(struct mlx5e_priv *priv, u32 rate,* Moreover, if rate is non zero we choose to configure to a minimum of * 1 mbit/sec. */ - rate_mbps = rate ?max_t (u32, (rate *8 +500000 ) /1000000 ,1 ) :0 ; +if (rate) { + rate = (rate *BITS_PER_BYTE ) +500000 ; + rate_mbps =max_t (u32,do_div (rate,1000000 ),1 ); + } + err =mlx5_esw_modify_vport_rate (esw, vport_num, rate_mbps);if (err)NL_SET_ERR_MSG_MOD (extack,"failed applying action to hardware" );
drivers/net/ethernet/mellanox/mlx5/core/fs_core.c +1 -0
@@ -1068,6 +1068,7 @@ static struct mlx5_flow_table *__mlx5_create_flow_table(struct mlx5_flow_namespa destroy_ft: root->cmds->destroy_flow_table (root, ft); free_ft: +rhltable_destroy (&ft->fgs_hash);kfree (ft); unlock_root:mutex_unlock (&root->chain_lock);
drivers/net/team/team.c +3 -3
@@ -991,7 +991,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 );
@@ -1005,6 +1006,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 |
@@ -1020,9 +1022,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
@@ -1347,6 +1347,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
@@ -2183,7 +2183,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,
@@ -2194,14 +2195,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
@@ -152,8 +152,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; } }
@@ -310,7 +309,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 );
@@ -328,6 +326,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/nvme/host/multipath.c +1 -1
@@ -233,7 +233,7 @@ static struct nvme_ns *nvme_round_robin_path(struct nvme_ns_head *head, }for (ns =nvme_next_ns (head, old); - ns != old; + ns && ns != old; ns =nvme_next_ns (head, ns)) {if (nvme_path_is_disabled (ns))continue ;
drivers/s390/crypto/vfio_ap_drv.c +1 -5
@@ -71,15 +71,11 @@ static int vfio_ap_queue_dev_probe(struct ap_device *apdev)static void vfio_ap_queue_dev_remove (struct ap_device *apdev) {struct vfio_ap_queue *q; -int apid, apqi;mutex_lock (&matrix_dev->lock); q =dev_get_drvdata (&apdev->device); +vfio_ap_mdev_reset_queue (q,1 );dev_set_drvdata (&apdev->device,NULL ); - apid =AP_QID_CARD (q->apqn); - apqi =AP_QID_QUEUE (q->apqn); -vfio_ap_mdev_reset_queue (apid, apqi,1 ); -vfio_ap_irq_disable (q);kfree (q);mutex_unlock (&matrix_dev->lock); }
drivers/s390/crypto/vfio_ap_ops.c +62 -38
176 lines not on this page · raw message
drivers/s390/crypto/vfio_ap_private.h +6 -6
@@ -88,11 +88,6 @@ struct ap_matrix_mdev {struct mdev_device *mdev; }; -extern int vfio_ap_mdev_register (void ); -extern void vfio_ap_mdev_unregister (void ); -int vfio_ap_mdev_reset_queue (unsigned int apid,unsigned int apqi, -unsigned int retry); -struct vfio_ap_queue {struct ap_matrix_mdev *matrix_mdev;unsigned long saved_pfn;
@@ -100,5 +95,10 @@ struct vfio_ap_queue {#define VFIO_AP_ISC_INVALID 0xff unsigned char saved_isc; }; -struct ap_queue_status vfio_ap_irq_disable (struct vfio_ap_queue *q); + +int vfio_ap_mdev_register (void ); +void vfio_ap_mdev_unregister (void ); +int vfio_ap_mdev_reset_queue (struct vfio_ap_queue *q, +unsigned int retry); +#endif /* _VFIO_AP_PRIVATE_H_ */
drivers/soc/atmel/soc.c +13 -0
@@ -264,8 +264,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/tee/optee/call.c +3 -1
@@ -7,6 +7,7 @@#include <linux/err.h> #include <linux/errno.h> #include <linux/mm.h> +#include <linux/sched.h> #include <linux/slab.h> #include <linux/tee_drv.h> #include <linux/types.h>
@@ -148,7 +149,8 @@ u32 optee_do_call_with_arg(struct tee_context *ctx, phys_addr_t parg)*/ optee_cq_wait_for_completion (&optee->call_queue, &w); }else if (OPTEE_SMC_RETURN_IS_RPC (res.a0)) { -might_sleep (); +if (need_resched ()) +cond_resched (); param.a0 = res.a0; param.a1 = res.a1; param.a2 = res.a2;
drivers/xen/xenbus/xenbus_probe.c +31 -0
@@ -714,6 +714,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 ) {/*
@@ -725,6 +742,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);
fs/btrfs/block-group.c +9 -1
@@ -640,7 +640,15 @@ static noinline void caching_thread(struct btrfs_work *work)mutex_lock (&caching_ctl->mutex);down_read (&fs_info->commit_root_sem); -if (btrfs_fs_compat_ro (fs_info,FREE_SPACE_TREE )) +/* +* If we are in the transaction that populated the free space tree we +* can't actually cache from the free space tree as our commit root and +* real root are the same, so we could change the contents of the blocks +* while caching. Instead do the slow caching in this case, and after +* the transaction has committed we will be safe. +*/ +if (btrfs_fs_compat_ro (fs_info,FREE_SPACE_TREE ) && + !(test_bit (BTRFS_FS_FREE_SPACE_TREE_UNTRUSTED , &fs_info->flags))) ret =load_free_space_tree (caching_ctl);else ret =load_extent_tree_free (caching_ctl);
fs/btrfs/ctree.h +3 -0
@@ -136,6 +136,9 @@ enum {BTRFS_FS_STATE_DEV_REPLACING ,/* The btrfs_fs_info created for self-tests */ BTRFS_FS_STATE_DUMMY_FS_INFO , + +/* Indicate that we can't trust the free space tree for caching yet */ + BTRFS_FS_FREE_SPACE_TREE_UNTRUSTED, };#define BTRFS_BACKREF_REV_MAX 256
fs/btrfs/free-space-tree.c +9 -1
@@ -1149,6 +1149,7 @@ int btrfs_create_free_space_tree(struct btrfs_fs_info *fs_info)return PTR_ERR (trans);set_bit (BTRFS_FS_CREATING_FREE_SPACE_TREE , &fs_info->flags); +set_bit (BTRFS_FS_FREE_SPACE_TREE_UNTRUSTED , &fs_info->flags); free_space_root =btrfs_create_tree (trans,BTRFS_FREE_SPACE_TREE_OBJECTID );if (IS_ERR (free_space_root)) {
@@ -1170,11 +1171,18 @@ int btrfs_create_free_space_tree(struct btrfs_fs_info *fs_info)btrfs_set_fs_compat_ro (fs_info,FREE_SPACE_TREE );btrfs_set_fs_compat_ro (fs_info,FREE_SPACE_TREE_VALID );clear_bit (BTRFS_FS_CREATING_FREE_SPACE_TREE , &fs_info->flags); + ret =btrfs_commit_transaction (trans); -return btrfs_commit_transaction (trans); +/* +* Now that we've committed the transaction any reading of our commit +* root will be safe, so we can cache from the free space tree now. +*/ +clear_bit (BTRFS_FS_FREE_SPACE_TREE_UNTRUSTED , &fs_info->flags); +return ret; abort:clear_bit (BTRFS_FS_CREATING_FREE_SPACE_TREE , &fs_info->flags); +clear_bit (BTRFS_FS_FREE_SPACE_TREE_UNTRUSTED , &fs_info->flags);btrfs_abort_transaction (trans, ret);btrfs_end_transaction (trans);return ret;
fs/nfs/pnfs.c +1 -0
@@ -2388,6 +2388,7 @@ pnfs_layout_process(struct nfs4_layoutget *lgp)spin_unlock (&ino->i_lock); lseg->pls_layout = lo;NFS_SERVER (ino)->pnfs_curr_ld->free_lseg (lseg); +pnfs_free_lseg_list (&free_me);return ERR_PTR (-EAGAIN ); }
include/linux/intel-iommu.h +2 -0
@@ -556,6 +556,8 @@ struct intel_iommu {struct iommu_device iommu;/* IOMMU core code handle */ int node;u32 flags;/* Software defined flags */ + +struct dmar_drhd_unit *drhd; };/* PCI domain-device relationship */
include/net/tcp.h +1 -1
@@ -2030,7 +2030,7 @@ void tcp_mark_skb_lost(struct sock *sk, struct sk_buff *skb);void tcp_newreno_mark_lost (struct sock *sk,bool snd_una_advanced);extern s32 tcp_rack_skb_timeout (struct tcp_sock *tp,struct sk_buff *skb,u32 reo_wnd); -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);
include/uapi/linux/icmpv6.h +1 -0
@@ -137,6 +137,7 @@ struct icmp6hdr {#define ICMPV6_HDR_FIELD 0#define ICMPV6_UNK_NEXTHDR 1#define ICMPV6_UNK_OPTION 2 +#define ICMPV6_HDR_INCOMP 3/* * constants for (set|get)sockopt
kernel/kexec_core.c +0 -2
@@ -1129,7 +1129,6 @@ int kernel_kexec(void)#ifdef CONFIG_KEXEC_JUMP if (kexec_image->preserve_context) { -lock_system_sleep ();pm_prepare_console (); error =freeze_processes ();if (error) {
@@ -1192,7 +1191,6 @@ int kernel_kexec(void)thaw_processes (); Restore_console: pm_restore_console(); - unlock_system_sleep(); }#endif
kernel/power/swap.c +1 -1
@@ -489,10 +489,10 @@ static int swap_writer_finish(struct swap_map_handle *handle, unsigned int flags, int error) {if (!error) { -flush_swap_writer (handle);pr_info ("S" ); error =mark_swapfiles (handle, flags);pr_cont ("|\n" ); +flush_swap_writer (handle); }if (error)
net/ipv4/tcp_input.c +6 -4
@@ -2764,7 +2764,8 @@ static void tcp_identify_packet_loss(struct sock *sk, int *ack_flag) }else if (tcp_is_rack (sk)) {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 ; }
@@ -3713,9 +3714,6 @@ 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)) {if (!(flag & (FLAG_SND_UNA_ADVANCED |FLAG_NOT_DUP ))) {
@@ -3728,6 +3726,10 @@ static int tcp_ack(struct sock *sk, const struct sk_buff *skb, int 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
@@ -110,13 +110,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 ;
@@ -126,6 +126,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/ipv6/icmp.c +7 -1
@@ -158,7 +158,13 @@ static bool is_ineligible(const struct sk_buff *skb) tp =skb_header_pointer (skb, ptr+offsetof(struct icmp6hdr , icmp6_type),sizeof (_type), &_type); -if (!tp || !(*tp &ICMPV6_INFOMSG_MASK )) + +/* Based on RFC 8200, Section 4.5 Fragment Header, return +* false if this is a fragment packet with no icmp header info. +*/ +if (!tp && frag_off !=0 ) +return false; +else if (!tp || !(*tp &ICMPV6_INFOMSG_MASK ))return true; }return false;
net/ipv6/reassembly.c +32 -1
@@ -42,6 +42,8 @@#include <linux/skbuff.h> #include <linux/slab.h> #include <linux/export.h> +#include <linux/tcp.h> +#include <linux/udp.h> #include <net/sock.h> #include <net/snmp.h>
@@ -322,7 +324,9 @@ static int ipv6_frag_rcv(struct sk_buff *skb)struct frag_queue *fq;const struct ipv6hdr *hdr =ipv6_hdr (skb);struct net *net =dev_net (skb_dst (skb)->dev); -int iif; +__be16 frag_off; +int iif, offset; +u8 nexthdr;if (IP6CB (skb)->flags &IP6SKB_FRAGMENTED ) goto fail_hdr;
@@ -351,6 +355,33 @@ static int ipv6_frag_rcv(struct sk_buff *skb)return 1 ; } +/* RFC 8200, Section 4.5 Fragment Header: +* If the first fragment does not include all headers through an +* Upper-Layer header, then that fragment should be discarded and +* an ICMP Parameter Problem, Code 3, message should be sent to +* the source of the fragment, with the Pointer field set to zero. +*/ + nexthdr = hdr->nexthdr; + offset =ipv6_skip_exthdr (skb,skb_transport_offset (skb), &nexthdr, &frag_off); +if (offset >=0 ) { +/* Check some common protocols' header */ +if (nexthdr ==IPPROTO_TCP ) + offset +=sizeof (struct tcphdr ); +else if (nexthdr ==IPPROTO_UDP ) + offset +=sizeof (struct udphdr ); +else if (nexthdr ==IPPROTO_ICMPV6 ) + offset +=sizeof (struct icmp6hdr ); +else + offset +=1 ; + +if (!(frag_off &htons (IP6_OFFSET )) && offset > skb->len) { +__IP6_INC_STATS (net,__in6_dev_get_safely (skb->dev), +IPSTATS_MIB_INHDRERRORS ); +icmpv6_param_prob (skb,ICMPV6_HDR_INCOMP ,0 ); +return -1 ; + } + } + iif = skb->dev ? skb->dev->ifindex :0 ; fq =fq_find (net, fhdr->identification, hdr, iif);if (fq) {
net/mac80211/ieee80211_i.h +1 -0
@@ -1061,6 +1061,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
@@ -1537,6 +1537,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);
@@ -1557,6 +1561,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
@@ -233,8 +233,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
@@ -860,6 +860,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
@@ -105,7 +105,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/rxrpc/call_accept.c +1 -0
@@ -207,6 +207,7 @@ void rxrpc_discard_prealloc(struct rxrpc_sock *rx) tail = b->peer_backlog_tail;while (CIRC_CNT (head, tail, size) >0 ) {struct rxrpc_peer *peer = b->peer_backlog[tail]; +rxrpc_put_local (peer->local);kfree (peer); tail = (tail +1 ) & (size -1 ); }
net/wireless/wext-core.c +3 -2
@@ -896,8 +896,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
@@ -656,7 +656,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; }
net/xfrm/xfrm_policy.c +20 -10
@@ -790,15 +790,22 @@ static int xfrm_policy_addr_delta(const xfrm_address_t *a,const xfrm_address_t *b, u8 prefixlen, u16 family) { + u32 ma, mb, mask;unsigned int pdw, pbi;int delta =0 ;switch (family) {case AF_INET : -if (sizeof (long ) ==4 && prefixlen ==0 ) -return ntohl (a->a4) -ntohl (b->a4); -return (ntohl (a->a4) & ((~0UL << (32 - prefixlen)))) - - (ntohl (b->a4) & ((~0UL << (32 - prefixlen)))); +if (prefixlen ==0 ) +return 0 ; + mask = ~0U << (32 - prefixlen); + ma =ntohl (a->a4) & mask; + mb =ntohl (b->a4) & mask; +if (ma < mb) + delta =-1 ; +else if (ma > mb) + delta =1 ; +break ;case AF_INET6 : pdw = prefixlen >>5 ; pbi = prefixlen &0x1f ;
@@ -809,10 +816,13 @@ static int xfrm_policy_addr_delta(const xfrm_address_t *a,return delta; }if (pbi) { -u32 mask = ~0u << (32 - pbi); - - delta = (ntohl (a->a6[pdw]) & mask) - - (ntohl (b->a6[pdw]) & mask); + mask = ~0U << (32 - pbi); + ma =ntohl (a->a6[pdw]) & mask; + mb =ntohl (b->a6[pdw]) & mask; +if (ma < mb) + delta =-1 ; +else if (ma > mb) + delta =1 ; }break ;default :
@@ -3065,8 +3075,8 @@ struct dst_entry *xfrm_lookup_with_ifid(struct net *net, xflo.flags = flags;/* To accelerate a bit... */ -if ((dst_orig->flags &DST_NOXFRM ) || - !net->xfrm.policy_count[XFRM_POLICY_OUT ]) +if (!if_id && ((dst_orig->flags &DST_NOXFRM ) || + !net->xfrm.policy_count[XFRM_POLICY_OUT ])) goto nopol; xdst =xfrm_bundle_lookup (net, fl, family, dir, &xflo, if_id);
sound/pci/hda/patch_realtek.c +1 -0
@@ -7907,6 +7907,7 @@ static const struct snd_pci_quirk alc269_fixup_tbl[] = {SND_PCI_QUIRK (0x1043 ,0x18b1 ,"Asus MJ401TA" ,ALC256_FIXUP_ASUS_HEADSET_MIC ),SND_PCI_QUIRK (0x1043 ,0x18f1 ,"Asus FX505DT" ,ALC256_FIXUP_ASUS_HEADSET_MIC ),SND_PCI_QUIRK (0x1043 ,0x194e ,"ASUS UX563FD" ,ALC294_FIXUP_ASUS_HPE ), +SND_PCI_QUIRK (0x1043 ,0x1982 ,"ASUS B1400CEPE" ,ALC256_FIXUP_ASUS_HPE ),SND_PCI_QUIRK (0x1043 ,0x19ce ,"ASUS B9450FA" ,ALC294_FIXUP_ASUS_HPE ),SND_PCI_QUIRK (0x1043 ,0x19e1 ,"ASUS UX581LV" ,ALC295_FIXUP_ASUS_MIC_NO_PRESENCE ), SND_PCI_QUIRK(0x1043, 0x1a13, "Asus G73Jw", ALC269_FIXUP_ASUS_G73JW),
sound/pci/hda/patch_via.c +1 -1
@@ -1043,7 +1043,7 @@ static const struct hda_fixup via_fixups[] = {static const struct snd_pci_quirk vt2002p_fixups[] = {SND_PCI_QUIRK (0x1043 ,0x1487 ,"Asus G75" ,VIA_FIXUP_ASUS_G75 ),SND_PCI_QUIRK (0x1043 ,0x8532 ,"Asus X202E" ,VIA_FIXUP_INTMIC_BOOST ), -SND_PCI_QUIRK (0x1558 ,0x3501 ,"Clevo W35xSS_370SS" ,VIA_FIXUP_POWER_SAVE ), +SND_PCI_QUIRK_VENDOR (0x1558 ,"Clevo" ,VIA_FIXUP_POWER_SAVE ), {} };
sound/soc/intel/skylake/skl-topology.c +7 -6
@@ -3619,15 +3619,16 @@ static void skl_tplg_complete(struct snd_soc_component *component)list_for_each_entry (dobj, &component->dobj_list, list) {struct snd_kcontrol *kcontrol = dobj->control.kcontrol; -struct soc_enum *se = - (struct soc_enum *)kcontrol->private_value; -char **texts = dobj->control.dtexts; +struct soc_enum *se; +char **texts;char chan_text[4 ]; -if (dobj->type !=SND_SOC_DOBJ_ENUM || - dobj->control.kcontrol->put != - skl_tplg_multi_config_set_dmic) +if (dobj->type !=SND_SOC_DOBJ_ENUM || !kcontrol || + kcontrol->put != skl_tplg_multi_config_set_dmic)continue ; + + se = (struct soc_enum *)kcontrol->private_value; + texts = dobj->control.dtexts;sprintf (chan_text,"c%d" , mach->mach_params.dmic_num);for (i =0 ; i < se->items; i++) {
sound/soc/soc-topology.c +1 -1
@@ -982,7 +982,7 @@ static int soc_tplg_denum_create_values(struct soc_enum *se,return -EINVAL ; se->dobj.control.dvalues =kzalloc (le32_to_cpu (ec->items) * -sizeof (u32), +sizeof (*se->dobj.control.dvalues),GFP_KERNEL );if (!se->dobj.control.dvalues)return -ENOMEM ;
tools/testing/selftests/net/forwarding/router_mpath_nh.sh +1 -1
@@ -197,7 +197,7 @@ multipath4_test() t0_rp12=$(link_stats_tx_packets_get $rp12) t0_rp13=$(link_stats_tx_packets_get $rp13) - ip vrf exec vrf-h1 $MZ -q -p 64 -A 192.0.2.2 -B 198.51.100.2 \ + ip vrf exec vrf-h1 $MZ $h1 -q -p 64 -A 192.0.2.2 -B 198.51.100.2 \ -d 1msec -t udp "sp=1024,dp=0-32768" t1_rp12=$(link_stats_tx_packets_get $rp12)
tools/testing/selftests/net/forwarding/router_multipath.sh +1 -1
@@ -178,7 +178,7 @@ multipath4_test() t0_rp12=$(link_stats_tx_packets_get $rp12) t0_rp13=$(link_stats_tx_packets_get $rp13) - ip vrf exec vrf-h1 $MZ -q -p 64 -A 192.0.2.2 -B 198.51.100.2 \ + ip vrf exec vrf-h1 $MZ $h1 -q -p 64 -A 192.0.2.2 -B 198.51.100.2 \ -d 1msec -t udp "sp=1024,dp=0-32768" t1_rp12=$(link_stats_tx_packets_get $rp12)
tools/testing/selftests/net/xfrm_policy.sh +44 -1
63 lines not on this page · raw message
virt/kvm/kvm_main.c +1 -0
@@ -1017,6 +1017,7 @@ int __kvm_set_memory_region(struct kvm *kvm,/* We can read the guest memory with __xxx_user() later on. */ if ((id <KVM_USER_MEM_SLOTS ) && ((mem->userspace_addr & (PAGE_SIZE -1 )) || + (mem->userspace_addr !=untagged_addr (mem->userspace_addr)) || !access_ok ((void __user *)(unsigned long )mem->userspace_addr, mem->memory_size))) goto out;