Linux 4.14.167
Greg KH
maintainerI'm announcing the release of the 4.14.167 kernel.
All users of the 4.14 kernel series must upgrade.
The updated 4.14.y git tree can be found at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git linux-4.14.y
and can be browsed at the normal kernel.org git web browser:
https://git.kernel.org/?p=linux/kernel/git/stable/linux-stable.git;a=summary
thanks,
greg k-h
------------
Makefile | 2 arch/arm/boot/dts/am571x-idk.dts | 2 arch/arm64/boot/dts/altera/socfpga_stratix10.dtsi | 8 arch/arm64/boot/dts/amlogic/meson-gxl-s905x-khadas-vim.dts | 4 arch/arm64/boot/dts/arm/juno-base.dtsi | 1 arch/x86/boot/compressed/head_64.S | 5 arch/x86/kernel/cpu/intel_rdt.c | 2 block/blk-settings.c | 2 drivers/block/xen-blkfront.c | 4 drivers/clk/clk.c | 10 drivers/iio/industrialio-buffer.c | 6 drivers/md/dm-snap-persistent.c | 2 drivers/md/raid0.c | 2 drivers/message/fusion/mptctl.c | 213 +++---------- drivers/net/ethernet/hisilicon/hns/hns_enet.c | 4 drivers/net/ethernet/stmicro/stmmac/common.h | 5 drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 4 drivers/net/hyperv/rndis_filter.c | 2 drivers/net/macvlan.c | 5 drivers/net/usb/lan78xx.c | 1 drivers/net/usb/r8152.c | 3 drivers/net/wan/fsl_ucc_hdlc.c | 2 drivers/net/wireless/st/cw1200/fwio.c | 6 drivers/nfc/pn533/usb.c | 2 drivers/ptp/ptp_clock.c | 4 drivers/scsi/bnx2i/bnx2i_iscsi.c | 2 drivers/scsi/esas2r/esas2r_flash.c | 1 drivers/scsi/fnic/vnic_dev.c | 20 - drivers/scsi/qla2xxx/qla_init.c | 6 drivers/scsi/qla2xxx/qla_isr.c | 6 drivers/scsi/qla4xxx/ql4_mbx.c | 3 drivers/scsi/scsi_trace.c | 113 ++---- drivers/target/target_core_fabric_lib.c | 2 drivers/usb/core/hub.c | 1 drivers/usb/serial/ch341.c | 6 drivers/usb/serial/io_edgeport.c | 33 +- drivers/usb/serial/keyspan.c | 4 drivers/usb/serial/opticon.c | 2 drivers/usb/serial/option.c | 6 drivers/usb/serial/quatech2.c | 6 drivers/usb/serial/usb-serial-simple.c | 2 drivers/usb/serial/usb-serial.c | 3 firmware/Makefile | 2 fs/btrfs/qgroup.c | 6 fs/reiserfs/xattr.c | 8 include/dt-bindings/reset/amlogic,meson8b-reset.h | 6 include/linux/blkdev.h | 8 include/linux/regulator/ab8500.h | 2 kernel/ptrace.c | 15 kernel/time/tick-sched.c | 14 mm/huge_memory.c | 38 +- mm/page-writeback.c | 4 mm/shmem.c | 7 net/batman-adv/distributed-arp-table.c | 4 net/dsa/tag_qca.c | 3 net/ipv4/netfilter/arp_tables.c | 19 - net/ipv4/tcp_input.c | 7 net/netfilter/ipset/ip_set_bitmap_gen.h | 2 net/wireless/rdev-ops.h | 4 net/wireless/util.c | 2 sound/core/seq/seq_timer.c | 14 sound/soc/codecs/msm8916-wcd-analog.c | 4 tools/perf/builtin-report.c | 5 tools/perf/util/hist.h | 4 tools/perf/util/probe-finder.c | 32 - 65 files changed, 319 insertions(+), 408 deletions(-)
Alexander Lobakin (1):
net: dsa: tag_qca: fix doubled Tx statistics
Ard Biesheuvel (1):
x86/efistub: Disable paging at mixed mode entry
Arnd Bergmann (1):
scsi: fnic: fix invalid stack access
Bart Van Assche (2):
scsi: target: core: Fix a pr_debug() argument
scsi: core: scsi_trace: Use get_unaligned_be*()
Bharath Vedartham (1):
mm/huge_memory.c: make __thp_get_unmapped_area static
Christian Brauner (1):
ptrace: reintroduce usage of subjective credentials in ptrace_has_cap()
Christian Hewitt (1):
arm64: dts: meson-gxl-s905x-khadas-vim: fix gpio-keys-polled node
Colin Ian King (1):
net/wan/fsl_ucc_hdlc: fix out of bounds write on array utdm_info
Cong Wang (1):
netfilter: fix a use-after-free in mtype_destroy()
Dan Carpenter (3):
scsi: mptfusion: Fix double fetch bug in ioctl
cw1200: Fix a signedness bug in cw1200_load_firmware()
scsi: esas2r: unlock on error in esas2r_nvram_read_direct()
Dinh Nguyen (1):
arm64: dts: agilex/stratix10: fix pmu interrupt numbers
Eric Dumazet (3):
macvlan: use skb_reset_mac_header() in macvlan_queue_xmit()
net: usb: lan78xx: limit size of local TSO packets tick/sched: Annotate lockless access to last_jiffies_update
Felix Fietkau (1):
cfg80211: fix page refcount issue in A-MSDU decap
Florian Westphal (1):
netfilter: arp_tables: init netns pointer in xt_tgdtor_param struct
Greg Kroah-Hartman (1):
Linux 4.14.167
Guenter Roeck (1):
clk: Don't try to enable critical clocks if prepare failed
Huacai Chen (1):
scsi: qla2xxx: Fix qla2x00_request_irqs() for MSI
Jari Ruusu (1):
Fix built-in early-load Intel microcode alignment
Jeff Mahoney (1):
reiserfs: fix handling of -EOPNOTSUPP in reiserfs_for_each_xattr
Jerónimo Borque (1):
USB: serial: simple: Add Motorola Solutions TETRA MTP3xxx and MTP85xx
Jin Yao (1):
perf report: Fix incorrectly added dimensions as switch perf data file
Johan Hovold (9):
USB: serial: opticon: fix control-message timeouts
USB: serial: suppress driver bind attributes
USB: serial: ch341: handle unbound port at reset_resume
USB: serial: io_edgeport: add missing active-port sanity check
USB: serial: keyspan: handle unbound ports
USB: serial: quatech2: handle unbound ports
USB: serial: io_edgeport: handle unbound ports on URB completion
NFC: pn533: fix bulk-message timeout
r8152: add missing endpoint sanity check
Johannes Berg (1):
cfg80211: check for set_wiphy_params
Johannes Thumshirn (1):
btrfs: fix memory leak in qgroup accounting
John Ogness (1):
USB: serial: io_edgeport: use irqsave() in USB's complete callback
Jose Abreu (2):
net: stmmac: 16KB buffer must be 16 byte aligned
net: stmmac: Enable 16KB buffer size
Keiya Nobuta (1):
usb: core: hub: Improved device recognition on remote wakeup
Kirill A. Shutemov (2):
mm/shmem.c: thp, shmem: fix conflict of above-47bit hint address and PMD alignment mm/huge_memory.c: thp: fix conflict of above-47bit hint address and PMD alignment
Kishon Vijay Abraham I (1):
ARM: dts: am571x-idk: Fix gpios property to have the correct gpio number
Kristian Evensen (1):
USB: serial: option: Add support for Quectel RM500Q
Lars Möllendorf (1):
iio: buffer: align the size of scan bytes to size of the largest element
Martin Blumenstingl (1):
dt-bindings: reset: meson8b: fix duplicate reset IDs
Martin Wilck (1):
scsi: qla2xxx: fix rports not being mark as lost in sync fabric scan
Masami Hiramatsu (1):
perf probe: Fix wrong address verification
Mikulas Patocka (1):
block: fix an integer overflow in logical block size
Mohammed Gamal (1):
hv_netvsc: Fix memory leak when removing rndis device
Nathan Chancellor (1):
xen/blkfront: Adjust indentation in xlvbd_alloc_gendisk
Pan Bian (2):
scsi: qla4xxx: fix double free bug
scsi: bnx2i: fix potential use after free
Pengcheng Yang (1):
tcp: fix marked lost packets not being retransmitted
Qian Cai (1):
x86/resctrl: Fix an imbalance in domain_remove_cpu()
Reinhard Speyerer (1):
USB: serial: option: add support for Quectel RM500Q in QDL mode
Stephan Gerhold (2):
ASoC: msm8916-wcd-analog: Fix selected events for MIC BIAS External1
regulator: ab8500: Remove SYSCLKREQ from enum ab8505_regulator_id
Sudeep Holla (1):
Revert "arm64: dts: juno: add dma-ranges property"
Sven Eckelmann (1):
batman-adv: Fix DAT candidate selection on little endian systems
Takashi Iwai (1):
ALSA: seq: Fix racy access for queue timer in proc read
Vladis Dronov (1):
ptp: free ptp device pin descriptors properly
Wen Yang (1):
mm/page-writeback.c: avoid potential division by zero in wb_min_max_ratio()
Yonglong Liu (1):
net: hns: fix soft lockup when there is not enough memory
Yuya Fujita (1):
perf hists: Fix variable name's inconsistency in hists__for_each() macro
Greg KH
maintainerMakefile +1 -1
@@ -1,7 +1,7 @@ # SPDX-License-Identifier: GPL-2.0 VERSION = 4 PATCHLEVEL = 14 -SUBLEVEL = 166 +SUBLEVEL = 167 EXTRAVERSION = NAME = Petit Gorille
arch/arm/boot/dts/am571x-idk.dts +1 -1
@@ -93,7 +93,7 @@ &pcie1_rc { status = "okay"; - gpios = <&gpio3 23 GPIO_ACTIVE_HIGH>; + gpios = <&gpio5 18 GPIO_ACTIVE_HIGH>; }; &pcie1_ep {
arch/arm64/boot/dts/altera/socfpga_stratix10.dtsi +4 -4
@@ -56,10 +56,10 @@ pmu { compatible = "arm,armv8-pmuv3"; - interrupts = <0 120 8>, - <0 121 8>, - <0 122 8>, - <0 123 8>; + interrupts = <0 170 4>, + <0 171 4>, + <0 172 4>, + <0 173 4>; interrupt-affinity = <&cpu0>, <&cpu1>, <&cpu2>,
arch/arm64/boot/dts/amlogic/meson-gxl-s905x-khadas-vim.dts +1 -3
@@ -33,11 +33,9 @@ gpio-keys-polled { compatible = "gpio-keys-polled"; - #address-cells = <1>; - #size-cells = <0>; poll-interval = <100>; - button@0 { + power-button { label = "power"; linux,code = <KEY_POWER>; gpios = <&gpio_ao GPIOAO_2 GPIO_ACTIVE_LOW>;
arch/arm64/boot/dts/arm/juno-base.dtsi +0 -1
@@ -5,7 +5,6 @@ /* * Devices shared by all Juno boards */ - dma-ranges = <0 0 0 0 0x100 0>; memtimer: timer@2a810000 { compatible = "arm,armv7-timer-mem";
arch/x86/boot/compressed/head_64.S +5 -0
@@ -227,6 +227,11 @@ ENTRY(efi32_stub_entry) leal efi32_config(%ebp), %eax movl %eax, efi_config(%ebp) + /* Disable paging */ + movl %cr0, %eax + btrl $X86_CR0_PG_BIT, %eax + movl %eax, %cr0 + jmp startup_32 ENDPROC(efi32_stub_entry) #endif
arch/x86/kernel/cpu/intel_rdt.c +1 -1
@@ -526,7 +526,7 @@ static void domain_remove_cpu(int cpu, struct rdt_resource *r)if (static_branch_unlikely (&rdt_mon_enable_key))rmdir_mondata_subdir_allrdtgrp (r, d->id);list_del (&d->list); -if (is_mbm_enabled ()) +if (r->mon_capable &&is_mbm_enabled ())cancel_delayed_work (&d->mbm_over);if (is_llc_occupancy_enabled () &&has_busy_rmid (r, d)) {/*
block/blk-settings.c +1 -1
@@ -379,7 +379,7 @@ EXPORT_SYMBOL(blk_queue_max_segment_size);* storage device can address. The default of 512 covers most * hardware. **/ -void blk_queue_logical_block_size (struct request_queue *q,unsigned short size) +void blk_queue_logical_block_size (struct request_queue *q,unsigned int size) { q->limits.logical_block_size = size;
drivers/block/xen-blkfront.c +2 -2
@@ -1115,8 +1115,8 @@ static int xlvbd_alloc_gendisk(blkif_sector_t capacity,if (!VDEV_IS_EXTENDED (info->vdevice)) { err =xen_translate_vdev (info->vdevice, &minor, &offset);if (err) -return err; - nr_parts =PARTS_PER_DISK ; +return err; + nr_parts =PARTS_PER_DISK ; }else { minor =BLKIF_MINOR_EXT (info->vdevice); nr_parts =PARTS_PER_EXT_DISK ;
drivers/clk/clk.c +8 -2
@@ -2482,11 +2482,17 @@ static int __clk_core_init(struct clk_core *core)if (core->flags &CLK_IS_CRITICAL ) {unsigned long flags; -clk_core_prepare (core); + ret =clk_core_prepare (core); +if (ret) + goto out; flags =clk_enable_lock (); -clk_core_enable (core); + ret =clk_core_enable (core);clk_enable_unlock (flags); +if (ret) { +clk_core_unprepare (core); + goto out; + } }/*
drivers/iio/industrialio-buffer.c +5 -1
@@ -570,7 +570,7 @@ static int iio_compute_scan_bytes(struct iio_dev *indio_dev, const unsigned long *mask, bool timestamp) { unsigned bytes = 0; -int length, i; +int length, i, largest =0 ;/* How much space will the demuxed element take? */ for_each_set_bit(i, mask,
@@ -578,13 +578,17 @@ static int iio_compute_scan_bytes(struct iio_dev *indio_dev, length =iio_storage_bytes_for_si (indio_dev, i); bytes =ALIGN (bytes, length); bytes += length; + largest =max (largest, length); }if (timestamp) { length =iio_storage_bytes_for_timestamp (indio_dev); bytes =ALIGN (bytes, length); bytes += length; + largest =max (largest, length); } + + bytes =ALIGN (bytes, largest);return bytes; }
drivers/md/dm-snap-persistent.c +1 -1
@@ -17,7 +17,7 @@#include "dm-bufio.h" #define DM_MSG_PREFIX "persistent snapshot" -#define DM_CHUNK_SIZE_DEFAULT_SECTORS 32/* 16KB */ +#define DM_CHUNK_SIZE_DEFAULT_SECTORS 32U/* 16KB */ #define DM_PREFETCH_CHUNKS 12
drivers/md/raid0.c +1 -1
@@ -94,7 +94,7 @@ static int create_strip_zones(struct mddev *mddev, struct r0conf **private_conf)char b[BDEVNAME_SIZE ];char b2[BDEVNAME_SIZE ];struct r0conf *conf =kzalloc (sizeof (*conf),GFP_KERNEL ); -unsigned short blksize =512 ; +unsigned blksize =512 ; *private_conf =ERR_PTR (-ENOMEM );if (!conf)
drivers/message/fusion/mptctl.c +50 -163
488 lines not on this page · raw message
drivers/net/ethernet/hisilicon/hns/hns_enet.c +1 -3
@@ -669,7 +669,6 @@ static int hns_nic_poll_rx_skb(struct hns_nic_ring_data *ring_data, skb = *out_skb =napi_alloc_skb (&ring_data->napi,HNS_RX_HEAD_SIZE );if (unlikely (!skb)) { -netdev_err (ndev,"alloc rx skb fail\n" ); ring->stats.sw_err_cnt++;return -ENOMEM ; }
@@ -1180,7 +1179,6 @@ static int hns_nic_common_poll(struct napi_struct *napi, int budget) container_of(napi, struct hns_nic_ring_data, napi);struct hnae_ring *ring = ring_data->ring; -try_again: clean_complete += ring_data->poll_one ( ring_data, budget - clean_complete, ring_data->ex_process);
@@ -1190,7 +1188,7 @@ static int hns_nic_common_poll(struct napi_struct *napi, int budget)napi_complete (napi); ring->q->handle->dev->ops->toggle_ring_irq (ring,0 ); }else { - goto try_again; +return budget; } }
drivers/net/ethernet/stmicro/stmmac/common.h +2 -3
@@ -338,9 +338,8 @@ struct dma_features {unsigned int rx_fifo_size; }; -/* GMAC TX FIFO is 8K, Rx FIFO is 16K */ -#define BUF_SIZE_16KiB 16384 -/* RX Buffer size must be < 8191 and multiple of 4/8/16 bytes */ +/* RX Buffer size must be multiple of 4/8/16 bytes */ +#define BUF_SIZE_16KiB 16368#define BUF_SIZE_8KiB 8188#define BUF_SIZE_4KiB 4096#define BUF_SIZE_2KiB 2048
drivers/net/ethernet/stmicro/stmmac/stmmac_main.c +3 -1
@@ -1043,7 +1043,9 @@ static int stmmac_set_bfsize(int mtu, int bufsize) {int ret = bufsize; -if (mtu >= BUF_SIZE_4KiB) +if (mtu >= BUF_SIZE_8KiB) + ret = BUF_SIZE_16KiB; +else if (mtu >= BUF_SIZE_4KiB) ret = BUF_SIZE_8KiB;else if (mtu >= BUF_SIZE_2KiB) ret = BUF_SIZE_4KiB;
drivers/net/hyperv/rndis_filter.c +0 -2
@@ -1331,8 +1331,6 @@ void rndis_filter_device_remove(struct hv_device *dev,/* Halt and release the rndis device */ rndis_filter_halt_device (rndis_dev); - net_dev->extension =NULL ; -netvsc_device_remove (dev); }
drivers/net/macvlan.c +3 -2
@@ -263,7 +263,7 @@ static void macvlan_broadcast(struct sk_buff *skb, struct net_device *src, enum macvlan_mode mode) { -const struct ethhdr *eth =skb_eth_hdr (skb); +const struct ethhdr *eth =eth_hdr (skb);const struct macvlan_dev *vlan;struct sk_buff *nskb;unsigned int i;
@@ -515,10 +515,11 @@ static int macvlan_queue_xmit(struct sk_buff *skb, struct net_device *dev)const struct macvlan_dev *dest;if (vlan->mode ==MACVLAN_MODE_BRIDGE ) { -const struct ethhdr *eth = (void *)skb->data; +const struct ethhdr *eth =skb_eth_hdr (skb);/* send to other bridge ports directly */ if (is_multicast_ether_addr (eth->h_dest)) { +skb_reset_mac_header (skb);macvlan_broadcast (skb, port, dev,MACVLAN_MODE_BRIDGE ); goto xmit_world; }
drivers/net/usb/lan78xx.c +1 -0
@@ -3612,6 +3612,7 @@ static int lan78xx_probe(struct usb_interface *intf,/* MTU range: 68 - 9000 */ netdev->max_mtu =MAX_SINGLE_PACKET_SIZE ; +netif_set_gso_max_size (netdev,MAX_SINGLE_PACKET_SIZE -MAX_HEADER ); dev->ep_blkin = (intf->cur_altsetting)->endpoint +0 ; dev->ep_blkout = (intf->cur_altsetting)->endpoint +1 ;
drivers/net/usb/r8152.c +3 -0
@@ -5158,6 +5158,9 @@ static int rtl8152_probe(struct usb_interface *intf,return -ENODEV ; } +if (intf->cur_altsetting->desc.bNumEndpoints <3 ) +return -ENODEV ; +usb_reset_device (udev); netdev =alloc_etherdev (sizeof (struct r8152 ));if (!netdev) {
drivers/net/wan/fsl_ucc_hdlc.c +1 -1
@@ -76,7 +76,7 @@ static struct ucc_tdm_info utdm_primary_info = { }, }; -static struct ucc_tdm_info utdm_info[MAX_HDLC_NUM ]; +static struct ucc_tdm_info utdm_info[UCC_MAX_NUM ];static int uhdlc_init (struct ucc_hdlc_private *priv) {
drivers/net/wireless/st/cw1200/fwio.c +3 -3
@@ -323,12 +323,12 @@ int cw1200_load_firmware(struct cw1200_common *priv) goto out; } - priv->hw_type =cw1200_get_hw_type (val32, &major_revision); -if (priv->hw_type <0 ) { + ret =cw1200_get_hw_type (val32, &major_revision); +if (ret <0 ) {pr_err ("Can't deduce hardware type.\n" ); - ret = -ENOTSUPP ; goto out; } + priv->hw_type = ret;/* Set DPLL Reg value, and read back to confirm writes work */ ret = cw1200_reg_write_32(priv, ST90TDS_TSET_GEN_R_W_REG_ID,
drivers/nfc/pn533/usb.c +1 -1
@@ -403,7 +403,7 @@ static int pn533_acr122_poweron_rdr(struct pn533_usb_phy *phy) cmd, sizeof(cmd), false); rc =usb_bulk_msg (phy->udev, phy->out_urb->pipe, buffer,sizeof (cmd), - &transferred,0 ); + &transferred,5000 );kfree (buffer);if (rc || (transferred !=sizeof (cmd))) { nfc_err(&phy->udev->dev,
drivers/ptp/ptp_clock.c +2 -2
@@ -179,6 +179,7 @@ static void ptp_clock_release(struct device *dev) { struct ptp_clock *ptp = container_of(dev, struct ptp_clock, dev); +ptp_cleanup_pin_groups (ptp);mutex_destroy (&ptp->tsevq_mux);mutex_destroy (&ptp->pincfg_mux);ida_simple_remove (&ptp_clocks_map, ptp->index);
@@ -315,9 +316,8 @@ int ptp_clock_unregister(struct ptp_clock *ptp)if (ptp->pps_source)pps_unregister_source (ptp->pps_source); -ptp_cleanup_pin_groups (ptp); -posix_clock_unregister (&ptp->clock); +return 0 ; }EXPORT_SYMBOL (ptp_clock_unregister);
drivers/scsi/bnx2i/bnx2i_iscsi.c +1 -1
@@ -915,12 +915,12 @@ void bnx2i_free_hba(struct bnx2i_hba *hba)INIT_LIST_HEAD (&hba->ep_ofld_list);INIT_LIST_HEAD (&hba->ep_active_list);INIT_LIST_HEAD (&hba->ep_destroy_list); -pci_dev_put (hba->pcidev);if (hba->regview) {pci_iounmap (hba->pcidev, hba->regview); hba->regview =NULL ; } +pci_dev_put (hba->pcidev);bnx2i_free_mp_bdt (hba);bnx2i_release_free_cid_que (hba);iscsi_host_free (shost);
drivers/scsi/esas2r/esas2r_flash.c +1 -0
@@ -1197,6 +1197,7 @@ bool esas2r_nvram_read_direct(struct esas2r_adapter *a)if (!esas2r_read_flash_block (a, a->nvram,FLS_OFFSET_NVR ,sizeof (struct esas2r_sas_nvram ))) {esas2r_hdebug ("NVRAM read failed, using defaults" ); +up (&a->nvram_semaphore);return false; }
drivers/scsi/fnic/vnic_dev.c +10 -10
@@ -445,26 +445,26 @@ int vnic_dev_soft_reset_done(struct vnic_dev *vdev, int *done)int vnic_dev_hang_notify (struct vnic_dev *vdev) { -u64 a0, a1; +u64 a0 =0 , a1 =0 ;int wait =1000 ;return vnic_dev_cmd (vdev,CMD_HANG_NOTIFY , &a0, &a1, wait); }int vnic_dev_mac_addr (struct vnic_dev *vdev,u8 *mac_addr) { -u64 a0, a1; +u64 a[2 ] = {};int wait =1000 ;int err, i;for (i =0 ; i <ETH_ALEN ; i++) mac_addr[i] =0 ; - err =vnic_dev_cmd (vdev,CMD_MAC_ADDR , &a0, &a1, wait); + err =vnic_dev_cmd (vdev,CMD_MAC_ADDR , &a[0 ], &a[1 ], wait);if (err)return err;for (i =0 ; i <ETH_ALEN ; i++) - mac_addr[i] = ((u8 *)&a0)[i]; + mac_addr[i] = ((u8 *)&a)[i];return 0 ; }
@@ -489,30 +489,30 @@ void vnic_dev_packet_filter(struct vnic_dev *vdev, int directed, int multicast,void vnic_dev_add_addr (struct vnic_dev *vdev,u8 *addr) { -u64 a0 =0 , a1 =0 ; +u64 a[2 ] = {};int wait =1000 ;int err;int i;for (i =0 ; i <ETH_ALEN ; i++) - ((u8 *)&a0)[i] = addr[i]; + ((u8 *)&a)[i] = addr[i]; - err =vnic_dev_cmd (vdev,CMD_ADDR_ADD , &a0, &a1, wait); + err =vnic_dev_cmd (vdev,CMD_ADDR_ADD , &a[0 ], &a[1 ], wait);if (err)pr_err ("Can't add addr [%pM], %d\n" , addr, err); }void vnic_dev_del_addr (struct vnic_dev *vdev,u8 *addr) { -u64 a0 =0 , a1 =0 ; +u64 a[2 ] = {};int wait =1000 ;int err;int i;for (i =0 ; i <ETH_ALEN ; i++) - ((u8 *)&a0)[i] = addr[i]; + ((u8 *)&a)[i] = addr[i]; - err =vnic_dev_cmd (vdev,CMD_ADDR_DEL , &a0, &a1, wait); + err =vnic_dev_cmd (vdev,CMD_ADDR_DEL , &a[0 ], &a[1 ], wait);if (err)pr_err ("Can't del addr [%pM], %d\n" , addr, err); }
drivers/scsi/qla2xxx/qla_init.c +3 -3
@@ -5145,8 +5145,7 @@ qla2x00_find_all_fabric_devs(scsi_qla_host_t *vha)if (test_bit (LOOP_RESYNC_NEEDED , &vha->dpc_flags))break ; -if ((fcport->flags &FCF_FABRIC_DEVICE ) ==0 || - (fcport->flags &FCF_LOGIN_NEEDED ) ==0 ) +if ((fcport->flags &FCF_FABRIC_DEVICE ) ==0 )continue ;if (fcport->scan_state ==QLA_FCPORT_SCAN ) {
@@ -5171,7 +5170,8 @@ qla2x00_find_all_fabric_devs(scsi_qla_host_t *vha) } } -if (fcport->scan_state ==QLA_FCPORT_FOUND ) +if (fcport->scan_state ==QLA_FCPORT_FOUND && + (fcport->flags &FCF_LOGIN_NEEDED ) !=0 )qla24xx_fcport_handle_login (vha, fcport); }return (rval);
drivers/scsi/qla2xxx/qla_isr.c +3 -3
@@ -3519,7 +3519,7 @@ qla2x00_request_irqs(struct qla_hw_data *ha, struct rsp_que *rsp) skip_msix:ql_log (ql_log_info, vha,0x0037 , -"Falling back-to MSI mode -%d.\n" , ret); +"Falling back-to MSI mode -- ret=%d.\n" , ret); if (!IS_QLA24XX(ha) && !IS_QLA2532(ha) && !IS_QLA8432(ha) && !IS_QLA8001(ha) && !IS_P3P_TYPE(ha) && !IS_QLAFX00(ha) &&
@@ -3527,13 +3527,13 @@ qla2x00_request_irqs(struct qla_hw_data *ha, struct rsp_que *rsp) goto skip_msi; ret =pci_alloc_irq_vectors (ha->pdev,1 ,1 ,PCI_IRQ_MSI ); -if (!ret) { +if (ret >0 ) {ql_dbg (ql_dbg_init, vha,0x0038 ,"MSI: Enabled.\n" ); ha->flags.msi_enabled =1 ; }else ql_log (ql_log_warn, vha,0x0039 , -"Falling back-to INTa mode -- %d.\n" , ret); +"Falling back-to INTa mode -- ret=%d.\n" , ret); skip_msi:/* Skip INTx on ISP82xx. */
drivers/scsi/qla4xxx/ql4_mbx.c +0 -3
@@ -641,9 +641,6 @@ int qla4xxx_initialize_fw_cb(struct scsi_qla_host * ha)if (qla4xxx_get_ifcb (ha, &mbox_cmd[0 ], &mbox_sts[0 ], init_fw_cb_dma) !=QLA_SUCCESS ) { -dma_free_coherent (&ha->pdev->dev, -sizeof (struct addr_ctrl_blk ), - init_fw_cb, init_fw_cb_dma); goto exit_init_fw_cb; }
drivers/scsi/scsi_trace.c +33 -80
169 lines not on this page · raw message
drivers/target/target_core_fabric_lib.c +1 -1
@@ -131,7 +131,7 @@ static int srp_get_pr_transport_id(memset (buf +8 ,0 , leading_zero_bytes); rc =hex2bin (buf +8 + leading_zero_bytes, p, count);if (rc <0 ) { -pr_debug ("hex2bin failed for %s: %d\n" , __func__, rc); +pr_debug ("hex2bin failed for %s: %d\n" , p, rc);return rc; }
drivers/usb/core/hub.c +1 -0
@@ -1164,6 +1164,7 @@ static void hub_activate(struct usb_hub *hub, enum hub_activation_type type)* PORT_OVER_CURRENT is not. So check for any of them. */ if (udev || (portstatus &USB_PORT_STAT_CONNECTION ) || + (portchange &USB_PORT_STAT_C_CONNECTION ) || (portstatus &USB_PORT_STAT_OVERCURRENT ) || (portchange &USB_PORT_STAT_C_OVERCURRENT ))set_bit (port1, hub->change_bits);
drivers/usb/serial/ch341.c +5 -1
@@ -592,9 +592,13 @@ static int ch341_tiocmget(struct tty_struct *tty)static int ch341_reset_resume (struct usb_serial *serial) {struct usb_serial_port *port = serial->port[0 ]; -struct ch341_private *priv =usb_get_serial_port_data (port); +struct ch341_private *priv;int ret; + priv =usb_get_serial_port_data (port); +if (!priv) +return 0 ; +/* reconfigure ch341 serial port after bus-reset */ ch341_configure (serial->dev, priv);
drivers/usb/serial/io_edgeport.c +20 -13
@@ -652,6 +652,7 @@ static void edge_interrupt_callback(struct urb *urb)struct usb_serial_port *port;unsigned char *data = urb->transfer_buffer;int length = urb->actual_length; +unsigned long flags;int bytes_avail;int position;int txCredits;
@@ -683,7 +684,7 @@ static void edge_interrupt_callback(struct urb *urb)if (length >1 ) { bytes_avail = data[0 ] | (data[1 ] <<8 );if (bytes_avail) { -spin_lock (&edge_serial->es_lock); +spin_lock_irqsave (&edge_serial->es_lock, flags); edge_serial->rxBytesAvail += bytes_avail; dev_dbg(dev, "%s - bytes_avail=%d, rxBytesAvail=%d, read_in_progress=%d\n",
@@ -706,7 +707,8 @@ static void edge_interrupt_callback(struct urb *urb) edge_serial->read_in_progress = false; } } -spin_unlock (&edge_serial->es_lock); +spin_unlock_irqrestore (&edge_serial->es_lock, + flags); } }/* grab the txcredits for the ports if available */
@@ -718,10 +720,12 @@ static void edge_interrupt_callback(struct urb *urb)if (txCredits) { port = edge_serial->serial->port[portNumber]; edge_port =usb_get_serial_port_data (port); -if (edge_port->open) { -spin_lock (&edge_port->ep_lock); +if (edge_port && edge_port->open) { +spin_lock_irqsave (&edge_port->ep_lock, + flags); edge_port->txCredits += txCredits; -spin_unlock (&edge_port->ep_lock); +spin_unlock_irqrestore (&edge_port->ep_lock, + flags);dev_dbg (dev,"%s - txcredits for port%d = %d\n" , __func__, portNumber, edge_port->txCredits);
@@ -762,6 +766,7 @@ static void edge_bulk_in_callback(struct urb *urb)int retval;__u16 raw_data_length;int status = urb->status; +unsigned long flags;if (status) { dev_dbg(&urb->dev->dev, "%s - nonzero read bulk status received: %d\n",
@@ -781,7 +786,7 @@ static void edge_bulk_in_callback(struct urb *urb)usb_serial_debug_data (dev, __func__, raw_data_length, data); -spin_lock (&edge_serial->es_lock); +spin_lock_irqsave (&edge_serial->es_lock, flags);/* decrement our rxBytes available by the number that we just got */ edge_serial->rxBytesAvail -= raw_data_length;
@@ -805,7 +810,7 @@ static void edge_bulk_in_callback(struct urb *urb) edge_serial->read_in_progress = false; } -spin_unlock (&edge_serial->es_lock); +spin_unlock_irqrestore (&edge_serial->es_lock, flags); }
@@ -1733,7 +1738,8 @@ static void edge_break(struct tty_struct *tty, int break_state)static void process_rcvd_data (struct edgeport_serial *edge_serial,unsigned char *buffer,__u16 bufferLength) { -struct device *dev = &edge_serial->serial->dev->dev; +struct usb_serial *serial = edge_serial->serial; +struct device *dev = &serial->dev->dev;struct usb_serial_port *port;struct edgeport_port *edge_port;__u16 lastBufferLength;
@@ -1838,11 +1844,10 @@ static void process_rcvd_data(struct edgeport_serial *edge_serial,/* spit this data back into the tty driver if this port is open */ -if (rxLen) { - port = edge_serial->serial->port[ - edge_serial->rxPort]; +if (rxLen && edge_serial->rxPort < serial->num_ports) { + port = serial->port[edge_serial->rxPort]; edge_port =usb_get_serial_port_data (port); -if (edge_port->open) { +if (edge_port && edge_port->open) {dev_dbg (dev,"%s - Sending %d bytes to TTY for port %d\n" , __func__, rxLen, edge_serial->rxPort);
@@ -1850,8 +1855,8 @@ static void process_rcvd_data(struct edgeport_serial *edge_serial, rxLen); edge_port->port->icount.rx += rxLen; } - buffer += rxLen; } + buffer += rxLen;break ;case EXPECT_HDR3 :/* Expect 3rd byte of status header */
@@ -1886,6 +1891,8 @@ static void process_rcvd_status(struct edgeport_serial *edge_serial,__u8 code = edge_serial->rxStatusCode;/* switch the port pointer to the one being currently talked about */ +if (edge_serial->rxPort >= edge_serial->serial->num_ports) +return ; port = edge_serial->serial->port[edge_serial->rxPort]; edge_port =usb_get_serial_port_data (port);if (edge_port ==NULL ) {
drivers/usb/serial/keyspan.c +4 -0
@@ -1062,6 +1062,8 @@ static void usa49_glocont_callback(struct urb *urb)for (i =0 ; i < serial->num_ports; ++i) { port = serial->port[i]; p_priv =usb_get_serial_port_data (port); +if (!p_priv) +continue ;if (p_priv->resend_cont) {dev_dbg (&port->dev,"%s - sending setup\n" , __func__);
@@ -1463,6 +1465,8 @@ static void usa67_glocont_callback(struct urb *urb)for (i =0 ; i < serial->num_ports; ++i) { port = serial->port[i]; p_priv =usb_get_serial_port_data (port); +if (!p_priv) +continue ;if (p_priv->resend_cont) {dev_dbg (&port->dev,"%s - sending setup\n" , __func__);
drivers/usb/serial/opticon.c +1 -1
@@ -116,7 +116,7 @@ static int send_control_msg(struct usb_serial_port *port, u8 requesttype, retval =usb_control_msg (serial->dev,usb_sndctrlpipe (serial->dev,0 ), requesttype,USB_DIR_OUT |USB_TYPE_VENDOR |USB_RECIP_INTERFACE , -0 ,0 , buffer,1 ,0 ); +0 ,0 , buffer,1 ,USB_CTRL_SET_TIMEOUT );kfree (buffer);if (retval <0 )
drivers/usb/serial/option.c +6 -0
@@ -251,6 +251,7 @@ static void option_instat_callback(struct urb *urb);#define QUECTEL_PRODUCT_BG96 0x0296#define QUECTEL_PRODUCT_EP06 0x0306#define QUECTEL_PRODUCT_EM12 0x0512 +#define QUECTEL_PRODUCT_RM500Q 0x0800#define CMOTECH_VENDOR_ID 0x16d8#define CMOTECH_PRODUCT_6001 0x6001
@@ -1107,6 +1108,11 @@ static const struct usb_device_id option_ids[] = { { USB_DEVICE_AND_INTERFACE_INFO(QUECTEL_VENDOR_ID, QUECTEL_PRODUCT_EM12, 0xff, 0xff, 0xff), .driver_info = RSVD(1) | RSVD(2) | RSVD(3) | RSVD(4) | NUMEP2 }, { USB_DEVICE_AND_INTERFACE_INFO(QUECTEL_VENDOR_ID, QUECTEL_PRODUCT_EM12, 0xff, 0, 0) }, + { USB_DEVICE_AND_INTERFACE_INFO(QUECTEL_VENDOR_ID, QUECTEL_PRODUCT_RM500Q, 0xff, 0xff, 0x30) }, + { USB_DEVICE_AND_INTERFACE_INFO(QUECTEL_VENDOR_ID, QUECTEL_PRODUCT_RM500Q, 0xff, 0, 0) }, + { USB_DEVICE_AND_INTERFACE_INFO(QUECTEL_VENDOR_ID, QUECTEL_PRODUCT_RM500Q, 0xff, 0xff, 0x10), + .driver_info = ZLP }, + { USB_DEVICE(CMOTECH_VENDOR_ID, CMOTECH_PRODUCT_6001) }, { USB_DEVICE(CMOTECH_VENDOR_ID, CMOTECH_PRODUCT_CMU_300) }, { USB_DEVICE(CMOTECH_VENDOR_ID, CMOTECH_PRODUCT_6003),
drivers/usb/serial/quatech2.c +6 -0
@@ -867,7 +867,10 @@ static void qt2_update_msr(struct usb_serial_port *port, unsigned char *ch)u8 newMSR = (u8) *ch;unsigned long flags; +/* May be called from qt2_process_read_urb() for an unbound port. */ port_priv =usb_get_serial_port_data (port); +if (!port_priv) +return ;spin_lock_irqsave (&port_priv->lock, flags); port_priv->shadowMSR = newMSR;
@@ -895,7 +898,10 @@ static void qt2_update_lsr(struct usb_serial_port *port, unsigned char *ch)unsigned long flags;u8 newLSR = (u8) *ch; +/* May be called from qt2_process_read_urb() for an unbound port. */ port_priv =usb_get_serial_port_data (port); +if (!port_priv) +return ;if (newLSR &UART_LSR_BI ) newLSR &= (u8) (UART_LSR_OE |UART_LSR_BI );
drivers/usb/serial/usb-serial-simple.c +2 -0
@@ -89,6 +89,8 @@ DEVICE(moto_modem, MOTO_IDS);#define MOTOROLA_TETRA_IDS () \ { USB_DEVICE(0x0cad, 0x9011) },/* Motorola Solutions TETRA PEI */ \ { USB_DEVICE(0x0cad, 0x9012) }, /* MTP6550 */ \ + { USB_DEVICE(0x0cad, 0x9013) }, /* MTP3xxx */ \ + { USB_DEVICE(0x0cad, 0x9015) }, /* MTP85xx */ \ { USB_DEVICE(0x0cad, 0x9016) } /* TPG2200 */DEVICE (motorola_tetra,MOTOROLA_TETRA_IDS );
drivers/usb/serial/usb-serial.c +3 -0
@@ -1332,6 +1332,9 @@ static int usb_serial_register(struct usb_serial_driver *driver)return -EINVAL ; } +/* Prevent individual ports from being unbound. */ + driver->driver.suppress_bind_attrs = true; +usb_serial_operations_init (driver);/* Add this device to our list of devices */
firmware/Makefile +1 -1
@@ -19,7 +19,7 @@ quiet_cmd_fwbin = MK_FW $@ PROGBITS=$(if $(CONFIG_ARM),%,@)progbits; \ echo "/* Generated by firmware/Makefile */" > $@;\ echo " .section .rodata" >>$@;\ - echo " .p2align $${ASM_ALIGN}" >>$@;\ + echo " .p2align 4" >>$@;\ echo "_fw_$${FWSTR}_bin:" >>$@;\ echo " .incbin \"$(2)\"" >>$@;\ echo "_fw_end:" >>$@;\
fs/btrfs/qgroup.c +5 -1
@@ -1928,8 +1928,12 @@ btrfs_qgroup_account_extent(struct btrfs_trans_handle *trans,u64 nr_old_roots =0 ;int ret =0 ; +/* +* If quotas get disabled meanwhile, the resouces need to be freed and +* we can't just exit here. +*/ if (!test_bit (BTRFS_FS_QUOTA_ENABLED , &fs_info->flags)) -return 0 ; + goto out_free;if (new_roots) {if (!maybe_fs_roots (new_roots))
fs/reiserfs/xattr.c +6 -2
@@ -319,8 +319,12 @@ static int reiserfs_for_each_xattr(struct inode *inode, out_dir:dput (dir); out: -/* -ENODATA isn't an error */ -if (err == -ENODATA ) +/* +* -ENODATA: this object doesn't have any xattrs +* -EOPNOTSUPP: this file system doesn't have xattrs enabled on disk. +* Neither are errors +*/ +if (err == -ENODATA || err == -EOPNOTSUPP ) err =0 ;return err; }
include/dt-bindings/reset/amlogic,meson8b-reset.h +3 -3
@@ -95,9 +95,9 @@#define RESET_VD_RMEM 64#define RESET_AUDIN 65#define RESET_DBLK 66 -#define RESET_PIC_DC 66 -#define RESET_PSC 66 -#define RESET_NAND 66 +#define RESET_PIC_DC 67 +#define RESET_PSC 68 +#define RESET_NAND 69#define RESET_GE2D 70#define RESET_PARSER_REG 71#define RESET_PARSER_FETCH 72
include/linux/blkdev.h +4 -4
@@ -343,6 +343,7 @@ struct queue_limits {unsigned int max_sectors;unsigned int max_segment_size;unsigned int physical_block_size; +unsigned int logical_block_size;unsigned int alignment_offset;unsigned int io_min;unsigned int io_opt;
@@ -353,7 +354,6 @@ struct queue_limits {unsigned int discard_granularity;unsigned int discard_alignment; -unsigned short logical_block_size;unsigned short max_segments;unsigned short max_integrity_segments;unsigned short max_discard_segments;
@@ -1178,7 +1178,7 @@ extern void blk_queue_max_write_same_sectors(struct request_queue *q, unsigned int max_write_same_sectors);extern void blk_queue_max_write_zeroes_sectors (struct request_queue *q,unsigned int max_write_same_sectors); -extern void blk_queue_logical_block_size (struct request_queue *,unsigned short ); +extern void blk_queue_logical_block_size (struct request_queue *,unsigned int );extern void blk_queue_physical_block_size (struct request_queue *,unsigned int );extern void blk_queue_alignment_offset (struct request_queue *q,unsigned int alignment);
@@ -1436,7 +1436,7 @@ static inline unsigned int queue_max_segment_size(struct request_queue *q)return q->limits.max_segment_size; } -static inline unsigned short queue_logical_block_size (struct request_queue *q) +static inline unsigned queue_logical_block_size (struct request_queue *q) {int retval =512 ;
@@ -1446,7 +1446,7 @@ static inline unsigned short queue_logical_block_size(struct request_queue *q)return retval; } -static inline unsigned short bdev_logical_block_size (struct block_device *bdev) +static inline unsigned int bdev_logical_block_size (struct block_device *bdev) {return queue_logical_block_size (bdev_get_queue (bdev)); }
include/linux/regulator/ab8500.h +0 -2
@@ -43,8 +43,6 @@ enum ab8505_regulator_id {AB8505_LDO_ANAMIC2 ,AB8505_LDO_AUX8 ,AB8505_LDO_ANA , -AB8505_SYSCLKREQ_2 , -AB8505_SYSCLKREQ_4 , AB8505_NUM_REGULATORS, };
kernel/ptrace.c +10 -5
@@ -258,12 +258,17 @@ static int ptrace_check_attach(struct task_struct *child, bool ignore_state)return ret; } -static int ptrace_has_cap (struct user_namespace *ns,unsigned int mode) +static bool ptrace_has_cap (const struct cred *cred,struct user_namespace *ns, +unsigned int mode) { +int ret; +if (mode &PTRACE_MODE_NOAUDIT ) -return has_ns_capability_noaudit (current, ns,CAP_SYS_PTRACE ); + ret =security_capable (cred, ns,CAP_SYS_PTRACE );else -return has_ns_capability (current, ns,CAP_SYS_PTRACE ); + ret =security_capable (cred, ns,CAP_SYS_PTRACE ); + +return ret ==0 ; }/* Returns 0 on success, -errno on denial. */
@@ -315,7 +320,7 @@ static int __ptrace_may_access(struct task_struct *task, unsigned int mode) gid_eq(caller_gid, tcred->sgid) && gid_eq(caller_gid, tcred->gid)) goto ok; -if (ptrace_has_cap (tcred->user_ns, mode)) +if (ptrace_has_cap (cred, tcred->user_ns, mode)) goto ok;rcu_read_unlock ();return -EPERM ;
@@ -334,7 +339,7 @@ static int __ptrace_may_access(struct task_struct *task, unsigned int mode) mm = task->mm;if (mm && ((get_dumpable (mm) !=SUID_DUMP_USER ) && - !ptrace_has_cap (mm->user_ns, mode))) + !ptrace_has_cap (cred, mm->user_ns, mode)))return -EPERM ;return security_ptrace_access_check (task, mode);
kernel/time/tick-sched.c +9 -5
@@ -60,8 +60,9 @@ static void tick_do_update_jiffies64(ktime_t now)/* * Do a quick check without holding jiffies_lock: +* The READ_ONCE() pairs with two updates done later in this function. */ - delta =ktime_sub (now, last_jiffies_update); + delta =ktime_sub (now,READ_ONCE (last_jiffies_update));if (delta < tick_period)return ;
@@ -72,8 +73,9 @@ static void tick_do_update_jiffies64(ktime_t now)if (delta >= tick_period) { delta =ktime_sub (delta, tick_period); - last_jiffies_update =ktime_add (last_jiffies_update, - tick_period); +/* Pairs with the lockless read in this function. */ +WRITE_ONCE (last_jiffies_update, +ktime_add (last_jiffies_update, tick_period));/* Slow path for long timeouts */ if (unlikely (delta >= tick_period)) {
@@ -81,8 +83,10 @@ static void tick_do_update_jiffies64(ktime_t now) ticks =ktime_divns (delta, incr); - last_jiffies_update =ktime_add_ns (last_jiffies_update, - incr * ticks); +/* Pairs with the lockless read in this function. */ +WRITE_ONCE (last_jiffies_update, +ktime_add_ns (last_jiffies_update, + incr * ticks)); }do_timer (++ticks);
mm/huge_memory.c +24 -14
@@ -502,13 +502,13 @@ void prep_transhuge_page(struct page *page)set_compound_page_dtor (page,TRANSHUGE_PAGE_DTOR ); } -unsigned long __thp_get_unmapped_area (struct file *filp,unsigned long len, +static unsigned long __thp_get_unmapped_area (struct file *filp, +unsigned long addr,unsigned long len,loff_t off,unsigned long flags,unsigned long size) { -unsigned long addr;loff_t off_end = off + len;loff_t off_align =round_up (off, size); -unsigned long len_pad; +unsigned long len_pad, ret;if (off_end <= off_align || (off_end - off_align) < size)return 0 ;
@@ -517,30 +517,40 @@ unsigned long __thp_get_unmapped_area(struct file *filp, unsigned long len,if (len_pad < len || (off + len_pad) < off)return 0 ; - addr = current->mm->get_unmapped_area (filp,0 , len_pad, + ret = current->mm->get_unmapped_area (filp, addr, len_pad, off >>PAGE_SHIFT , flags); -if (IS_ERR_VALUE (addr)) + +/* +* The failure might be due to length padding. The caller will retry +* without the padding. +*/ +if (IS_ERR_VALUE (ret))return 0 ; - addr += (off - addr) & (size -1 ); -return addr; +/* +* Do not try to align to THP boundary if allocation at the address +* hint succeeds. +*/ +if (ret == addr) +return addr; + + ret += (off - ret) & (size -1 ); +return ret; }unsigned long thp_get_unmapped_area (struct file *filp,unsigned long addr,unsigned long len,unsigned long pgoff,unsigned long flags) { +unsigned long ret;loff_t off = (loff_t )pgoff <<PAGE_SHIFT ; -if (addr) - goto out;if (!IS_DAX (filp->f_mapping->host) || !IS_ENABLED (CONFIG_FS_DAX_PMD )) goto out; - addr =__thp_get_unmapped_area (filp, len, off, flags,PMD_SIZE ); -if (addr) -return addr; - - out: + ret =__thp_get_unmapped_area (filp, addr, len, off, flags,PMD_SIZE ); +if (ret) +return ret; +out:return current->mm->get_unmapped_area (filp, addr, len, pgoff, flags); }EXPORT_SYMBOL_GPL (thp_get_unmapped_area);
mm/page-writeback.c +2 -2
@@ -201,11 +201,11 @@ static void wb_min_max_ratio(struct bdi_writeback *wb,if (this_bw < tot_bw) {if (min) { min *= this_bw; -do_div (min, tot_bw); + min =div64_ul (min, tot_bw); }if (max <100 ) { max *= this_bw; -do_div (max, tot_bw); + max =div64_ul (max, tot_bw); } }
mm/shmem.c +4 -3
@@ -2052,9 +2052,10 @@ unsigned long shmem_get_unmapped_area(struct file *file,/* * Our priority is to support MAP_SHARED mapped hugely; * and support MAP_PRIVATE mapped hugely too, until it is COWed. -* But if caller specified an address hint, respect that as before. +* But if caller specified an address hint and we allocated area there +* successfully, respect that as before. */ -if (uaddr) +if (uaddr == addr)return addr;if (shmem_huge !=SHMEM_HUGE_FORCE ) {
@@ -2088,7 +2089,7 @@ unsigned long shmem_get_unmapped_area(struct file *file,if (inflated_len < len)return addr; - inflated_addr =get_area (NULL ,0 , inflated_len,0 , flags); + inflated_addr =get_area (NULL , uaddr, inflated_len,0 , flags);if (IS_ERR_VALUE (inflated_addr))return addr;if (inflated_addr & ~PAGE_MASK )
net/batman-adv/distributed-arp-table.c +3 -1
@@ -243,6 +243,7 @@ static u32 batadv_hash_dat(const void *data, u32 size)u32 hash =0 ;const struct batadv_dat_entry *dat = data;const unsigned char *key; +__be16 vid;u32 i; key = (const unsigned char *)&dat->ip;
@@ -252,7 +253,8 @@ static u32 batadv_hash_dat(const void *data, u32 size) hash ^= (hash >>6 ); } - key = (const unsigned char *)&dat->vid; + vid =htons (dat->vid); + key = (__force const unsigned char *)&vid;for (i =0 ; i <sizeof (dat->vid); i++) { hash += key[i]; hash += (hash <<10 );
net/dsa/tag_qca.c +0 -3
@@ -41,9 +41,6 @@ static struct sk_buff *qca_tag_xmit(struct sk_buff *skb, struct net_device *dev)struct dsa_slave_priv *p =netdev_priv (dev);u16 *phdr, hdr; - dev->stats.tx_packets++; - dev->stats.tx_bytes += skb->len; -if (skb_cow_head (skb,0 ) <0 )return NULL ;
net/ipv4/netfilter/arp_tables.c +10 -9
@@ -506,12 +506,13 @@ static inline int check_entry_size_and_hooks(struct arpt_entry *e,return 0 ; } -static inline void cleanup_entry (struct arpt_entry *e) +static void cleanup_entry (struct arpt_entry *e,struct net *net) {struct xt_tgdtor_param par;struct xt_entry_target *t; t =arpt_get_target (e); + par.net = net; par.target = t->u.kernel.target; par.targinfo = t->data; par.family =NFPROTO_ARP ;
@@ -601,7 +602,7 @@ static int translate_table(struct net *net, xt_entry_foreach(iter, entry0, newinfo->size) {if (i-- ==0 )break ; -cleanup_entry (iter); +cleanup_entry (iter, net); }return ret; }
@@ -926,7 +927,7 @@ static int __do_replace(struct net *net, const char *name,/* Decrease module usage counts and free resource */ loc_cpu_old_entry = oldinfo->entries; xt_entry_foreach(iter, loc_cpu_old_entry, oldinfo->size) -cleanup_entry (iter); +cleanup_entry (iter, net);xt_free_table_info (oldinfo); if (copy_to_user(counters_ptr, counters,
@@ -990,7 +991,7 @@ static int do_replace(struct net *net, const void __user *user, free_newinfo_untrans: xt_entry_foreach(iter, loc_cpu_entry, newinfo->size) -cleanup_entry (iter); +cleanup_entry (iter, net); free_newinfo:xt_free_table_info (newinfo);return ret;
@@ -1287,7 +1288,7 @@ static int compat_do_replace(struct net *net, void __user *user, free_newinfo_untrans: xt_entry_foreach(iter, loc_cpu_entry, newinfo->size) -cleanup_entry (iter); +cleanup_entry (iter, net); free_newinfo:xt_free_table_info (newinfo);return ret;
@@ -1514,7 +1515,7 @@ static int do_arpt_get_ctl(struct sock *sk, int cmd, void __user *user, int *lenreturn ret; } -static void __arpt_unregister_table (struct xt_table *table) +static void __arpt_unregister_table (struct net *net,struct xt_table *table) {struct xt_table_info *private;void *loc_cpu_entry;
@@ -1526,7 +1527,7 @@ static void __arpt_unregister_table(struct xt_table *table)/* Decrease module usage counts and free resources */ loc_cpu_entry = private->entries; xt_entry_foreach(iter, loc_cpu_entry, private->size) -cleanup_entry (iter); +cleanup_entry (iter, net);if (private->number > private->initial_entries)module_put (table_owner);xt_free_table_info (private);
@@ -1566,7 +1567,7 @@ int arpt_register_table(struct net *net, ret =nf_register_net_hooks (net, ops,hweight32 (table->valid_hooks));if (ret !=0 ) { -__arpt_unregister_table (new_table); +__arpt_unregister_table (net, new_table); *res =NULL ; }
@@ -1581,7 +1582,7 @@ void arpt_unregister_table(struct net *net, struct xt_table *table, const struct nf_hook_ops *ops) {nf_unregister_net_hooks (net, ops,hweight32 (table->valid_hooks)); -__arpt_unregister_table (table); +__arpt_unregister_table (net, table); }/* The built-in targets: standard (NULL) and error. */
net/ipv4/tcp_input.c +4 -3
@@ -932,9 +932,10 @@ static void tcp_update_reordering(struct sock *sk, const int metric,/* This must be called before lost_out is incremented */ static void tcp_verify_retransmit_hint (struct tcp_sock *tp,struct sk_buff *skb) { -if (!tp->retransmit_skb_hint || -before (TCP_SKB_CB (skb)->seq, -TCP_SKB_CB (tp->retransmit_skb_hint)->seq)) +if ((!tp->retransmit_skb_hint && tp->retrans_out >= tp->lost_out) || + (tp->retransmit_skb_hint && +before (TCP_SKB_CB (skb)->seq, +TCP_SKB_CB (tp->retransmit_skb_hint)->seq))) tp->retransmit_skb_hint = skb; }
net/netfilter/ipset/ip_set_bitmap_gen.h +1 -1
@@ -64,9 +64,9 @@ mtype_destroy(struct ip_set *set)if (SET_WITH_TIMEOUT (set))del_timer_sync (&map->gc); -ip_set_free (map->members);if (set->dsize && set->extensions &IPSET_EXT_DESTROY )mtype_ext_cleanup (set); +ip_set_free (map->members);ip_set_free (map); set->data =NULL ;
net/wireless/rdev-ops.h +4 -0
@@ -537,6 +537,10 @@ static inline int rdev_set_wiphy_params(struct cfg80211_registered_device *rdev, u32 changed) { int ret; + +if (!rdev->ops->set_wiphy_params) +return -EOPNOTSUPP ; +trace_rdev_set_wiphy_params (&rdev->wiphy, changed); ret = rdev->ops->set_wiphy_params (&rdev->wiphy, changed);trace_rdev_return_int (&rdev->wiphy, ret);
net/wireless/util.c +1 -1
@@ -652,7 +652,7 @@ __frame_add_frag(struct sk_buff *skb, struct page *page,struct skb_shared_info *sh =skb_shinfo (skb);int page_offset; -page_ref_inc (page); +get_page (page); page_offset = ptr -page_address (page);skb_add_rx_frag (skb, sh->nr_frags, page, page_offset, len, size); }
sound/core/seq/seq_timer.c +9 -5
@@ -479,15 +479,19 @@ void snd_seq_info_timer_read(struct snd_info_entry *entry, q =queueptr (idx);if (q ==NULL )continue ; -if ((tmr = q->timer) ==NULL || - (ti = tmr->timeri) ==NULL ) { -queuefree (q); -continue ; - } +mutex_lock (&q->timer_mutex); + tmr = q->timer; +if (!tmr) + goto unlock; + ti = tmr->timeri; +if (!ti) + goto unlock;snd_iprintf (buffer,"Timer for queue %i : %s\n" , q->queue, ti->timer->name); resolution =snd_timer_resolution (ti) * tmr->ticks;snd_iprintf (buffer," Period time : %lu.%09lu\n" , resolution /1000000000 , resolution %1000000000 );snd_iprintf (buffer," Skew : %u / %u\n" , tmr->skew, tmr->skew_base); +unlock: +mutex_unlock (&q->timer_mutex);queuefree (q); } }
sound/soc/codecs/msm8916-wcd-analog.c +2 -2
@@ -876,10 +876,10 @@ static const struct snd_soc_dapm_widget pm8916_wcd_analog_dapm_widgets[] = {SND_SOC_DAPM_SUPPLY ("MIC BIAS External1" ,CDC_A_MICB_1_EN ,7 ,0 , pm8916_wcd_analog_enable_micbias_ext1, -SND_SOC_DAPM_PRE_PMU |SND_SOC_DAPM_POST_PMD ), +SND_SOC_DAPM_POST_PMU ),SND_SOC_DAPM_SUPPLY ("MIC BIAS External2" ,CDC_A_MICB_2_EN ,7 ,0 , pm8916_wcd_analog_enable_micbias_ext2, -SND_SOC_DAPM_POST_PMU |SND_SOC_DAPM_POST_PMD ), +SND_SOC_DAPM_POST_PMU ), SND_SOC_DAPM_ADC_E("ADC1", NULL, CDC_A_TX_1_EN, 7, 0, pm8916_wcd_analog_enable_adc,
tools/perf/builtin-report.c +4 -1
@@ -742,6 +742,7 @@ int cmd_report(int argc, const char **argv)struct stat st;bool has_br_stack = false;int branch_mode =-1 ; +int last_key =0 ;bool branch_call_mode = false;char callchain_default_opt[] =CALLCHAIN_DEFAULT_OPT ;const char *const report_usage[] = {
@@ -1048,7 +1049,8 @@ int cmd_report(int argc, const char **argv)else use_browser =0 ; -if (setup_sorting (session->evlist) <0 ) { +if ((last_key !=K_SWITCH_INPUT_DATA ) && + (setup_sorting (session->evlist) <0 )) {if (sort_order)parse_options_usage (report_usage, options,"s" ,1 );if (field_order)
@@ -1108,6 +1110,7 @@ int cmd_report(int argc, const char **argv) ret =__cmd_report (&report);if (ret ==K_SWITCH_INPUT_DATA ) {perf_session__delete (session); + last_key =K_SWITCH_INPUT_DATA ; goto repeat; }else ret =0 ;
tools/perf/util/hist.h +2 -2
@@ -317,10 +317,10 @@ static inline void perf_hpp__prepend_sort_field(struct perf_hpp_fmt *format) list_for_each_entry_safe(format, tmp, &(_list)->sorts, sort_list)#define hists__for_each_format (hists, format) \ - perf_hpp_list__for_each_format((hists)->hpp_list, fmt) + perf_hpp_list__for_each_format((hists)->hpp_list, format)#define hists__for_each_sort_list (hists, format) \ - perf_hpp_list__for_each_sort_list((hists)->hpp_list, fmt) + perf_hpp_list__for_each_sort_list((hists)->hpp_list, format)extern struct perf_hpp_fmt perf_hpp__format[];
tools/perf/util/probe-finder.c +10 -22
@@ -615,38 +615,26 @@ static int convert_to_trace_point(Dwarf_Die *sp_die, Dwfl_Module *mod,const char *function, struct probe_trace_point *tp) { - Dwarf_Addr eaddr, highaddr; + Dwarf_Addr eaddr;GElf_Sym sym;const char *symbol;/* Verify the address is correct */ -if (dwarf_entrypc (sp_die, &eaddr) !=0 ) { -pr_warning ("Failed to get entry address of %s\n" , -dwarf_diename (sp_die)); -return -ENOENT ; - } -if (dwarf_highpc (sp_die, &highaddr) !=0 ) { -pr_warning ("Failed to get end address of %s\n" , -dwarf_diename (sp_die)); -return -ENOENT ; - } -if (paddr > highaddr) { -pr_warning ("Offset specified is greater than size of %s\n" , +if (!dwarf_haspc (sp_die, paddr)) { +pr_warning ("Specified offset is out of %s\n" ,dwarf_diename (sp_die));return -EINVAL ; } - symbol =dwarf_diename (sp_die); +/* Try to get actual symbol name from symtab */ + symbol =dwfl_module_addrsym (mod, paddr, &sym,NULL );if (!symbol) { -/* Try to get the symbol name from symtab */ - symbol =dwfl_module_addrsym (mod, paddr, &sym,NULL ); -if (!symbol) { -pr_warning ("Failed to find symbol at 0x%lx\n" , - (unsigned long )paddr); -return -ENOENT ; - } - eaddr = sym.st_value; +pr_warning ("Failed to find symbol at 0x%lx\n" , + (unsigned long )paddr); +return -ENOENT ; } + eaddr = sym.st_value; + tp->offset = (unsigned long )(paddr - eaddr); tp->address = (unsigned long )paddr; tp->symbol =strdup (symbol);