Linux 4.19.72
Greg KH
maintainerI'm announcing the release of the 4.19.72 kernel.
All users of the 4.19 kernel series must upgrade.
The updated 4.19.y git tree can be found at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git linux-4.19.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/x86/boot/compressed/pgtable_64.c | 13 ++- arch/x86/include/asm/bootparam_utils.h | 1 arch/x86/kernel/apic/apic.c | 4 - drivers/bluetooth/btqca.c | 3 drivers/gpu/drm/mediatek/mtk_drm_drv.c | 49 ++++++++++++- drivers/gpu/drm/mediatek/mtk_drm_drv.h | 2 drivers/hid/hid-cp2112.c | 8 +- drivers/infiniband/hw/hfi1/fault.c | 12 ++- drivers/infiniband/hw/mlx4/mad.c | 4 - drivers/input/serio/hyperv-keyboard.c | 35 +-------- drivers/net/ethernet/cavium/common/cavium_ptp.c | 2 drivers/net/ethernet/cavium/liquidio/request_manager.c | 4 - drivers/net/ethernet/chelsio/cxgb4/cxgb4_debugfs.c | 4 - drivers/net/ethernet/ibm/ibmveth.c | 9 +- drivers/net/ethernet/ibm/ibmvnic.c | 11 --- drivers/net/ethernet/myricom/myri10ge/myri10ge.c | 2 drivers/net/ethernet/renesas/ravb_main.c | 8 +- drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c | 6 - drivers/net/ethernet/toshiba/tc35815.c | 2 drivers/net/ethernet/tundra/tsi108_eth.c | 5 - drivers/net/hyperv/netvsc_drv.c | 9 +- drivers/net/usb/cx82310_eth.c | 3 drivers/net/usb/kalmia.c | 6 - drivers/net/usb/lan78xx.c | 8 +- drivers/net/wimax/i2400m/fw.c | 4 - drivers/nvme/host/multipath.c | 1 drivers/scsi/qla2xxx/qla_attr.c | 2 drivers/scsi/qla2xxx/qla_os.c | 11 ++- drivers/spi/spi-bcm2835aux.c | 62 +++++------------ drivers/target/target_core_user.c | 9 +- fs/afs/cell.c | 4 + fs/ceph/caps.c | 5 + fs/ceph/inode.c | 7 + fs/ceph/snap.c | 4 - fs/ceph/super.h | 2 fs/ceph/xattr.c | 19 +++-- fs/read_write.c | 49 +++++++++++-- include/linux/ceph/buffer.h | 3 include/linux/gpio.h | 24 ------ include/net/act_api.h | 4 - include/net/netfilter/nf_tables.h | 9 +- include/net/psample.h | 1 kernel/kprobes.c | 8 +- net/core/netpoll.c | 6 - net/ipv4/tcp.c | 29 +++++-- net/ipv4/tcp_output.c | 3 net/ipv6/mcast.c | 5 - net/netfilter/nf_tables_api.c | 15 ++-- net/netfilter/nft_flow_offload.c | 9 +- net/psample/psample.c | 2 net/rds/recv.c | 5 + net/sched/act_bpf.c | 2 net/sched/act_connmark.c | 2 net/sched/act_csum.c | 2 net/sched/act_gact.c | 2 net/sched/act_ife.c | 2 net/sched/act_ipt.c | 11 +-- net/sched/act_mirred.c | 2 net/sched/act_nat.c | 2 net/sched/act_pedit.c | 2 net/sched/act_police.c | 2 net/sched/act_sample.c | 7 + net/sched/act_simple.c | 2 net/sched/act_skbedit.c | 2 net/sched/act_skbmod.c | 2 net/sched/act_tunnel_key.c | 2 net/sched/act_vlan.c | 2 tools/bpf/bpftool/common.c | 2 tools/hv/hv_kvp_daemon.c | 2 tools/testing/selftests/kvm/lib/x86.c | 16 ++-- tools/testing/selftests/kvm/platform_info_test.c | 2 virt/kvm/arm/mmio.c | 7 + virt/kvm/arm/vgic/vgic-init.c | 30 +++++--- 74 files changed, 374 insertions(+), 245 deletions(-)
Alexandre Courbot (2):
drm/mediatek: use correct device to import PRIME buffers drm/mediatek: set DMA max segment size
Andre Przywara (1):
KVM: arm/arm64: VGIC: Properly initialise private IRQ affinity
Andrea Righi (1):
kprobes: Fix potential deadlock in kprobe_optimizer()
Andrew Jones (1):
KVM: arm/arm64: Only skip MMIO insn once
Anton Eidelman (1):
nvme-multipath: fix possible I/O hang when paths are updated
Benjamin Tissoires (1):
HID: cp2112: prevent sleeping function called from invalid context
Bill Kuzeja (1):
scsi: qla2xxx: Fix gnl.l memory leak on adapter init failure
Chen-Yu Tsai (1):
net: stmmac: dwmac-rk: Don't fail if phy regulator is absent
Cong Wang (1):
net_sched: fix a NULL pointer deref in ipt action
Darrick J. Wong (1):
vfs: fix page locking deadlocks when deduping files
David Howells (1):
afs: Fix leak in afs_lookup_cell_rcu()
Dexuan Cui (2):
hv_netvsc: Fix a warning of suspicious RCU usage
Input: hyperv-keyboard: Use in-place iterator API in the channel callback
Dmitry Fomichev (1):
scsi: target: tcmu: avoid use-after-free after command timeout
Eric Dumazet (2):
mld: fix memory leak in mld_del_delrec()
tcp: remove empty skb from write queue in error cases
Feng Sun (1):
net: fix skb use after free in netpoll
Fuqian Huang (1):
net: tundra: tsi108: use spin_lock_irqsave instead of spin_lock_irq in IRQ context
Greg Kroah-Hartman (1):
Linux 4.19.72
Jakub Kicinski (1):
tools: bpftool: fix error message (prog -> object)
John S. Gruber (1):
x86/boot: Preserve boot_params.secure_boot from sanitizing
Ka-Cheong Poon (1):
net/rds: Fix info leak in rds6_inc_info_copy()
Kirill A. Shutemov (2):
x86/boot/compressed/64: Fix boot on machines with broken E820 table x86/boot/compressed/64: Fix missing initialization in find_trampoline_placement()
Linus Torvalds (1):
Revert "x86/apic: Include the LDR when clearing out APIC registers"
Luis Henriques (4):
ceph: fix buffer free while holding i_ceph_lock in __ceph_setxattr()
ceph: fix buffer free while holding i_ceph_lock in __ceph_build_xattrs_blob()
ceph: fix buffer free while holding i_ceph_lock in fill_inode()
libceph: allow ceph_buffer_put() to receive a NULL ceph_buffer
Martin Sperl (3):
spi: bcm2835aux: unifying code between polling and interrupt driven code
spi: bcm2835aux: remove dangerous uncontrolled read of fifo
spi: bcm2835aux: fix corruptions for longer spi transfers
Matthias Kaehlcke (1):
Bluetooth: btqca: Add a short delay before downloading the NVM
Nathan Chancellor (1):
net: tc35815: Explicitly check NET_IP_ALIGN is not zero in tc35815_rx
Pablo Neira Ayuso (2):
netfilter: nf_tables: use-after-free in failing rule with bound set
netfilter: nft_flow_offload: skip tcp rst and fin packets
Paolo Bonzini (1):
selftests: kvm: fix state save/load on processors without XSAVE
Stephen Hemminger (1):
net: cavium: fix driver name
Tho Vu (1):
ravb: Fix use-after-free ravb_tstamp_skb
Thomas Falcon (2):
ibmveth: Convert multicast list size for little-endian system
ibmvnic: Unmap DMA address of TX descriptor buffers after use
Vitaly Kuznetsov (2):
Tools: hv: kvp: eliminate 'may be used uninitialized' warning selftests/kvm: make platform_info_test pass on AMD
Vlad Buslov (1):
net: sched: act_sample: fix psample group handling on overwrite
Wenwen Wang (10):
cxgb4: fix a memory leak bug
liquidio: add cleanup in octeon_setup_iq()
net: myri10ge: fix memory leaks
lan78xx: Fix memory leaks
cx82310_eth: fix a memory leak bug
net: kalmia: fix memory leaks
wimax/i2400m: fix a memory leak bug
IB/mlx4: Fix memory leaks
infiniband: hfi1: fix a memory leak bug
infiniband: hfi1: fix memory leaks
Willem de Bruijn (1):
tcp: inherit timestamp on mtu probe
YueHaibing (1):
gpio: Fix build error of function redefinition
Greg KH
maintainerMakefile +1 -1
@@ -1,7 +1,7 @@ # SPDX-License-Identifier: GPL-2.0 VERSION = 4 PATCHLEVEL = 19 -SUBLEVEL = 71 +SUBLEVEL = 72 EXTRAVERSION = NAME = "People's Front"
arch/x86/boot/compressed/pgtable_64.c +10 -3
@@ -73,6 +73,8 @@ static unsigned long find_trampoline_placement(void)/* Find the first usable memory region under bios_start. */ for (i = boot_params->e820_entries -1 ; i >=0 ; i--) { +unsigned long new = bios_start; + entry = &boot_params->e820_table[i];/* Skip all entries above bios_start. */
@@ -85,15 +87,20 @@ static unsigned long find_trampoline_placement(void)/* Adjust bios_start to the end of the entry if needed. */ if (bios_start > entry->addr + entry->size) - bios_start = entry->addr + entry->size; + new = entry->addr + entry->size;/* Keep bios_start page-aligned. */ - bios_start =round_down (bios_start,PAGE_SIZE ); + new =round_down (new,PAGE_SIZE );/* Skip the entry if it's too small. */ -if (bios_start -TRAMPOLINE_32BIT_SIZE < entry->addr) +if (new -TRAMPOLINE_32BIT_SIZE < entry->addr)continue ; +/* Protect against underflow. */ +if (new -TRAMPOLINE_32BIT_SIZE > bios_start) +break ; + + bios_start = new;break ; }
arch/x86/include/asm/bootparam_utils.h +1 -0
@@ -71,6 +71,7 @@ static void sanitize_boot_params(struct boot_params *boot_params)BOOT_PARAM_PRESERVE (eddbuf_entries),BOOT_PARAM_PRESERVE (edd_mbr_sig_buf_entries),BOOT_PARAM_PRESERVE (edd_mbr_sig_buffer), +BOOT_PARAM_PRESERVE (secure_boot),BOOT_PARAM_PRESERVE (hdr),BOOT_PARAM_PRESERVE (e820_table), BOOT_PARAM_PRESERVE(eddbuf),
arch/x86/kernel/apic/apic.c +0 -4
@@ -1140,10 +1140,6 @@ void clear_local_APIC(void)apic_write (APIC_LVT0 , v |APIC_LVT_MASKED ); v =apic_read (APIC_LVT1 );apic_write (APIC_LVT1 , v |APIC_LVT_MASKED ); -if (!x2apic_enabled ()) { - v =apic_read (APIC_LDR ) & ~APIC_LDR_MASK ; -apic_write (APIC_LDR , v); - }if (maxlvt >=4 ) { v =apic_read (APIC_LVTPC );apic_write (APIC_LVTPC , v |APIC_LVT_MASKED );
drivers/bluetooth/btqca.c +3 -0
@@ -363,6 +363,9 @@ int qca_uart_setup(struct hci_dev *hdev, uint8_t baudrate,return err; } +/* Give the controller some time to get ready to receive the NVM */ +msleep (10 ); +/* Download NVM configuration */ config.type =TLV_TYPE_NVM ;if (soc_type ==QCA_WCN3990 )
drivers/gpu/drm/mediatek/mtk_drm_drv.c +46 -3
94 lines not on this page · raw message
drivers/gpu/drm/mediatek/mtk_drm_drv.h +2 -0
@@ -59,6 +59,8 @@ struct mtk_drm_private { } commit;struct drm_atomic_state *suspend_state; + +bool dma_parms_allocated; };extern struct platform_driver mtk_ddp_driver;
drivers/hid/hid-cp2112.c +6 -2
@@ -1160,8 +1160,6 @@ static unsigned int cp2112_gpio_irq_startup(struct irq_data *d)INIT_DELAYED_WORK (&dev->gpio_poll_worker, cp2112_gpio_poll_callback); -cp2112_gpio_direction_input (gc, d->hwirq); -if (!dev->gpio_poll) { dev->gpio_poll = true;schedule_delayed_work (&dev->gpio_poll_worker,0 );
@@ -1209,6 +1207,12 @@ static int __maybe_unused cp2112_allocate_irq(struct cp2112_device *dev,return PTR_ERR (dev->desc[pin]); } + ret =cp2112_gpio_direction_input (&dev->gc, pin); +if (ret <0 ) { +dev_err (dev->gc.parent,"Failed to set GPIO to input dir\n" ); + goto err_desc; + } + ret =gpiochip_lock_as_irq (&dev->gc, pin);if (ret) {dev_err (dev->gc.parent,"Failed to lock GPIO as interrupt\n" );
drivers/infiniband/hw/hfi1/fault.c +8 -4
@@ -141,12 +141,14 @@ static ssize_t fault_opcodes_write(struct file *file, const char __user *buf,if (!data)return -ENOMEM ; copy =min (len, datalen -1 ); -if (copy_from_user (data, buf, copy)) -return -EFAULT ; +if (copy_from_user (data, buf, copy)) { + ret = -EFAULT ; + goto free_data; + } ret =debugfs_file_get (file->f_path.dentry);if (unlikely (ret)) -return ret; + goto free_data; ptr = data; token = ptr;for (ptr = data; *ptr; ptr = end +1 , token = ptr) {
@@ -195,6 +197,7 @@ static ssize_t fault_opcodes_write(struct file *file, const char __user *buf, ret = len;debugfs_file_put (file->f_path.dentry); +free_data:kfree (data);return ret; }
@@ -214,7 +217,7 @@ static ssize_t fault_opcodes_read(struct file *file, char __user *buf,return -ENOMEM ; ret =debugfs_file_get (file->f_path.dentry);if (unlikely (ret)) -return ret; + goto free_data; bit =find_first_bit (fault->opcodes, bitsize);while (bit < bitsize) { zero =find_next_zero_bit (fault->opcodes, bitsize, bit);
@@ -232,6 +235,7 @@ static ssize_t fault_opcodes_read(struct file *file, char __user *buf, data[size -1 ] ='\n' ; data[size] ='\0' ; ret =simple_read_from_buffer (buf, len, pos, data, size); +free_data:kfree (data);return ret; }
drivers/infiniband/hw/mlx4/mad.c +2 -2
@@ -1668,8 +1668,6 @@ static int mlx4_ib_alloc_pv_bufs(struct mlx4_ib_demux_pv_ctx *ctx, tx_buf_size, DMA_TO_DEVICE);kfree (tun_qp->tx_ring[i].buf.addr); } -kfree (tun_qp->tx_ring); - tun_qp->tx_ring =NULL ; i =MLX4_NUM_TUNNEL_BUFS ; err:while (i >0 ) {
@@ -1678,6 +1676,8 @@ static int mlx4_ib_alloc_pv_bufs(struct mlx4_ib_demux_pv_ctx *ctx, rx_buf_size, DMA_FROM_DEVICE);kfree (tun_qp->ring[i].addr); } +kfree (tun_qp->tx_ring); + tun_qp->tx_ring =NULL ;kfree (tun_qp->ring); tun_qp->ring =NULL ;return -ENOMEM ;
drivers/input/serio/hyperv-keyboard.c +6 -29
@@ -245,40 +245,17 @@ static void hv_kbd_handle_received_packet(struct hv_device *hv_dev,static void hv_kbd_on_channel_callback (void *context) { +struct vmpacket_descriptor *desc;struct hv_device *hv_dev = context; -void *buffer; -int bufferlen =0x100 ;/* Start with sensible size */ u32 bytes_recvd;u64 req_id; -int error; - buffer =kmalloc (bufferlen,GFP_ATOMIC ); -if (!buffer) -return ; - -while (1 ) { - error =vmbus_recvpacket_raw (hv_dev->channel, buffer, bufferlen, - &bytes_recvd, &req_id); -switch (error) { -case 0 : -if (bytes_recvd ==0 ) { -kfree (buffer); -return ; - } - -hv_kbd_handle_received_packet (hv_dev, buffer, - bytes_recvd, req_id); -break ; + foreach_vmbus_pkt(desc, hv_dev->channel) { + bytes_recvd = desc->len8 *8 ; + req_id = desc->trans_id; -case -ENOBUFS : -kfree (buffer); -/* Handle large packet */ - bufferlen = bytes_recvd; - buffer =kmalloc (bytes_recvd,GFP_ATOMIC ); -if (!buffer) -return ; -break ; - } +hv_kbd_handle_received_packet (hv_dev, desc, bytes_recvd, + req_id); } }
drivers/net/ethernet/cavium/common/cavium_ptp.c +1 -1
@@ -10,7 +10,7 @@#include "cavium_ptp.h" -#define DRV_NAME "Cavium PTP Driver" +#define DRV_NAME "cavium_ptp"#define PCI_DEVICE_ID_CAVIUM_PTP 0xA00C#define PCI_DEVICE_ID_CAVIUM_RST 0xA00E
drivers/net/ethernet/cavium/liquidio/request_manager.c +3 -1
@@ -238,8 +238,10 @@ int octeon_setup_iq(struct octeon_device *oct, } oct->num_iqs++; -if (oct->fn_list.enable_io_queues (oct)) +if (oct->fn_list.enable_io_queues (oct)) { +octeon_delete_instr_queue (oct, iq_no);return 1 ; + }return 0 ; }
drivers/net/ethernet/chelsio/cxgb4/cxgb4_debugfs.c +3 -1
@@ -3276,8 +3276,10 @@ static ssize_t blocked_fl_write(struct file *filp, const char __user *ubuf,return -ENOMEM ; err =bitmap_parse_user (ubuf, count, t, adap->sge.egr_sz); -if (err) +if (err) { +kvfree (t);return err; + }bitmap_copy (adap->sge.blocked_fl, t, adap->sge.egr_sz);kvfree (t);
drivers/net/ethernet/ibm/ibmveth.c +5 -4
@@ -1618,7 +1618,7 @@ static int ibmveth_probe(struct vio_dev *dev, const struct vio_device_id *id)struct net_device *netdev;struct ibmveth_adapter *adapter;unsigned char *mac_addr_p; -unsigned int *mcastFilterSize_p; +__be32 *mcastFilterSize_p;long ret;unsigned long ret_attr;
@@ -1640,8 +1640,9 @@ static int ibmveth_probe(struct vio_dev *dev, const struct vio_device_id *id)return -EINVAL ; } - mcastFilterSize_p = (unsigned int *)vio_get_attribute (dev, -VETH_MCAST_FILTER_SIZE ,NULL ); + mcastFilterSize_p = (__be32 *)vio_get_attribute (dev, +VETH_MCAST_FILTER_SIZE , +NULL );if (!mcastFilterSize_p) {dev_err (&dev->dev,"Can't find VETH_MCAST_FILTER_SIZE " "attribute\n" );
@@ -1658,7 +1659,7 @@ static int ibmveth_probe(struct vio_dev *dev, const struct vio_device_id *id) adapter->vdev = dev; adapter->netdev = netdev; - adapter->mcastFilterSize = *mcastFilterSize_p; + adapter->mcastFilterSize =be32_to_cpu (*mcastFilterSize_p); adapter->pool_config =0 ;netif_napi_add (netdev, &adapter->napi, ibmveth_poll,16 );
drivers/net/ethernet/ibm/ibmvnic.c +2 -9
@@ -1586,6 +1586,8 @@ static int ibmvnic_xmit(struct sk_buff *skb, struct net_device *netdev) lpar_rc =send_subcrq_indirect (adapter, handle_array[queue_num], (u64 )tx_buff->indir_dma, (u64 )num_entries); +dma_unmap_single (dev, tx_buff->indir_dma, +sizeof (tx_buff->indir_arr),DMA_TO_DEVICE ); }else { tx_buff->num_entries = num_entries; lpar_rc = send_subcrq(adapter, handle_array[queue_num],
@@ -2747,7 +2749,6 @@ static int ibmvnic_complete_tx(struct ibmvnic_adapter *adapter,union sub_crq *next;int index;int i, j; -u8 *first; restart_loop:while (pending_scrq (adapter, scrq)) {
@@ -2777,14 +2778,6 @@ static int ibmvnic_complete_tx(struct ibmvnic_adapter *adapter, txbuff->data_dma[j] =0 ; } -/* if sub_crq was sent indirectly */ - first = &txbuff->indir_arr[0 ].generic.first; -if (*first ==IBMVNIC_CRQ_CMD ) { -dma_unmap_single (dev, txbuff->indir_dma, -sizeof (txbuff->indir_arr), -DMA_TO_DEVICE ); - *first =0 ; - }if (txbuff->last_frag) {dev_kfree_skb_any (txbuff->skb);
drivers/net/ethernet/myricom/myri10ge/myri10ge.c +1 -1
@@ -3922,7 +3922,7 @@ static int myri10ge_probe(struct pci_dev *pdev, const struct pci_device_id *ent)* setup (if available). */ status =myri10ge_request_irq (mgp);if (status !=0 ) - goto abort_with_firmware; + goto abort_with_slices;myri10ge_free_irq (mgp);/* Save configuration space to be restored if the
drivers/net/ethernet/renesas/ravb_main.c +6 -2
@@ -1,7 +1,7 @@// SPDX-License-Identifier: GPL-2.0 /* Renesas Ethernet AVB device driver * -* Copyright (C) 2014-2015 Renesas Electronics Corporation +* Copyright (C) 2014-2019 Renesas Electronics Corporation * Copyright (C) 2015 Renesas Solutions Corp. * Copyright (C) 2015-2016 Cogent Embedded, Inc. <[email protected]> *
@@ -514,7 +514,10 @@ static void ravb_get_tx_tstamp(struct net_device *ndev)kfree (ts_skb);if (tag == tfa_tag) {skb_tstamp_tx (skb, &shhwtstamps); +dev_consume_skb_any (skb);break ; + }else { +dev_kfree_skb_any (skb); } }ravb_modify (ndev,TCCR ,TCCR_TFR ,TCCR_TFR );
@@ -1556,7 +1559,7 @@ static netdev_tx_t ravb_start_xmit(struct sk_buff *skb, struct net_device *ndev) DMA_TO_DEVICE); goto unmap; } - ts_skb->skb = skb; + ts_skb->skb =skb_get (skb); ts_skb->tag = priv->ts_skb_tag++; priv->ts_skb_tag &=0x3ff ;list_add_tail (&ts_skb->list, &priv->ts_skb_list);
@@ -1685,6 +1688,7 @@ static int ravb_close(struct net_device *ndev)/* Clear the timestamp list */ list_for_each_entry_safe (ts_skb, ts_skb2, &priv->ts_skb_list, list) {list_del (&ts_skb->list); +kfree_skb (ts_skb->skb);kfree (ts_skb); }
drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c +2 -4
@@ -1203,10 +1203,8 @@ static int phy_power_on(struct rk_priv_data *bsp_priv, bool enable)int ret;struct device *dev = &bsp_priv->pdev->dev; -if (!ldo) { -dev_err (dev,"no regulator found\n" ); -return -1 ; - } +if (!ldo) +return 0 ;if (enable) { ret =regulator_enable (ldo);
drivers/net/ethernet/toshiba/tc35815.c +1 -1
@@ -1497,7 +1497,7 @@ tc35815_rx(struct net_device *dev, int limit)pci_unmap_single (lp->pci_dev, lp->rx_skbs[cur_bd].skb_dma,RX_BUF_SIZE ,PCI_DMA_FROMDEVICE ); -if (!HAVE_DMA_RXALIGN (lp) &&NET_IP_ALIGN ) +if (!HAVE_DMA_RXALIGN (lp) &&NET_IP_ALIGN !=0 )memmove (skb->data, skb->data -NET_IP_ALIGN , pkt_len); data =skb_put (skb, pkt_len);
drivers/net/ethernet/tundra/tsi108_eth.c +3 -2
@@ -383,9 +383,10 @@ tsi108_stat_carry_one(int carry, int carry_bit, int carry_shift,static void tsi108_stat_carry (struct net_device *dev) {struct tsi108_prv_data *data =netdev_priv (dev); +unsigned long flags;u32 carry1, carry2; -spin_lock_irq (&data->misclock); +spin_lock_irqsave (&data->misclock, flags); carry1 =TSI_READ (TSI108_STAT_CARRY1 ); carry2 =TSI_READ (TSI108_STAT_CARRY2 );
@@ -453,7 +454,7 @@ static void tsi108_stat_carry(struct net_device *dev)TSI108_STAT_TXPAUSEDROP_CARRY , &data->tx_pause_drop); -spin_unlock_irq (&data->misclock); +spin_unlock_irqrestore (&data->misclock, flags); }/* Read a stat counter atomically with respect to carries.
drivers/net/hyperv/netvsc_drv.c +7 -2
@@ -1248,12 +1248,15 @@ static void netvsc_get_stats64(struct net_device *net, struct rtnl_link_stats64 *t) {struct net_device_context *ndev_ctx =netdev_priv (net); -struct netvsc_device *nvdev =rcu_dereference_rtnl (ndev_ctx->nvdev); +struct netvsc_device *nvdev;struct netvsc_vf_pcpu_stats vf_tot;int i; +rcu_read_lock (); + + nvdev =rcu_dereference (ndev_ctx->nvdev);if (!nvdev) -return ; + goto out;netdev_stats_to_stats64 (t, &net->stats);
@@ -1292,6 +1295,8 @@ static void netvsc_get_stats64(struct net_device *net, t->rx_packets += packets; t->multicast += multicast; } +out: +rcu_read_unlock (); }static int netvsc_set_mac_addr (struct net_device *ndev,void *p)
drivers/net/usb/cx82310_eth.c +2 -1
@@ -175,7 +175,8 @@ static int cx82310_bind(struct usbnet *dev, struct usb_interface *intf) }if (!timeout) {dev_err (&udev->dev,"firmware not ready in time\n" ); -return -ETIMEDOUT ; + ret = -ETIMEDOUT ; + goto err; }/* enable ethernet mode (?) */
drivers/net/usb/kalmia.c +3 -3
@@ -117,16 +117,16 @@ kalmia_init_and_get_ethernet_addr(struct usbnet *dev, u8 *ethernet_addr) status =kalmia_send_init_packet (dev, usb_buf,ARRAY_SIZE (init_msg_1), usb_buf,24 );if (status !=0 ) -return status; + goto out;memcpy (usb_buf, init_msg_2,12 ); status =kalmia_send_init_packet (dev, usb_buf,ARRAY_SIZE (init_msg_2), usb_buf,28 );if (status !=0 ) -return status; + goto out;memcpy (ethernet_addr, usb_buf +10 ,ETH_ALEN ); - +out:kfree (usb_buf);return status; }
drivers/net/usb/lan78xx.c +5 -3
@@ -3799,7 +3799,7 @@ static int lan78xx_probe(struct usb_interface *intf, ret =register_netdev (netdev);if (ret !=0 ) {netif_err (dev, probe, netdev,"couldn't register the device\n" ); - goto out3; + goto out4; }usb_set_intfdata (intf, dev);
@@ -3814,12 +3814,14 @@ static int lan78xx_probe(struct usb_interface *intf, ret =lan78xx_phy_init (dev);if (ret <0 ) - goto out4; + goto out5;return 0 ; -out4: +out5:unregister_netdev (netdev); +out4: +usb_free_urb (dev->urb_intr); out3:lan78xx_unbind (dev, intf); out2:
drivers/net/wimax/i2400m/fw.c +3 -1
@@ -351,13 +351,15 @@ int i2400m_barker_db_init(const char *_options) } result =i2400m_barker_db_add (barker);if (result <0 ) - goto error_add; + goto error_parse_add; }kfree (options_orig); }return 0 ; +error_parse_add: error_parse: +kfree (options_orig); error_add:kfree (i2400m_barker_db);return result;
drivers/nvme/host/multipath.c +1 -0
@@ -323,6 +323,7 @@ static void nvme_mpath_set_live(struct nvme_ns *ns) "failed to create id group.\n"); } +synchronize_srcu (&ns->head->srcu);kblockd_schedule_work (&ns->head->requeue_work); }
drivers/scsi/qla2xxx/qla_attr.c +2 -0
@@ -2191,6 +2191,8 @@ qla24xx_vport_delete(struct fc_vport *fc_vport)dma_free_coherent (&ha->pdev->dev, vha->gnl.size, vha->gnl.l, vha->gnl.ldma); + vha->gnl.l =NULL ; +vfree (vha->scan.l);if (vha->qpair && vha->qpair->vp_idx == vha->vp_idx) {
drivers/scsi/qla2xxx/qla_os.c +10 -1
@@ -3395,6 +3395,12 @@ qla2x00_probe_one(struct pci_dev *pdev, const struct pci_device_id *id)return 0 ; probe_failed: +if (base_vha->gnl.l) { +dma_free_coherent (&ha->pdev->dev, base_vha->gnl.size, + base_vha->gnl.l, base_vha->gnl.ldma); + base_vha->gnl.l =NULL ; + } +if (base_vha->timer_active)qla2x00_stop_timer (base_vha); base_vha->flags.online =0 ;
@@ -3624,7 +3630,7 @@ qla2x00_remove_one(struct pci_dev *pdev)if (!atomic_read (&pdev->enable_cnt)) {dma_free_coherent (&ha->pdev->dev, base_vha->gnl.size, base_vha->gnl.l, base_vha->gnl.ldma); - + base_vha->gnl.l =NULL ;scsi_host_put (base_vha->host);kfree (ha);pci_set_drvdata (pdev,NULL );
@@ -3663,6 +3669,8 @@ qla2x00_remove_one(struct pci_dev *pdev)dma_free_coherent (&ha->pdev->dev, base_vha->gnl.size, base_vha->gnl.l, base_vha->gnl.ldma); + base_vha->gnl.l =NULL ; +vfree (base_vha->scan.l);if (IS_QLAFX00 (ha))
@@ -4602,6 +4610,7 @@ struct scsi_qla_host *qla2x00_create_host(struct scsi_host_template *sht, "Alloc failed for scan database.\n");dma_free_coherent (&ha->pdev->dev, vha->gnl.size, vha->gnl.l, vha->gnl.ldma); + vha->gnl.l =NULL ;scsi_remove_host (vha->host);return NULL ; }
drivers/spi/spi-bcm2835aux.c +20 -42
99 lines not on this page · raw message
drivers/target/target_core_user.c +7 -2
@@ -1143,14 +1143,16 @@ static void tcmu_handle_completion(struct tcmu_cmd *cmd, struct tcmu_cmd_entry *struct se_cmd *se_cmd = cmd->se_cmd;struct tcmu_dev *udev = cmd->tcmu_dev;bool read_len_valid = false; -uint32_t read_len = se_cmd->data_length; +uint32_t read_len;/* * cmd has been completed already from timeout, just reclaim * data area space and free cmd */ -if (test_bit (TCMU_CMD_BIT_EXPIRED , &cmd->flags)) +if (test_bit (TCMU_CMD_BIT_EXPIRED , &cmd->flags)) { +WARN_ON_ONCE (se_cmd); goto out; + }list_del_init (&cmd->queue_entry);
@@ -1163,6 +1165,7 @@ static void tcmu_handle_completion(struct tcmu_cmd *cmd, struct tcmu_cmd_entry * goto done; } + read_len = se_cmd->data_length;if (se_cmd->data_direction ==DMA_FROM_DEVICE && (entry->hdr.uflags &TCMU_UFLAG_READ_LEN ) && entry->rsp.read_len) { read_len_valid = true;
@@ -1318,6 +1321,7 @@ static int tcmu_check_expired_cmd(int id, void *p, void *data)*/ scsi_status =SAM_STAT_CHECK_CONDITION ;list_del_init (&cmd->queue_entry); + cmd->se_cmd =NULL ; }else {list_del_init (&cmd->queue_entry);idr_remove (&udev->commands, id);
@@ -2036,6 +2040,7 @@ static void tcmu_reset_ring(struct tcmu_dev *udev, u8 err_level)idr_remove (&udev->commands, i);if (!test_bit (TCMU_CMD_BIT_EXPIRED , &cmd->flags)) { +WARN_ON (!cmd->se_cmd);list_del_init (&cmd->queue_entry);if (err_level ==1 ) {/*
fs/afs/cell.c +4 -0
@@ -76,6 +76,7 @@ struct afs_cell *afs_lookup_cell_rcu(struct afs_net *net, cell =rcu_dereference_raw (net->ws_cell);if (cell) {afs_get_cell (cell); + ret =0 ;break ; } ret = -EDESTADDRREQ ;
@@ -110,6 +111,9 @@ struct afs_cell *afs_lookup_cell_rcu(struct afs_net *net,done_seqretry (&net->cells_lock, seq); +if (ret !=0 && cell) +afs_put_cell (net, cell); +return ret ==0 ? cell :ERR_PTR (ret); }
fs/ceph/caps.c +4 -1
@@ -1280,6 +1280,7 @@ static int __send_cap(struct ceph_mds_client *mdsc, struct ceph_cap *cap, {struct ceph_inode_info *ci = cap->ci;struct inode *inode = &ci->vfs_inode; +struct ceph_buffer *old_blob =NULL ;struct cap_msg_args arg;int held, revoking;int wake =0 ;
@@ -1344,7 +1345,7 @@ static int __send_cap(struct ceph_mds_client *mdsc, struct ceph_cap *cap, ci->i_requested_max_size = arg.max_size;if (flushing &CEPH_CAP_XATTR_EXCL ) { -__ceph_build_xattrs_blob (ci); + old_blob =__ceph_build_xattrs_blob (ci); arg.xattr_version = ci->i_xattrs.version; arg.xattr_buf = ci->i_xattrs.blob; }else {
@@ -1379,6 +1380,8 @@ static int __send_cap(struct ceph_mds_client *mdsc, struct ceph_cap *cap,spin_unlock (&ci->i_ceph_lock); +ceph_buffer_put (old_blob); + ret =send_cap_msg (&arg);if (ret <0 ) {dout ("error sending cap msg, must requeue %p\n" , inode);
fs/ceph/inode.c +4 -3
@@ -742,6 +742,7 @@ static int fill_inode(struct inode *inode, struct page *locked_page,int issued, new_issued, info_caps;struct timespec64 mtime, atime, ctime;struct ceph_buffer *xattr_blob =NULL ; +struct ceph_buffer *old_blob =NULL ;struct ceph_string *pool_ns =NULL ;struct ceph_cap *new_cap =NULL ;int err =0 ;
@@ -878,7 +879,7 @@ static int fill_inode(struct inode *inode, struct page *locked_page,if ((ci->i_xattrs.version ==0 || !(issued &CEPH_CAP_XATTR_EXCL )) &&le64_to_cpu (info->xattr_version) > ci->i_xattrs.version) {if (ci->i_xattrs.blob) -ceph_buffer_put (ci->i_xattrs.blob); + old_blob = ci->i_xattrs.blob; ci->i_xattrs.blob = xattr_blob;if (xattr_blob) memcpy(ci->i_xattrs.blob->vec.iov_base,
@@ -1017,8 +1018,8 @@ static int fill_inode(struct inode *inode, struct page *locked_page, out:if (new_cap)ceph_put_cap (mdsc, new_cap); -if (xattr_blob) -ceph_buffer_put (xattr_blob); +ceph_buffer_put (old_blob); +ceph_buffer_put (xattr_blob);ceph_put_string (pool_ns);return err; }
fs/ceph/snap.c +3 -1
@@ -460,6 +460,7 @@ void ceph_queue_cap_snap(struct ceph_inode_info *ci)struct inode *inode = &ci->vfs_inode;struct ceph_cap_snap *capsnap;struct ceph_snap_context *old_snapc, *new_snapc; +struct ceph_buffer *old_blob =NULL ;int used, dirty; capsnap =kzalloc (sizeof (*capsnap),GFP_NOFS );
@@ -536,7 +537,7 @@ void ceph_queue_cap_snap(struct ceph_inode_info *ci) capsnap->gid = inode->i_gid;if (dirty &CEPH_CAP_XATTR_EXCL ) { -__ceph_build_xattrs_blob (ci); + old_blob =__ceph_build_xattrs_blob (ci); capsnap->xattr_blob =ceph_buffer_get (ci->i_xattrs.blob); capsnap->xattr_version = ci->i_xattrs.version;
@@ -579,6 +580,7 @@ void ceph_queue_cap_snap(struct ceph_inode_info *ci) }spin_unlock (&ci->i_ceph_lock); +ceph_buffer_put (old_blob);kfree (capsnap);ceph_put_snap_context (old_snapc); }
fs/ceph/super.h +1 -1
@@ -896,7 +896,7 @@ extern int ceph_getattr(const struct path *path, struct kstat *stat,int __ceph_setxattr (struct inode *,const char *,const void *,size_t ,int );ssize_t __ceph_getxattr (struct inode *,const char *,void *,size_t );extern ssize_t ceph_listxattr (struct dentry *,char *,size_t ); -extern void __ceph_build_xattrs_blob (struct ceph_inode_info *ci); +extern struct ceph_buffer *__ceph_build_xattrs_blob (struct ceph_inode_info *ci);extern void __ceph_destroy_xattrs (struct ceph_inode_info *ci);extern void __init ceph_xattr_init (void );extern void ceph_xattr_exit (void );
fs/ceph/xattr.c +14 -5
@@ -734,12 +734,15 @@ static int __get_required_blob_size(struct ceph_inode_info *ci, int name_size,/* * If there are dirty xattrs, reencode xattrs into the prealloc_blob -* and swap into place. +* and swap into place. It returns the old i_xattrs.blob (or NULL) so +* that it can be freed by the caller as the i_ceph_lock is likely to be +* held. */ -void __ceph_build_xattrs_blob (struct ceph_inode_info *ci) +struct ceph_buffer *__ceph_build_xattrs_blob (struct ceph_inode_info *ci) {struct rb_node *p;struct ceph_inode_xattr *xattr =NULL ; +struct ceph_buffer *old_blob =NULL ;void *dest;dout ("__build_xattrs_blob %p\n" , &ci->vfs_inode);
@@ -770,12 +773,14 @@ void __ceph_build_xattrs_blob(struct ceph_inode_info *ci) dest - ci->i_xattrs.prealloc_blob->vec.iov_base;if (ci->i_xattrs.blob) -ceph_buffer_put (ci->i_xattrs.blob); + old_blob = ci->i_xattrs.blob; ci->i_xattrs.blob = ci->i_xattrs.prealloc_blob; ci->i_xattrs.prealloc_blob =NULL ; ci->i_xattrs.dirty = false; ci->i_xattrs.version++; } + +return old_blob; }static inline int __get_request_mask (struct inode *in) {
@@ -1011,6 +1016,7 @@ int __ceph_setxattr(struct inode *inode, const char *name,struct ceph_inode_info *ci =ceph_inode (inode);struct ceph_mds_client *mdsc =ceph_sb_to_client (inode->i_sb)->mdsc;struct ceph_cap_flush *prealloc_cf =NULL ; +struct ceph_buffer *old_blob =NULL ;int issued;int err;int dirty =0 ;
@@ -1084,13 +1090,15 @@ int __ceph_setxattr(struct inode *inode, const char *name,struct ceph_buffer *blob;spin_unlock (&ci->i_ceph_lock); -dout (" preaallocating new blob size=%d\n" , required_blob_size); +ceph_buffer_put (old_blob);/* Shouldn't be required */ +dout (" pre-allocating new blob size=%d\n" , required_blob_size); blob =ceph_buffer_new (required_blob_size,GFP_NOFS );if (!blob) goto do_sync_unlocked;spin_lock (&ci->i_ceph_lock); +/* prealloc_blob can't be released while holding i_ceph_lock */ if (ci->i_xattrs.prealloc_blob) -ceph_buffer_put (ci->i_xattrs.prealloc_blob); + old_blob = ci->i_xattrs.prealloc_blob; ci->i_xattrs.prealloc_blob = blob; goto retry; }
@@ -1106,6 +1114,7 @@ int __ceph_setxattr(struct inode *inode, const char *name, }spin_unlock (&ci->i_ceph_lock); +ceph_buffer_put (old_blob);if (lock_snap_rwsem)up_read (&mdsc->snap_rwsem);if (dirty)
fs/read_write.c +41 -8
79 lines not on this page · raw message
include/linux/ceph/buffer.h +2 -1
@@ -30,7 +30,8 @@ static inline struct ceph_buffer *ceph_buffer_get(struct ceph_buffer *b)static inline void ceph_buffer_put (struct ceph_buffer *b) { -kref_put (&b->kref, ceph_buffer_release); +if (b) +kref_put (&b->kref, ceph_buffer_release); }extern int ceph_decode_buffer (struct ceph_buffer **b,void **p,void *end);
include/linux/gpio.h +0 -24
@@ -240,30 +240,6 @@ static inline int irq_to_gpio(unsigned irq)return -EINVAL ; } -static inline int -gpiochip_add_pin_range (struct gpio_chip *chip,const char *pinctl_name, -unsigned int gpio_offset,unsigned int pin_offset, -unsigned int npins) -{ -WARN_ON (1 ); -return -EINVAL ; -} - -static inline int -gpiochip_add_pingroup_range (struct gpio_chip *chip, -struct pinctrl_dev *pctldev, -unsigned int gpio_offset,const char *pin_group) -{ -WARN_ON (1 ); -return -EINVAL ; -} - -static inline void -gpiochip_remove_pin_ranges (struct gpio_chip *chip) -{ -WARN_ON (1 ); -} -static inline int devm_gpio_request (struct device *dev,unsigned gpio,const char *label) {
include/net/act_api.h +3 -1
@@ -15,6 +15,7 @@struct tcf_idrinfo {spinlock_t lock;struct idr action_idr; +struct net *net; };struct tc_action_ops ;
@@ -107,7 +108,7 @@ struct tc_action_net { };static inline -int tc_action_net_init (struct tc_action_net *tn, +int tc_action_net_init (struct net *net,struct tc_action_net *tn,const struct tc_action_ops *ops) {int err =0 ;
@@ -116,6 +117,7 @@ int tc_action_net_init(struct tc_action_net *tn,if (!tn->idrinfo)return -ENOMEM ; tn->ops = ops; + tn->idrinfo->net = net;spin_lock_init (&tn->idrinfo->lock);idr_init (&tn->idrinfo->action_idr);return err;
include/net/netfilter/nf_tables.h +7 -2
@@ -418,8 +418,7 @@ struct nft_set {unsigned char *udata;/* runtime data below here */ const struct nft_set_ops *ops____cacheline_aligned ; - u16 flags:13, - bound:1, + u16 flags:14, genmask:2;u8 klen;u8 dlen;
@@ -1337,12 +1336,15 @@ struct nft_trans_rule {struct nft_trans_set {struct nft_set *set;u32 set_id; +bool bound; };#define nft_trans_set (trans) \ (((struct nft_trans_set *)trans->data)->set)#define nft_trans_set_id (trans) \ (((struct nft_trans_set *)trans->data)->set_id) +#define nft_trans_set_bound (trans) \ + (((struct nft_trans_set *)trans->data)->bound)struct nft_trans_chain {bool update;
@@ -1373,12 +1375,15 @@ struct nft_trans_table {struct nft_trans_elem {struct nft_set *set;struct nft_set_elem elem; +bool bound; };#define nft_trans_elem_set (trans) \ (((struct nft_trans_elem *)trans->data)->set)#define nft_trans_elem (trans) \ (((struct nft_trans_elem *)trans->data)->elem) +#define nft_trans_elem_set_bound (trans) \ + (((struct nft_trans_elem *)trans->data)->bound)struct nft_trans_obj {struct nft_object *obj;
include/net/psample.h +1 -0
@@ -12,6 +12,7 @@ struct psample_group {u32 group_num;u32 refcount;u32 seq; +struct rcu_head rcu; };struct psample_group *psample_group_get (struct net *net,u32 group_num);
kernel/kprobes.c +4 -4
@@ -483,6 +483,7 @@ static DECLARE_DELAYED_WORK(optimizing_work, kprobe_optimizer);*/ static void do_optimize_kprobes (void ) { +lockdep_assert_held (&text_mutex);/* * The optimization/unoptimization refers online_cpus via * stop_machine() and cpu-hotplug modifies online_cpus.
@@ -500,9 +501,7 @@ static void do_optimize_kprobes(void) list_empty(&optimizing_list))return ; -mutex_lock (&text_mutex);arch_optimize_kprobes (&optimizing_list); -mutex_unlock (&text_mutex); }/*
@@ -513,6 +512,7 @@ static void do_unoptimize_kprobes(void) {struct optimized_kprobe *op, *tmp; +lockdep_assert_held (&text_mutex);/* See comment in do_optimize_kprobes() */ lockdep_assert_cpus_held ();
@@ -520,7 +520,6 @@ static void do_unoptimize_kprobes(void)if (list_empty (&unoptimizing_list))return ; -mutex_lock (&text_mutex);arch_unoptimize_kprobes (&unoptimizing_list, &freeing_list);/* Loop free_list for disarming */ list_for_each_entry_safe (op, tmp, &freeing_list, list) {
@@ -537,7 +536,6 @@ static void do_unoptimize_kprobes(void) }else list_del_init (&op->list); } -mutex_unlock (&text_mutex); }/* Reclaim all kprobes on the free_list */
@@ -563,6 +561,7 @@ static void kprobe_optimizer(struct work_struct *work) {mutex_lock (&kprobe_mutex);cpus_read_lock (); +mutex_lock (&text_mutex);/* Lock modules while optimizing kprobes */ mutex_lock (&module_mutex);
@@ -590,6 +589,7 @@ static void kprobe_optimizer(struct work_struct *work)do_free_cleaned_kprobes ();mutex_unlock (&module_mutex); +mutex_unlock (&text_mutex);cpus_read_unlock ();mutex_unlock (&kprobe_mutex);
net/core/netpoll.c +3 -3
@@ -122,7 +122,7 @@ static void queue_process(struct work_struct *work) txq =netdev_get_tx_queue (dev, q_index);HARD_TX_LOCK (dev, txq,smp_processor_id ());if (netif_xmit_frozen_or_stopped (txq) || -netpoll_start_xmit (skb, dev, txq) !=NETDEV_TX_OK ) { + !dev_xmit_complete (netpoll_start_xmit (skb, dev, txq))) {skb_queue_head (&npinfo->txq, skb);HARD_TX_UNLOCK (dev, txq);local_irq_restore (flags);
@@ -335,7 +335,7 @@ void netpoll_send_skb_on_dev(struct netpoll *np, struct sk_buff *skb,HARD_TX_UNLOCK (dev, txq); -if (status ==NETDEV_TX_OK ) +if (dev_xmit_complete (status))break ; }
@@ -352,7 +352,7 @@ void netpoll_send_skb_on_dev(struct netpoll *np, struct sk_buff *skb, } -if (status !=NETDEV_TX_OK ) { +if (!dev_xmit_complete (status)) {skb_queue_tail (&npinfo->txq, skb);schedule_delayed_work (&npinfo->tx_work,0 ); }
net/ipv4/tcp.c +20 -9
@@ -934,6 +934,22 @@ static int tcp_send_mss(struct sock *sk, int *size_goal, int flags)return mss_now; } +/* In some cases, both sendpage() and sendmsg() could have added +* an skb to the write queue, but failed adding payload on it. +* We need to remove it to consume less memory, but more +* importantly be able to generate EPOLLOUT for Edge Trigger epoll() +* users. +*/ +static void tcp_remove_empty_skb (struct sock *sk,struct sk_buff *skb) +{ +if (skb && !skb->len) { +tcp_unlink_write_queue (skb, sk); +if (tcp_write_queue_empty (sk)) +tcp_chrono_stop (sk,TCP_CHRONO_BUSY ); +sk_wmem_free_skb (sk, skb); + } +} +ssize_t do_tcp_sendpages (struct sock *sk,struct page *page,int offset,size_t size,int flags) {
@@ -1056,6 +1072,7 @@ ssize_t do_tcp_sendpages(struct sock *sk, struct page *page, int offset,return copied; do_error: +tcp_remove_empty_skb (sk,tcp_write_queue_tail (sk));if (copied) goto out; out_err:
@@ -1409,17 +1426,11 @@ int tcp_sendmsg_locked(struct sock *sk, struct msghdr *msg, size_t size)sock_zerocopy_put (uarg);return copied + copied_syn; +do_error: + skb =tcp_write_queue_tail (sk); do_fault: -if (!skb->len) { -tcp_unlink_write_queue (skb, sk); -/* It is the one place in all of TCP, except connection -* reset, where we can be unlinking the send_head. -*/ -tcp_check_send_head (sk, skb); -sk_wmem_free_skb (sk, skb); - } +tcp_remove_empty_skb (sk, skb); -do_error:if (copied + copied_syn) goto out; out_err:
net/ipv4/tcp_output.c +2 -1
@@ -2046,7 +2046,7 @@ static bool tcp_can_coalesce_send_queue_head(struct sock *sk, int len)if (len <= skb->len)break ; -if (unlikely (TCP_SKB_CB (skb)->eor)) +if (unlikely (TCP_SKB_CB (skb)->eor) ||tcp_has_tx_tstamp (skb))return false; len -= skb->len;
@@ -2162,6 +2162,7 @@ static int tcp_mtu_probe(struct sock *sk)* we need to propagate it to the new skb. */ TCP_SKB_CB (nskb)->eor =TCP_SKB_CB (skb)->eor; +tcp_skb_collapse_tstamp (nskb, skb);tcp_unlink_write_queue (skb, sk);sk_wmem_free_skb (sk, skb); }else {
net/ipv6/mcast.c +3 -2
@@ -791,14 +791,15 @@ static void mld_del_delrec(struct inet6_dev *idev, struct ifmcaddr6 *im)if (pmc) { im->idev = pmc->idev;if (im->mca_sfmode ==MCAST_INCLUDE ) { - im->mca_tomb = pmc->mca_tomb; - im->mca_sources = pmc->mca_sources; +swap (im->mca_tomb, pmc->mca_tomb); +swap (im->mca_sources, pmc->mca_sources);for (psf = im->mca_sources; psf; psf = psf->sf_next) psf->sf_crcount = idev->mc_qrv; }else { im->mca_crcount = idev->mc_qrv; }in6_dev_put (pmc->idev); +ip6_mc_clear_src (pmc);kfree (pmc); }spin_unlock_bh (&im->mca_lock);
net/netfilter/nf_tables_api.c +10 -5
@@ -121,9 +121,14 @@ static void nft_set_trans_bind(const struct nft_ctx *ctx, struct nft_set *set)return ;list_for_each_entry_reverse (trans, &net->nft.commit_list, list) { -if (trans->msg_type ==NFT_MSG_NEWSET && -nft_trans_set (trans) == set) { - set->bound = true; +switch (trans->msg_type) { +case NFT_MSG_NEWSET : +if (nft_trans_set (trans) == set) +nft_trans_set_bound (trans) = true; +break ; +case NFT_MSG_NEWSETELEM : +if (nft_trans_elem_set (trans) == set) +nft_trans_elem_set_bound (trans) = true;break ; } }
@@ -6656,7 +6661,7 @@ static int __nf_tables_abort(struct net *net)break ;case NFT_MSG_NEWSET : trans->ctx.table->use--; -if (nft_trans_set (trans)->bound) { +if (nft_trans_set_bound (trans)) {nft_trans_destroy (trans);break ; }
@@ -6668,7 +6673,7 @@ static int __nf_tables_abort(struct net *net)nft_trans_destroy (trans);break ;case NFT_MSG_NEWSETELEM : -if (nft_trans_elem_set (trans)->bound) { +if (nft_trans_elem_set_bound (trans)) {nft_trans_destroy (trans);break ; }
net/netfilter/nft_flow_offload.c +6 -3
@@ -71,11 +71,11 @@ static void nft_flow_offload_eval(const struct nft_expr *expr, {struct nft_flow_offload *priv =nft_expr_priv (expr);struct nf_flowtable *flowtable = &priv->flowtable->data; +struct tcphdr _tcph, *tcph =NULL ;enum ip_conntrack_info ctinfo;struct nf_flow_route route;struct flow_offload *flow;enum ip_conntrack_dir dir; -bool is_tcp = false;struct nf_conn *ct;int ret;
@@ -88,7 +88,10 @@ static void nft_flow_offload_eval(const struct nft_expr *expr,switch (ct->tuplehash[IP_CT_DIR_ORIGINAL ].tuple.dst.protonum) {case IPPROTO_TCP : - is_tcp = true; + tcph =skb_header_pointer (pkt->skb, pkt->xt.thoff, +sizeof (_tcph), &_tcph); +if (unlikely (!tcph || tcph->fin || tcph->rst)) + goto out;break ;case IPPROTO_UDP :break ;
@@ -115,7 +118,7 @@ static void nft_flow_offload_eval(const struct nft_expr *expr,if (!flow) goto err_flow_alloc; -if (is_tcp) { +if (tcph) { ct->proto.tcp.seen[0 ].flags |=IP_CT_TCP_FLAG_BE_LIBERAL ; ct->proto.tcp.seen[1 ].flags |=IP_CT_TCP_FLAG_BE_LIBERAL ; }
net/psample/psample.c +1 -1
@@ -156,7 +156,7 @@ static void psample_group_destroy(struct psample_group *group) {psample_group_notify (group,PSAMPLE_CMD_DEL_GROUP );list_del (&group->list); -kfree (group); +kfree_rcu (group, rcu); } static struct psample_group *
net/rds/recv.c +4 -1
@@ -1,5 +1,5 @@/* -* Copyright (c) 2006, 2018 Oracle and/or its affiliates. All rights reserved. +* Copyright (c) 2006, 2019 Oracle and/or its affiliates. All rights reserved. * * This software is available to you under a choice of one of two * licenses. You may choose to be licensed under the terms of the GNU
@@ -803,6 +803,7 @@ void rds6_inc_info_copy(struct rds_incoming *inc, minfo6.seq =be64_to_cpu (inc->i_hdr.h_sequence); minfo6.len =be32_to_cpu (inc->i_hdr.h_len); + minfo6.tos =0 ;if (flip) { minfo6.laddr = *daddr;
@@ -816,6 +817,8 @@ void rds6_inc_info_copy(struct rds_incoming *inc, minfo6.fport = inc->i_hdr.h_dport; } + minfo6.flags =0 ; +rds_info_copy (iter, &minfo6,sizeof (minfo6)); }#endif
net/sched/act_bpf.c +1 -1
@@ -413,7 +413,7 @@ static __net_init int bpf_init_net(struct net *net) {struct tc_action_net *tn =net_generic (net, bpf_net_id); -return tc_action_net_init (tn, &act_bpf_ops); +return tc_action_net_init (net, tn, &act_bpf_ops); } static void __net_exit bpf_exit_net(struct list_head *net_list)
net/sched/act_connmark.c +1 -1
@@ -215,7 +215,7 @@ static __net_init int connmark_init_net(struct net *net) {struct tc_action_net *tn =net_generic (net, connmark_net_id); -return tc_action_net_init (tn, &act_connmark_ops); +return tc_action_net_init (net, tn, &act_connmark_ops); } static void __net_exit connmark_exit_net(struct list_head *net_list)
net/sched/act_csum.c +1 -1
@@ -678,7 +678,7 @@ static __net_init int csum_init_net(struct net *net) {struct tc_action_net *tn =net_generic (net, csum_net_id); -return tc_action_net_init (tn, &act_csum_ops); +return tc_action_net_init (net, tn, &act_csum_ops); } static void __net_exit csum_exit_net(struct list_head *net_list)
net/sched/act_gact.c +1 -1
@@ -263,7 +263,7 @@ static __net_init int gact_init_net(struct net *net) {struct tc_action_net *tn =net_generic (net, gact_net_id); -return tc_action_net_init (tn, &act_gact_ops); +return tc_action_net_init (net, tn, &act_gact_ops); } static void __net_exit gact_exit_net(struct list_head *net_list)
net/sched/act_ife.c +1 -1
@@ -887,7 +887,7 @@ static __net_init int ife_init_net(struct net *net) {struct tc_action_net *tn =net_generic (net, ife_net_id); -return tc_action_net_init (tn, &act_ife_ops); +return tc_action_net_init (net, tn, &act_ife_ops); } static void __net_exit ife_exit_net(struct list_head *net_list)
net/sched/act_ipt.c +6 -5
@@ -65,12 +65,13 @@ static int ipt_init_target(struct net *net, struct xt_entry_target *t,return 0 ; } -static void ipt_destroy_target (struct xt_entry_target *t) +static void ipt_destroy_target (struct xt_entry_target *t,struct net *net) {struct xt_tgdtor_param par = { .target = t->u.kernel.target, .targinfo = t->data, .family =NFPROTO_IPV4 , + .net = net, };if (par.target->destroy !=NULL ) par.target->destroy (&par);
@@ -82,7 +83,7 @@ static void tcf_ipt_release(struct tc_action *a)struct tcf_ipt *ipt =to_ipt (a);if (ipt->tcfi_t) { -ipt_destroy_target (ipt->tcfi_t); +ipt_destroy_target (ipt->tcfi_t, a->idrinfo->net);kfree (ipt->tcfi_t); }kfree (ipt->tcfi_tname);
@@ -182,7 +183,7 @@ static int __tcf_ipt_init(struct net *net, unsigned int id, struct nlattr *nla,spin_lock_bh (&ipt->tcf_lock);if (ret !=ACT_P_CREATED ) { -ipt_destroy_target (ipt->tcfi_t); +ipt_destroy_target (ipt->tcfi_t, net);kfree (ipt->tcfi_tname);kfree (ipt->tcfi_t); }
@@ -353,7 +354,7 @@ static __net_init int ipt_init_net(struct net *net) {struct tc_action_net *tn =net_generic (net, ipt_net_id); -return tc_action_net_init (tn, &act_ipt_ops); +return tc_action_net_init (net, tn, &act_ipt_ops); } static void __net_exit ipt_exit_net(struct list_head *net_list)
@@ -403,7 +404,7 @@ static __net_init int xt_init_net(struct net *net) {struct tc_action_net *tn =net_generic (net, xt_net_id); -return tc_action_net_init (tn, &act_xt_ops); +return tc_action_net_init (net, tn, &act_xt_ops); } static void __net_exit xt_exit_net(struct list_head *net_list)
net/sched/act_mirred.c +1 -1
@@ -419,7 +419,7 @@ static __net_init int mirred_init_net(struct net *net) {struct tc_action_net *tn =net_generic (net, mirred_net_id); -return tc_action_net_init (tn, &act_mirred_ops); +return tc_action_net_init (net, tn, &act_mirred_ops); } static void __net_exit mirred_exit_net(struct list_head *net_list)
net/sched/act_nat.c +1 -1
@@ -317,7 +317,7 @@ static __net_init int nat_init_net(struct net *net) {struct tc_action_net *tn =net_generic (net, nat_net_id); -return tc_action_net_init (tn, &act_nat_ops); +return tc_action_net_init (net, tn, &act_nat_ops); } static void __net_exit nat_exit_net(struct list_head *net_list)
net/sched/act_pedit.c +1 -1
@@ -488,7 +488,7 @@ static __net_init int pedit_init_net(struct net *net) {struct tc_action_net *tn =net_generic (net, pedit_net_id); -return tc_action_net_init (tn, &act_pedit_ops); +return tc_action_net_init (net, tn, &act_pedit_ops); } static void __net_exit pedit_exit_net(struct list_head *net_list)
net/sched/act_police.c +1 -1
@@ -342,7 +342,7 @@ static __net_init int police_init_net(struct net *net) {struct tc_action_net *tn =net_generic (net, police_net_id); -return tc_action_net_init (tn, &act_police_ops); +return tc_action_net_init (net, tn, &act_police_ops); } static void __net_exit police_exit_net(struct list_head *net_list)
net/sched/act_sample.c +5 -2
@@ -99,7 +99,8 @@ static int tcf_sample_init(struct net *net, struct nlattr *nla, s->tcf_action = parm->action; s->rate = rate; s->psample_group_num = psample_group_num; -RCU_INIT_POINTER (s->psample_group, psample_group); +rcu_swap_protected (s->psample_group, psample_group, +lockdep_is_held (&s->tcf_lock));if (tb[TCA_SAMPLE_TRUNC_SIZE ]) { s->truncate = true;
@@ -107,6 +108,8 @@ static int tcf_sample_init(struct net *net, struct nlattr *nla, }spin_unlock_bh (&s->tcf_lock); +if (psample_group) +psample_group_put (psample_group);if (ret ==ACT_P_CREATED )tcf_idr_insert (tn, *a);return ret;
@@ -255,7 +258,7 @@ static __net_init int sample_init_net(struct net *net) {struct tc_action_net *tn =net_generic (net, sample_net_id); -return tc_action_net_init (tn, &act_sample_ops); +return tc_action_net_init (net, tn, &act_sample_ops); } static void __net_exit sample_exit_net(struct list_head *net_list)
net/sched/act_simple.c +1 -1
@@ -215,7 +215,7 @@ static __net_init int simp_init_net(struct net *net) {struct tc_action_net *tn =net_generic (net, simp_net_id); -return tc_action_net_init (tn, &act_simp_ops); +return tc_action_net_init (net, tn, &act_simp_ops); } static void __net_exit simp_exit_net(struct list_head *net_list)
net/sched/act_skbedit.c +1 -1
@@ -316,7 +316,7 @@ static __net_init int skbedit_init_net(struct net *net) {struct tc_action_net *tn =net_generic (net, skbedit_net_id); -return tc_action_net_init (tn, &act_skbedit_ops); +return tc_action_net_init (net, tn, &act_skbedit_ops); } static void __net_exit skbedit_exit_net(struct list_head *net_list)
net/sched/act_skbmod.c +1 -1
@@ -277,7 +277,7 @@ static __net_init int skbmod_init_net(struct net *net) {struct tc_action_net *tn =net_generic (net, skbmod_net_id); -return tc_action_net_init (tn, &act_skbmod_ops); +return tc_action_net_init (net, tn, &act_skbmod_ops); } static void __net_exit skbmod_exit_net(struct list_head *net_list)
net/sched/act_tunnel_key.c +1 -1
@@ -579,7 +579,7 @@ static __net_init int tunnel_key_init_net(struct net *net) {struct tc_action_net *tn =net_generic (net, tunnel_key_net_id); -return tc_action_net_init (tn, &act_tunnel_key_ops); +return tc_action_net_init (net, tn, &act_tunnel_key_ops); } static void __net_exit tunnel_key_exit_net(struct list_head *net_list)
net/sched/act_vlan.c +1 -1
@@ -324,7 +324,7 @@ static __net_init int vlan_init_net(struct net *net) {struct tc_action_net *tn =net_generic (net, vlan_net_id); -return tc_action_net_init (tn, &act_vlan_ops); +return tc_action_net_init (net, tn, &act_vlan_ops); } static void __net_exit vlan_exit_net(struct list_head *net_list)
tools/bpf/bpftool/common.c +1 -1
@@ -238,7 +238,7 @@ int do_pin_any(int argc, char **argv, int (*get_fd_by_id)(__u32)) fd =get_fd_by_id (id);if (fd <0 ) { -p_err ("can't get prog by id (%u): %s" , id,strerror (errno)); +p_err ("can't open object by id (%u): %s" , id,strerror (errno));return -1 ; }
tools/hv/hv_kvp_daemon.c +1 -1
@@ -809,7 +809,7 @@ kvp_get_ip_info(int family, char *if_name, int op,int sn_offset =0 ;int error =0 ;char *buffer; -struct hv_kvp_ipaddr_value *ip_buffer; +struct hv_kvp_ipaddr_value *ip_buffer =NULL ;char cidr_mask[5 ];/* /xyz */ int weight;int i;
tools/testing/selftests/kvm/lib/x86.c +10 -6
@@ -809,9 +809,11 @@ struct kvm_x86_state *vcpu_save_state(struct kvm_vm *vm, uint32_t vcpuid)TEST_ASSERT (r ==0 ,"Unexpected result from KVM_GET_XSAVE, r: %i" , r); - r =ioctl (vcpu->fd,KVM_GET_XCRS , &state->xcrs); -TEST_ASSERT (r ==0 ,"Unexpected result from KVM_GET_XCRS, r: %i" , - r); +if (kvm_check_cap (KVM_CAP_XCRS )) { + r =ioctl (vcpu->fd,KVM_GET_XCRS , &state->xcrs); +TEST_ASSERT (r ==0 ,"Unexpected result from KVM_GET_XCRS, r: %i" , + r); + } r =ioctl (vcpu->fd,KVM_GET_SREGS , &state->sregs); TEST_ASSERT(r == 0, "Unexpected result from KVM_GET_SREGS, r: %i",
@@ -858,9 +860,11 @@ void vcpu_load_state(struct kvm_vm *vm, uint32_t vcpuid, struct kvm_x86_state *sTEST_ASSERT (r ==0 ,"Unexpected result from KVM_SET_XSAVE, r: %i" , r); - r =ioctl (vcpu->fd,KVM_SET_XCRS , &state->xcrs); -TEST_ASSERT (r ==0 ,"Unexpected result from KVM_SET_XCRS, r: %i" , - r); +if (kvm_check_cap (KVM_CAP_XCRS )) { + r =ioctl (vcpu->fd,KVM_SET_XCRS , &state->xcrs); +TEST_ASSERT (r ==0 ,"Unexpected result from KVM_SET_XCRS, r: %i" , + r); + } r =ioctl (vcpu->fd,KVM_SET_SREGS , &state->sregs); TEST_ASSERT(r == 0, "Unexpected result from KVM_SET_SREGS, r: %i",
tools/testing/selftests/kvm/platform_info_test.c +1 -1
@@ -100,8 +100,8 @@ int main(int argc, char *argv[]) msr_platform_info =vcpu_get_msr (vm,VCPU_ID ,MSR_PLATFORM_INFO );vcpu_set_msr (vm,VCPU_ID ,MSR_PLATFORM_INFO , msr_platform_info |MSR_PLATFORM_INFO_MAX_TURBO_RATIO ); -test_msr_platform_info_disabled (vm);test_msr_platform_info_enabled (vm); +test_msr_platform_info_disabled (vm);vcpu_set_msr (vm,VCPU_ID ,MSR_PLATFORM_INFO , msr_platform_info);kvm_vm_free (vm);
virt/kvm/arm/mmio.c +7 -0
@@ -98,6 +98,12 @@ int kvm_handle_mmio_return(struct kvm_vcpu *vcpu, struct kvm_run *run)unsigned int len;int mask; +/* Detect an already handled MMIO return */ +if (unlikely (!vcpu->mmio_needed)) +return 0 ; + + vcpu->mmio_needed =0 ; +if (!run->mmio.is_write) { len = run->mmio.len;if (len >sizeof (unsigned long ))
@@ -200,6 +206,7 @@ int io_mem_abort(struct kvm_vcpu *vcpu, struct kvm_run *run, run->mmio.is_write = is_write; run->mmio.phys_addr = fault_ipa; run->mmio.len = len; + vcpu->mmio_needed =1 ;if (!ret) {/* We handled the access successfully in the kernel. */
virt/kvm/arm/vgic/vgic-init.c +20 -10
@@ -19,6 +19,7 @@#include <linux/cpu.h> #include <linux/kvm_host.h> #include <kvm/arm_vgic.h> +#include <asm/kvm_emulate.h> #include <asm/kvm_mmu.h> #include "vgic.h"
@@ -175,12 +176,18 @@ static int kvm_vgic_dist_init(struct kvm *kvm, unsigned int nr_spis) irq->vcpu =NULL ; irq->target_vcpu = vcpu0;kref_init (&irq->refcount); -if (dist->vgic_model ==KVM_DEV_TYPE_ARM_VGIC_V2 ) { +switch (dist->vgic_model) { +case KVM_DEV_TYPE_ARM_VGIC_V2 : irq->targets =0 ; irq->group =0 ; - }else { +break ; +case KVM_DEV_TYPE_ARM_VGIC_V3 : irq->mpidr =0 ; irq->group =1 ; +break ; +default : +kfree (dist->spis); +return -EINVAL ; } }return 0 ;
@@ -220,7 +227,6 @@ int kvm_vgic_vcpu_init(struct kvm_vcpu *vcpu) irq->intid = i; irq->vcpu =NULL ; irq->target_vcpu = vcpu; - irq->targets =1U << vcpu->vcpu_id;kref_init (&irq->refcount);if (vgic_irq_is_sgi (i)) {/* SGIs */
@@ -230,11 +236,6 @@ int kvm_vgic_vcpu_init(struct kvm_vcpu *vcpu)/* PPIs */ irq->config =VGIC_CONFIG_LEVEL ; } - -if (dist->vgic_model ==KVM_DEV_TYPE_ARM_VGIC_V3 ) - irq->group =1 ; -else - irq->group =0 ; }if (!irqchip_in_kernel (vcpu->kvm))
@@ -297,10 +298,19 @@ int vgic_init(struct kvm *kvm)for (i =0 ; i <VGIC_NR_PRIVATE_IRQS ; i++) {struct vgic_irq *irq = &vgic_cpu->private_irqs[i]; -if (dist->vgic_model ==KVM_DEV_TYPE_ARM_VGIC_V3 ) +switch (dist->vgic_model) { +case KVM_DEV_TYPE_ARM_VGIC_V3 : irq->group =1 ; -else + irq->mpidr =kvm_vcpu_get_mpidr_aff (vcpu); +break ; +case KVM_DEV_TYPE_ARM_VGIC_V2 : irq->group =0 ; + irq->targets =1U << idx; +break ; +default : + ret = -EINVAL ; + goto out; + } } }