Linux 4.14.8
Greg KH
maintainerI'm announcing the release of the 4.14.8 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:
http://git.kernel.org/?p=linux/kernel/git/stable/linux-stable.git;a=summary
thanks,
greg k-h
------------
Makefile | 2 arch/arm64/Makefile | 8 +- arch/arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dts | 1 arch/arm64/include/asm/pgtable.h | 33 ++++---- arch/arm64/mm/dump.c | 2 arch/arm64/mm/init.c | 3 arch/blackfin/Kconfig | 7 + arch/blackfin/Kconfig.debug | 1 arch/powerpc/perf/hv-24x7.c | 2 arch/powerpc/platforms/powernv/opal-async.c | 6 - arch/powerpc/platforms/powernv/setup.c | 2 arch/powerpc/platforms/pseries/vio.c | 2 arch/powerpc/sysdev/ipic.c | 4 - arch/powerpc/xmon/xmon.c | 5 + arch/s390/kernel/compat_linux.c | 1 arch/x86/boot/compressed/Makefile | 1 arch/x86/boot/compressed/head_64.S | 16 +++- arch/x86/boot/compressed/misc.c | 16 ++++ arch/x86/boot/compressed/pgtable_64.c | 28 +++++++ arch/x86/crypto/salsa20_glue.c | 7 - arch/x86/kvm/vmx.c | 5 - block/badblocks.c | 2 block/blk-mq-sched.c | 12 +-- crypto/af_alg.c | 13 +-- crypto/algif_aead.c | 2 crypto/hmac.c | 6 + crypto/rsa_helper.c | 2 crypto/salsa20_generic.c | 7 - crypto/shash.c | 5 - crypto/tcrypt.c | 6 + drivers/block/null_blk.c | 4 - drivers/bluetooth/btusb.c | 1 drivers/bluetooth/hci_ldisc.c | 4 - drivers/bus/arm-ccn.c | 1 drivers/char/ipmi/ipmi_si_intf.c | 1 drivers/clk/hisilicon/clk-hi6220.c | 2 drivers/clk/imx/clk-imx6q.c | 2 drivers/clk/imx/clk-imx7d.c | 2 drivers/clk/mediatek/clk-mtk.h | 1 drivers/clk/mediatek/clk-pll.c | 5 + drivers/clk/tegra/clk-tegra210.c | 4 - drivers/clk/tegra/clk-tegra30.c | 2 drivers/dax/device.c | 3 drivers/dma/dmatest.c | 55 +++++++------- drivers/dma/ti-dma-crossbar.c | 8 +- drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c | 3 drivers/hid/hid-cp2112.c | 8 +- drivers/infiniband/core/addr.c | 2 drivers/infiniband/core/cma.c | 11 +- drivers/infiniband/core/security.c | 7 + drivers/infiniband/core/uverbs_cmd.c | 6 + drivers/infiniband/hw/cxgb4/cq.c | 5 + drivers/infiniband/hw/cxgb4/qp.c | 14 +++ drivers/infiniband/hw/cxgb4/t4.h | 2 drivers/infiniband/hw/hfi1/chip.c | 2 drivers/infiniband/hw/hfi1/trace.c | 4 - drivers/infiniband/hw/mlx4/qp.c | 16 ++-- drivers/infiniband/ulp/ipoib/ipoib_ib.c | 7 + drivers/iommu/amd_iommu.c | 2 drivers/iommu/mtk_iommu_v1.c | 2 drivers/lightnvm/pblk-core.c | 8 +- drivers/lightnvm/pblk-gc.c | 9 +- drivers/lightnvm/pblk-init.c | 21 +++-- drivers/lightnvm/pblk-read.c | 9 +- drivers/lightnvm/pblk.h | 2 drivers/md/bcache/request.c | 6 + drivers/md/bcache/super.c | 6 + drivers/md/dm-cache-target.c | 12 +-- drivers/md/dm-mpath.c | 18 ++-- drivers/md/dm-snap.c | 48 ++++++------ drivers/md/dm-thin.c | 22 ++--- drivers/md/raid1.c | 10 +- drivers/md/raid5-ppl.c | 3 drivers/md/raid5.c | 5 + drivers/media/platform/qcom/camss-8x16/camss-vfe.c | 3 drivers/media/usb/usbtv/usbtv-video.c | 4 - drivers/mfd/fsl-imx25-tsadc.c | 14 +++ drivers/mfd/mxs-lradc.c | 6 + drivers/misc/eeprom/at24.c | 2 drivers/misc/pci_endpoint_test.c | 4 + drivers/mmc/core/card.h | 2 drivers/mmc/core/quirks.h | 8 ++ drivers/mtd/spi-nor/stm32-quadspi.c | 4 - drivers/net/dsa/lan9303-core.c | 2 drivers/net/ethernet/cavium/liquidio/lio_vf_main.c | 6 - drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c | 12 ++- drivers/net/ethernet/hisilicon/hns3/hns3pf/hns3_enet.c | 15 +-- drivers/net/ethernet/hisilicon/hns3/hns3pf/hns3_ethtool.c | 3 drivers/net/ethernet/mellanox/mlxsw/spectrum.c | 1 drivers/net/ethernet/sfc/ef10.c | 2 drivers/net/macvlan.c | 2 drivers/net/ppp/ppp_generic.c | 1 drivers/net/wireless/ath/ath10k/pci.c | 29 +++---- drivers/net/wireless/ath/ath9k/tx99.c | 5 + drivers/net/wireless/quantenna/qtnfmac/pearl/pcie.c | 2 drivers/nvme/host/core.c | 3 drivers/pci/pcie/pme.c | 5 + drivers/pci/probe.c | 7 + drivers/pci/remove.c | 2 drivers/pinctrl/Kconfig | 3 drivers/platform/x86/hp_accel.c | 1 drivers/platform/x86/intel_punit_ipc.c | 8 +- drivers/rpmsg/qcom_glink_native.c | 1 drivers/rtc/rtc-pcf8563.c | 2 drivers/scsi/aacraid/commsup.c | 26 +++--- drivers/scsi/bfa/bfad_debugfs.c | 5 - drivers/scsi/hisi_sas/hisi_sas_main.c | 9 +- drivers/scsi/hpsa.c | 6 - drivers/scsi/libsas/sas_expander.c | 10 +- drivers/scsi/scsi_debug.c | 6 - drivers/scsi/scsi_debugfs.c | 6 + drivers/scsi/scsi_devinfo.c | 2 drivers/scsi/sd.c | 16 +++- drivers/soc/mediatek/mtk-pmic-wrap.c | 2 drivers/staging/rtl8188eu/core/rtw_ap.c | 2 drivers/staging/rtl8188eu/core/rtw_cmd.c | 4 - drivers/staging/vt6655/device_main.c | 3 drivers/target/iscsi/iscsi_target.c | 3 drivers/target/iscsi/iscsi_target_configfs.c | 3 drivers/target/iscsi/iscsi_target_util.c | 4 + drivers/target/target_core_file.c | 4 + drivers/target/target_core_pr.c | 4 - drivers/thermal/step_wise.c | 11 +- drivers/thunderbolt/tb.c | 1 drivers/tty/serdev/serdev-ttyport.c | 14 ++- drivers/usb/core/config.c | 4 - drivers/usb/host/xhci-mem.c | 15 ++- drivers/usb/host/xhci-ring.c | 6 - drivers/usb/musb/da8xx.c | 10 ++ drivers/usb/storage/unusual_devs.h | 7 + drivers/usb/storage/unusual_uas.h | 7 + drivers/usb/usbip/stub_rx.c | 51 ++++++++++-- drivers/usb/usbip/stub_tx.c | 7 + drivers/usb/usbip/usbip_common.h | 1 drivers/usb/usbip/vhci_sysfs.c | 25 ++++-- drivers/video/fbdev/au1200fb.c | 7 + drivers/video/fbdev/controlfb.h | 2 drivers/video/fbdev/udlfb.c | 10 +- fs/autofs4/waitq.c | 1 fs/btrfs/ioctl.c | 7 + fs/btrfs/super.c | 4 - fs/btrfs/tests/free-space-tree-tests.c | 3 fs/btrfs/volumes.c | 7 + fs/ceph/mds_client.c | 42 +++++++++- fs/cifs/smb2pdu.c | 30 +++---- fs/exec.c | 7 - fs/ext4/extents.c | 1 fs/ext4/ialloc.c | 2 fs/ext4/inode.c | 9 ++ fs/ext4/namei.c | 4 + fs/gfs2/file.c | 4 - fs/nfs/write.c | 2 fs/nfsd/auth.c | 3 fs/overlayfs/namei.c | 2 fs/overlayfs/readdir.c | 5 + fs/proc/proc_tty.c | 3 fs/udf/super.c | 2 fs/xfs/libxfs/xfs_bmap.c | 2 fs/xfs/xfs_icache.c | 2 fs/xfs/xfs_iops.c | 36 +++++---- fs/xfs/xfs_log_recover.c | 2 include/crypto/internal/hash.h | 8 ++ include/linux/cred.h | 1 include/linux/mman.h | 3 include/linux/oom.h | 9 ++ include/linux/sched/coredump.h | 1 include/linux/string.h | 5 + include/rdma/ib_addr.h | 11 +- include/rdma/ib_pack.h | 19 ++-- kernel/groups.c | 5 - kernel/power/suspend.c | 2 kernel/sched/rt.c | 8 +- kernel/time/posix-timers.c | 29 ++++--- kernel/trace/trace.c | 29 ++----- kernel/uid16.c | 1 mm/mmap.c | 10 +- mm/oom_kill.c | 4 - net/ipv4/icmp.c | 15 +++ net/ipv4/route.c | 2 net/l2tp/l2tp_core.c | 2 net/l2tp/l2tp_netlink.c | 2 net/netfilter/ipvs/ip_vs_ctl.c | 4 + net/sunrpc/auth_gss/gss_rpc_xdr.c | 1 net/sunrpc/auth_gss/svcauth_gss.c | 1 net/sunrpc/svcauth_unix.c | 2 net/sunrpc/xprt.c | 28 ++++--- net/sunrpc/xprtrdma/transport.c | 2 samples/bpf/xdp1_user.c | 8 ++ sound/soc/intel/skylake/skl-sst-utils.c | 15 ++- sound/soc/sh/rcar/ssi.c | 11 ++ tools/usb/usbip/libsrc/vhci_driver.c | 8 +- 191 files changed, 959 insertions(+), 491 deletions(-)
Adam Sampson (1):
media: usbtv: fix brightness and contrast controls
Adam Wallis (1):
dmaengine: dmatest: move callback wait queue to thread context
Adriana Reus (1):
clk: imx: imx7d: Fix parent clock for OCRAM_CLK
Alan Stern (1):
USB: core: prevent malicious bNumInterfaces overflow
Alex Vesker (1):
IB/ipoib: Grab rtnl lock on heavy flush when calling ndo_open/stop
Alex Williamson (1):
PCI: Detach driver before procfs & sysfs teardown on device remove
Alexander Duyck (1):
macvlan: Only deliver one copy of the frame to the macvlan interface
Alexey Khoroshilov (1):
mfd: mxs-lradc: Fix error handling in mxs_lradc_probe()
Amir Goldstein (1):
ovl: update ctx->pos on impure dir iteration
Anand Jain (2):
btrfs: fix false EIO for missing device
btrfs: undo writable superblocke when sprouting fails
Andi Kleen (1):
ext4: support fast symlinks from ext3 file systems
Arnd Bergmann (2):
string.h: workaround for increased stack usage
scsi: aacraid: use timespec64 instead of timeval
Artur Paszkiewicz (1):
raid5-ppl: check recovery_offset when performing ppl recovery
Arun Kumar Neelakantam (1):
rpmsg: glink: Initialize the "intent_req_comp" completion variable
Bart Van Assche (5):
scsi: core: Fix a scsi_show_rq() NULL pointer dereference target/iscsi: Detect conn_cmd_list corruption early target/iscsi: Fix a race condition in iscsit_add_reject_from_cmd() IB/core: Fix endianness annotation in rdma_is_multicast_addr() RDMA/cma: Avoid triggering undefined behavior
Bartosz Chronowski (1):
Bluetooth: btusb: Add new NFA344A entry.
Bin Liu (1):
usb: musb: da8xx: fix babble condition handling
Bob Peterson (1):
GFS2: Take inode off order_write list when setting jdata flag
Breno Leitao (1):
powerpc/xmon: Check before calling xive functions
Brian Foster (1):
xfs: fix log block underflow during recovery cycle verification
Brian Norris (2):
ath10k: fix core PCI suspend when WoWLAN is supported but disabled
ath10k: fix build errors with !CONFIG_PM
Chandan Rajendra (1):
ext4: fix crash when a directory's i_size is too small
Changbin Du (1):
tracing: Allocate mask_str buffer dynamically
Chen Zhong (1):
clk: mediatek: add the option for determining PLL source clock
Christoph Fritz (1):
mmc: core: apply NO_CMD23 quirk to some specific cards
Christoph Hellwig (2):
nvme: use kref_get_unless_zero in nvme_find_get_ns
xfs: fix incorrect extent state in xfs_bmap_add_extent_unwritten_real
Christophe JAILLET (3):
video: fbdev: au1200fb: Release some resources if a memory allocation fails
video: fbdev: au1200fb: Return an error code if a memory allocation fails
btrfs: tests: Fix a memory leak in error handling path in 'run_test()'
Christophe Leroy (1):
powerpc/ipic: Fix status get and status clear
Chuck Lever (1):
xprtrdma: Don't defer fencing an async RPC's chunks
Chunfeng Yun (1):
usb: xhci: fix TDS for MTK xHCI1.1
Colin Ian King (2):
btrfs: avoid null pointer dereference on fs_info when calling btrfs_crit
ipmi_si: fix memory leak on new_smi
Dan Carpenter (2):
misc: pci_endpoint_test: Avoid triggering a BUG()
scsi: bfa: integer overflow in debugfs
Daniel Jurgens (2):
IB/core: Bound check alternate path port number IB/core: Don't enforce PKey security on SMI MADs
Daniel Lezcano (1):
thermal/drivers/step_wise: Fix temperature regulation misbehavior
Darrick J. Wong (1):
xfs: return a distinct error code value for IGET_INCORE cache misses
David Kozub (1):
USB: uas and storage: Add US_FL_BROKEN_FUA for another JMicron JMS567 ID
David Lechner (1):
eeprom: at24: change nvmem stride to 1
Don Hiatt (1):
IB/hfi1: Mask out A bit from psn trace
Douglas Gilbert (1):
scsi: scsi_debug: write_same: fix error report
Egil Hjelmeland (1):
net: dsa: lan9303: Do not disable switch fabric port 0 at .probe
Eric Biggers (5):
crypto: algif_aead - fix reference counting of null skcipher
crypto: rsa - fix buffer overread when stripping leading zeroes
crypto: hmac - require that the underlying hash algorithm is unkeyed
crypto: salsa20 - fix blkcipher_walk API usage
crypto: af_alg - fix NULL pointer dereference in
Eric Dumazet (1):
ipv4: ipv4_default_advmss() should use route mtu
Eryu Guan (2):
ext4: fix fdatasync(2) after fallocate(2) operation
xfs: truncate pagecache before writeback in xfs_setattr_size()
Felix Manlunas (1):
liquidio: fix kernel panic in VF driver
Fuyun Liang (1):
net: hns3: fix for getting advertised_caps in hns3_get_link_ksettings
Gao Feng (1):
ppp: Destroy the mutex when cleanup
Gary R Hook (1):
iommu/amd: Limit the IOVA page range to the specified addresses
Geert Uytterhoeven (2):
fbdev: controlfb: Add missing modes to fix out of bounds access
mtd: spi-nor: stm32-quadspi: Fix uninitialized error return code
Greg Kroah-Hartman (1):
Linux 4.14.8
Guoqing Jiang (1):
md-cluster: fix wrong condition check in raid1_write_request
Gustavo A. R. Silva (1):
thunderbolt: tb: fix use after free in tb_activate_pcie_devices
Guy Levi (1):
IB/mlx4: Fix RSS's QPC attributes assignments
Hans Holmberg (1):
lightnvm: pblk: prevent gc kicks when gc is not operational
Hans de Goede (1):
staging: rtl8188eu: Revert part of "staging: rtl8188eu: fix comments with lines over 80 characters"
Jan Kara (2):
mm: Handle 0 flags in _calc_vm_trans() macro
udf: Avoid overflow when session starts at large offset
Jason Yan (1):
scsi: libsas: fix length error in sas_smp_handler()
Javier González (3):
lightnvm: pblk: use right flag for GC allocation
lightnvm: pblk: initialize debug stat counter
lightnvm: pblk: fix min size for page mempool
Jia-Ju Bai (3):
vt6655: Fix a possible sleep-in-atomic bug in vt6655_suspend
rtl8188eu: Fix a possible sleep-in-atomic bug in rtw_createbss_cmd
rtl8188eu: Fix a possible sleep-in-atomic bug in rtw_disassoc_cmd
Jiang Yi (1):
target/file: Do not return error for UNMAP if length is zero
Jiri Slaby (1):
l2tp: cleanup l2tp_tunnel_delete calls
Johan Hovold (1):
serdev: ttyport: enforce tty-driver open() requirement
KUWAZAWA Takuya (1):
netfilter: ipvs: Fix inappropriate output of procfs
Kees Cook (1):
Revert "exec: avoid RLIMIT_STACK races with prlimit()"
Kirill A. Shutemov (2):
x86/boot/compressed/64: Detect and handle 5-level paging at boot-time x86/boot/compressed/64: Print error if 5-level paging is not supported
Kishon Vijay Abraham I (1):
misc: pci_endpoint_test: Fix failure path return values in probe
Kuninori Morimoto (1):
ASoC: rsnd: rsnd_ssi_run_mods() needs to care ssi_parent_mod
Kuppuswamy Sathyanarayanan (1):
platform/x86: intel_punit_ipc: Fix resource ioremap warning
Kurt Garloff (1):
scsi: scsi_devinfo: Add REPORTLUN2 to EMC SYMMETRIX blacklist entry
Ladislav Michl (1):
video: udlfb: Fix read EDID timeout
Leo Yan (1):
clk: hi6220: mark clock cs_atb_syspll as critical
Leon Romanovsky (1):
RDMA/cxgb4: Declare stag as __be32
Liang Chen (1):
bcache: explicitly destroy mutex while exiting
Linus Walleij (1):
pinctrl: adi2: Fix Kconfig build problem
Lipeng (6):
net: hns3: fix a bug in hclge_uninit_client_instance
net: hns3: add nic_client check when initialize roce base information
net: hns3: fix the bug of hns3_set_txbd_baseinfo
net: hns3: fix the TX/RX ring.queue_index in hns3_ring_get_cfg
net: hns3: fix the bug when map buffer fail
net: hns3: fix a bug when alloc new buffer
Liu Bo (1):
badblocks: fix wrong return value in badblocks_set if badblocks are disabled
Mark Rutland (1):
arm64: fix CONFIG_DEBUG_WX address reporting
Martin Kaiser (1):
mfd: fsl-imx25: Clean up irq settings during removal
Martin Wilck (2):
scsi: hpsa: cleanup sas_phy structures in sysfs when unloading
scsi: hpsa: destroy sas transport properties before scsi_host
Mathias Nyman (1):
xhci: Don't add a virt_dev to the devs array before it's fully allocated
Matteo Croce (1):
icmp: don't fail on fragment reassembly time exceeded
Matthias Brugger (2):
iommu/mediatek: Fix driver name
soc: mediatek: pwrap: fix compiler errors
Mauro Carvalho Chehab (1):
media: camss-vfe: always initialize reg at vfe_set_xbar_cfg()
Miaoqing Pan (1):
ath9k: fix tx99 potential info leak
Michael Ellerman (1):
powerpc/perf/hv-24x7: Fix incorrect comparison in memord
Michal Hocko (1):
mm, oom_reaper: fix memory corruption
Michał Mirosław (1):
clk: tegra: Fix cclk_lp divisor register
Mika Westerberg (1):
PCI: Do not allocate more buses than available in parent
Ming Lei (1):
blk-mq-sched: dispatch from scheduler IFF progress is made in ->dispatch
Neil Armstrong (1):
ARM64: dts: meson-gxbb-odroidc2: fix usb1 power supply
NeilBrown (2):
autofs: fix careless error in recent commit
raid5: Set R5_Expanded on parity devices as well as data.
Nick Desaulniers (1):
arm64: prevent regressions in compressed kernel image size when upgrading to binutils 2.27
Nicolin Chen (1):
clk: tegra: Use readl_relaxed_poll_timeout_atomic() in tegra210_clock_init()
Nikolay Borisov (1):
btrfs: Explicitly handle btrfs_update_root failure
Osama Khan (1):
platform/x86: hp_accel: Add quirk for HP ProBook 440 G4
Pankaj Bharadiya (1):
ASoC: Intel: Skylake: Fix uuid_module memory leak in failure case
Parav Pandit (2):
IB/core: Fix use workqueue without WQ_MEM_RECLAIM IB/core: Fix calculation of maximum RoCE MTU
Patel Jay P (1):
Ib/hfi1: Return actual operational VLs in port info query
Peter Ujfalusi (1):
dmaengine: ti-dma-crossbar: Correct am335x/am43xx mux value type
Philipp Zabel (1):
rtc: pcf8563: fix output clock rate
Pixel Ding (1):
drm/amdgpu: bypass lru touch for KIQ ring submission
Qiang (1):
PCI/PME: Handle invalid data when reading Root Status
Rajat Jain (1):
PM / s2idle: Clear the events_check_enabled flag
Rakesh Pandit (2):
lightnvm: pblk: fix changing GC group list for a line
lightnvm: pblk: protect line bitmap while submitting meta io
Robert Baronescu (1):
crypto: tcrypt - fix buffer lengths in test_aead_speed()
Robert Stonehouse (1):
sfc: don't warn on successful change of MAC
Ronald Tschalär (1):
Bluetooth: hci_ldisc: Fix another race when closing the tty.
Ronnie Sahlberg (1):
cifs: fix NULL deref in SMB2_read
Ross Zwisler (1):
dev/dax: fix uninitialized variable build warning
Scott Mayhew (1):
nfs: don't wait on commit in nfs_commit_inode() if there were no commit requests
Sergey Matyukevich (1):
qtnfmac: modify full Tx queue error reporting
Shriya (1):
powerpc/powernv/cpufreq: Fix the frequency read by /proc/cpuinfo
Shuah Khan (4):
usbip: fix stub_rx: get_pipe() to validate endpoint number
usbip: fix stub_rx: harden CMD_SUBMIT path to handle malicious input
usbip: prevent vhci_hcd driver from leaking a socket pointer address
usbip: fix stub_send_ret_submit() vulnerability to null transfer_buffer
Steve Capper (2):
arm64: mm: Fix pte_mkclean, pte_mkdirty semantics
arm64: Initialise high_memory global variable earlier
Steve Wise (1):
iw_cxgb4: only insert drain cqes if wq is flushed
Steven Rostedt (1):
sched/rt: Do not pull from current CPU if only one CPU to pull
Suzuki K Poulose (1):
arm-ccn: perf: Prevent module unload while PMU is in use
Sébastien Szymanski (2):
HID: cp2112: fix broken gpio_direction_input callback
clk: imx6: refine hdmi_isfr's parent to make HDMI work on i.MX6 SoCs w/o VPU
Theodore Ts'o (1):
ext4: add missing error check in __ext4_new_inode()
Thiago Rafael Becker (1):
kernel: make groups_sort calling a responsibility group_info allocators
Thomas Gleixner (1):
posix-timer: Properly check sigevent->sigev_notify
Trond Myklebust (1):
SUNRPC: Fix a race in the receive code path
Tushar Dave (1):
samples/bpf: adjust rlimit RLIMIT_MEMLOCK for xdp1
Tyrel Datwyler (1):
powerpc/pseries/vio: Dispose of virq mapping on vdevice unregister
Vivek Goyal (1):
ovl: Pass ovl_get_nlink() parameters in right order
Wanpeng Li (1):
KVM: nVMX: Fix EPT switching advertising
Wei Yongjun (2):
mlxsw: spectrum: Fix error return code in mlxsw_sp_port_create()
nullb: fix error return code in null_init()
William A. Kennington III (1):
powerpc/opal: Fix EBUSY bug in acquiring tokens
Xiaofei Tan (1):
scsi: hisi_sas: fix the risk of freeing slot twice
Yan, Zheng (1):
ceph: drop negative child dentries before try pruning inode's alias
[email protected] (1):
dm: fix various targets to dm_register_target after module __init resources created
nixiaoming (1):
tty fix oops when rmmod 8250
qumingguang (1):
net: hns3: Fix a misuse to devm_free_irq
tang.junhui (1):
bcache: fix wrong cache_misses statistics
tangwenji (2):
iscsi-target: fix memory leak in lio_target_tiqn_addtpg() target:fix condition return in core_pr_dump_initiator_port()
weiping zhang (2):
scsi: sd: change manage_start_stop to bool in sysfs interface
scsi: sd: change allow_restart to bool in sysfs interface
Greg KH
maintainerMakefile +1 -1
@@ -1,7 +1,7 @@ # SPDX-License-Identifier: GPL-2.0 VERSION = 4 PATCHLEVEL = 14 -SUBLEVEL = 7 +SUBLEVEL = 8 EXTRAVERSION = NAME = Petit Gorille
arch/arm64/Makefile +6 -2
@@ -14,8 +14,12 @@ LDFLAGS_vmlinux :=-p --no-undefined -X CPPFLAGS_vmlinux.lds = -DTEXT_OFFSET=$(TEXT_OFFSET) GZFLAGS :=-9 -ifneq ($(CONFIG_RELOCATABLE),) -LDFLAGS_vmlinux += -pie -shared -Bsymbolic +ifeq ($(CONFIG_RELOCATABLE), y) +# Pass --no-apply-dynamic-relocs to restore pre-binutils-2.27 behaviour +# for relative relocs, since this leads to better Image compression +# with the relocation offsets always being zero. +LDFLAGS_vmlinux += -pie -shared -Bsymbolic \ + $(call ld-option, --no-apply-dynamic-relocs) endif ifeq ($(CONFIG_ARM64_ERRATUM_843419),y)
arch/arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dts +1 -0
@@ -301,6 +301,7 @@ &usb1_phy { status = "okay"; + phy-supply = <&usb_otg_pwr>; }; &usb0 {
arch/arm64/include/asm/pgtable.h +18 -15
@@ -149,12 +149,20 @@ static inline pte_t pte_mkwrite(pte_t pte)static inline pte_t pte_mkclean (pte_t pte) { -return clear_pte_bit (pte,__pgprot (PTE_DIRTY )); + pte =clear_pte_bit (pte,__pgprot (PTE_DIRTY )); + pte =set_pte_bit (pte,__pgprot (PTE_RDONLY )); + +return pte; }static inline pte_t pte_mkdirty (pte_t pte) { -return set_pte_bit (pte,__pgprot (PTE_DIRTY )); + pte =set_pte_bit (pte,__pgprot (PTE_DIRTY )); + +if (pte_write (pte)) + pte =clear_pte_bit (pte,__pgprot (PTE_RDONLY )); + +return pte; }static inline pte_t pte_mkold (pte_t pte)
@@ -642,28 +650,23 @@ static inline pmd_t pmdp_huge_get_and_clear(struct mm_struct *mm,#endif /* CONFIG_TRANSPARENT_HUGEPAGE */ /* -* ptep_set_wrprotect - mark read-only while preserving the hardware update of -* the Access Flag. +* ptep_set_wrprotect - mark read-only while trasferring potential hardware +* dirty status (PTE_DBM && !PTE_RDONLY) to the software PTE_DIRTY bit. */ #define __HAVE_ARCH_PTEP_SET_WRPROTECTstatic inline void ptep_set_wrprotect (struct mm_struct *mm,unsigned long address,pte_t *ptep) {pte_t old_pte, pte; -/* -* ptep_set_wrprotect() is only called on CoW mappings which are -* private (!VM_SHARED) with the pte either read-only (!PTE_WRITE && -* PTE_RDONLY) or writable and software-dirty (PTE_WRITE && -* !PTE_RDONLY && PTE_DIRTY); see is_cow_mapping() and -* protection_map[]. There is no race with the hardware update of the -* dirty state: clearing of PTE_RDONLY when PTE_WRITE (a.k.a. PTE_DBM) -* is set. -*/ -VM_WARN_ONCE (pte_write (*ptep) && !pte_dirty (*ptep), -"%s: potential race with hardware DBM" , __func__); pte =READ_ONCE (*ptep); do { old_pte = pte; + /* + * If hardware-dirty (PTE_WRITE/DBM bit set and PTE_RDONLY + * clear), set the PTE_DIRTY bit. + */ + if (pte_hw_dirty(pte)) + pte = pte_mkdirty(pte); pte = pte_wrprotect(pte); pte_val(pte) = cmpxchg_relaxed(&pte_val(*ptep), pte_val(old_pte), pte_val(pte));
arch/arm64/mm/dump.c +1 -1
@@ -389,7 +389,7 @@ void ptdump_check_wx(void) .check_wx = true, }; -walk_pgd (&st, &init_mm,0 ); +walk_pgd (&st, &init_mm,VA_START );note_page (&st,0 ,0 ,0 );if (st.wx_pages || st.uxn_pages) pr_warn("Checked W+X mappings: FAILED, %lu W+X pages found, %lu non-UXN pages found\n",
arch/arm64/mm/init.c +2 -1
@@ -476,6 +476,8 @@ void __init arm64_memblock_init(void)reserve_elfcorehdr (); + high_memory =__va (memblock_end_of_DRAM () -1 ) +1 ; +dma_contiguous_reserve (arm64_dma_phys_limit);memblock_allow_resize ();
@@ -502,7 +504,6 @@ void __init bootmem_init(void)sparse_init ();zone_sizes_init (min, max); - high_memory =__va ((max <<PAGE_SHIFT ) -1 ) +1 ;memblock_dump_all (); }
arch/blackfin/Kconfig +5 -2
@@ -321,11 +321,14 @@ config BF53x config GPIO_ADI def_bool y + depends on !PINCTRL depends on (BF51x || BF52x || BF53x || BF538 || BF539 || BF561) -config PINCTRL +config PINCTRL_BLACKFIN_ADI2 def_bool y - depends on BF54x || BF60x + depends on (BF54x || BF60x) + select PINCTRL + select PINCTRL_ADI2 config MEM_MT48LC64M4A2FB_7E bool
arch/blackfin/Kconfig.debug +1 -0
@@ -18,6 +18,7 @@ config DEBUG_VERBOSE config DEBUG_MMRS tristate "Generate Blackfin MMR tree" + depends on !PINCTRL select DEBUG_FS help Create a tree of Blackfin MMRs via the debugfs tree. If
arch/powerpc/perf/hv-24x7.c +1 -1
@@ -540,7 +540,7 @@ static int memord(const void *d1, size_t s1, const void *d2, size_t s2) {if (s1 < s2)return 1 ; -if (s2 > s1) +if (s1 > s2)return -1 ;return memcmp (d1, d2, s1);
arch/powerpc/platforms/powernv/opal-async.c +3 -3
@@ -39,18 +39,18 @@ int __opal_async_get_token(void)int token;spin_lock_irqsave (&opal_async_comp_lock, flags); - token =find_first_bit (opal_async_complete_map, opal_max_async_tokens); + token =find_first_zero_bit (opal_async_token_map, opal_max_async_tokens);if (token >= opal_max_async_tokens) { token = -EBUSY ; goto out; } -if (__test_and_set_bit (token, opal_async_token_map)) { +if (!__test_and_clear_bit (token, opal_async_complete_map)) { token = -EBUSY ; goto out; } -__clear_bit (token, opal_async_complete_map); +__set_bit (token, opal_async_token_map); out:spin_unlock_irqrestore (&opal_async_comp_lock, flags);
arch/powerpc/platforms/powernv/setup.c +1 -1
@@ -319,7 +319,7 @@ static unsigned long pnv_get_proc_freq(unsigned int cpu) {unsigned long ret_freq; - ret_freq =cpufreq_quick_get (cpu) *1000ul ; + ret_freq =cpufreq_get (cpu) *1000ul ;/* * If the backend cpufreq driver does not exist,
arch/powerpc/platforms/pseries/vio.c +2 -0
@@ -1592,6 +1592,8 @@ ATTRIBUTE_GROUPS(vio_dev);void vio_unregister_device (struct vio_dev *viodev) {device_unregister (&viodev->dev); +if (viodev->family ==VDEVICE ) +irq_dispose_mapping (viodev->irq); }EXPORT_SYMBOL (vio_unregister_device);
arch/powerpc/sysdev/ipic.c +2 -2
@@ -846,12 +846,12 @@ void ipic_disable_mcp(enum ipic_mcp_irq mcp_irq)u32 ipic_get_mcp_status (void ) { -return ipic_read (primary_ipic->regs,IPIC_SERMR ); +return ipic_read (primary_ipic->regs,IPIC_SERSR ); }void ipic_clear_mcp_status (u32 mask) { -ipic_write (primary_ipic->regs,IPIC_SERMR , mask); +ipic_write (primary_ipic->regs,IPIC_SERSR , mask); }/* Return an interrupt vector or 0 if no interrupt is pending. */
arch/powerpc/xmon/xmon.c +5 -0
@@ -2475,6 +2475,11 @@ static void dump_xives(void)unsigned long num;int c; +if (!xive_enabled ()) { +printf ("Xive disabled on this system\n" ); +return ; + } + c =inchar ();if (c =='a' ) {dump_all_xives ();
arch/s390/kernel/compat_linux.c +1 -0
@@ -263,6 +263,7 @@ COMPAT_SYSCALL_DEFINE2(s390_setgroups16, int, gidsetsize, u16 __user *, grouplisreturn retval; } +groups_sort (group_info); retval =set_current_groups (group_info);put_group_info (group_info);
arch/x86/boot/compressed/Makefile +1 -0
@@ -78,6 +78,7 @@ vmlinux-objs-$(CONFIG_EARLY_PRINTK) += $(obj)/early_serial_console.o vmlinux-objs-$(CONFIG_RANDOMIZE_BASE) += $(obj)/kaslr.o ifdef CONFIG_X86_64 vmlinux-objs-$(CONFIG_RANDOMIZE_BASE) += $(obj)/pagetable.o + vmlinux-objs-y += $(obj)/pgtable_64.o endif $(obj)/eboot.o: KBUILD_CFLAGS += -fshort-wchar -mno-red-zone
arch/x86/boot/compressed/head_64.S +12 -4
@@ -289,10 +289,18 @@ ENTRY(startup_64) leaq boot_stack_end(%rbx), %rsp #ifdef CONFIG_X86_5LEVEL - /* Check if 5-level paging has already enabled */ - movq %cr4, %rax - testl $X86_CR4_LA57, %eax - jnz lvl5 + /* + * Check if we need to enable 5-level paging. + * RSI holds real mode data and need to be preserved across + * a function call. + */ + pushq %rsi + call l5_paging_required + popq %rsi + + /* If l5_paging_required() returned zero, we're done here. */ + cmpq $0, %rax + je lvl5 /* * At this point we are in long mode with 4-level paging enabled,
arch/x86/boot/compressed/misc.c +16 -0
@@ -169,6 +169,16 @@ void __puthex(unsigned long value) } } +static bool l5_supported (void ) +{ +/* Check if leaf 7 is supported. */ +if (native_cpuid_eax (0 ) <7 ) +return 0 ; + +/* Check if la57 is supported. */ +return native_cpuid_ecx (7 ) & (1 << (X86_FEATURE_LA57 &31 )); +} +#if CONFIG_X86_NEED_RELOCS static void handle_relocations (void *output,unsigned long output_len,unsigned long virt_addr)
@@ -362,6 +372,12 @@ asmlinkage __visible void *extract_kernel(void *rmode, memptr heap,console_init ();debug_putstr ("early console in extract_kernel\n" ); +if (IS_ENABLED (CONFIG_X86_5LEVEL ) && !l5_supported ()) { +error ("This linux kernel as configured requires 5-level paging\n" +"This CPU does not support the required 'cr4.la57' feature\n" +"Unable to boot - please use a kernel appropriate for your CPU\n" ); + } + free_mem_ptr = heap;/* Heap */ free_mem_end_ptr = heap +BOOT_HEAP_SIZE ;
arch/x86/boot/compressed/pgtable_64.c new file +28 -0
@@ -0,0 +1,28 @@ +#include <asm/processor.h> + +/* +* __force_order is used by special_insns.h asm code to force instruction +* serialization. +* +* It is not referenced from the code, but GCC < 5 with -fPIE would fail +* due to an undefined symbol. Define it to make these ancient GCCs work. +*/ +unsigned long __force_order; + +int l5_paging_required (void ) +{ +/* Check if leaf 7 is supported. */ + +if (native_cpuid_eax (0 ) <7 ) +return 0 ; + +/* Check if la57 is supported. */ +if (!(native_cpuid_ecx (7 ) & (1 << (X86_FEATURE_LA57 &31 )))) +return 0 ; + +/* Check if 5-level paging has already been enabled. */ +if (native_read_cr4 () &X86_CR4_LA57 ) +return 0 ; + +return 1 ; +}
arch/x86/crypto/salsa20_glue.c +0 -7
@@ -59,13 +59,6 @@ static int encrypt(struct blkcipher_desc *desc,salsa20_ivsetup (ctx, walk.iv); -if (likely (walk.nbytes == nbytes)) - { -salsa20_encrypt_bytes (ctx, walk.src.virt.addr, - walk.dst.virt.addr, nbytes); -return blkcipher_walk_done (desc, &walk,0 ); - } -while (walk.nbytes >=64 ) { salsa20_encrypt_bytes(ctx, walk.src.virt.addr, walk.dst.virt.addr,
arch/x86/kvm/vmx.c +3 -2
@@ -2845,8 +2845,9 @@ static void nested_vmx_setup_ctls_msrs(struct vcpu_vmx *vmx)* Advertise EPTP switching unconditionally * since we emulate it */ - vmx->nested.nested_vmx_vmfunc_controls = -VMX_VMFUNC_EPTP_SWITCHING ; +if (enable_ept) + vmx->nested.nested_vmx_vmfunc_controls = +VMX_VMFUNC_EPTP_SWITCHING ; }/*
block/badblocks.c +1 -1
@@ -178,7 +178,7 @@ int badblocks_set(struct badblocks *bb, sector_t s, int sectors,if (bb->shift <0 )/* badblocks are disabled */ -return 0 ; +return 1 ;if (bb->shift) {/* round the start down, and the end up */
block/blk-mq-sched.c +6 -6
@@ -94,7 +94,7 @@ void blk_mq_sched_dispatch_requests(struct blk_mq_hw_ctx *hctx)struct request_queue *q = hctx->queue;struct elevator_queue *e = q->elevator;const bool has_sched_dispatch = e && e->type->ops.mq.dispatch_request; -bool did_work = false; +bool do_sched_dispatch = true;LIST_HEAD (rq_list);/* RCU or SRCU read lock is needed before checking quiesced flag */
@@ -125,18 +125,18 @@ void blk_mq_sched_dispatch_requests(struct blk_mq_hw_ctx *hctx)*/ if (!list_empty (&rq_list)) {blk_mq_sched_mark_restart_hctx (hctx); - did_work =blk_mq_dispatch_rq_list (q, &rq_list); + do_sched_dispatch =blk_mq_dispatch_rq_list (q, &rq_list); }else if (!has_sched_dispatch) {blk_mq_flush_busy_ctxs (hctx, &rq_list);blk_mq_dispatch_rq_list (q, &rq_list); }/* -* We want to dispatch from the scheduler if we had no work left -* on the dispatch list, OR if we did have work but weren't able -* to make progress. +* We want to dispatch from the scheduler if there was nothing +* on the dispatch list or we were able to dispatch from the +* dispatch list. */ -if (!did_work && has_sched_dispatch) { +if (do_sched_dispatch && has_sched_dispatch) { do { struct request *rq;
crypto/af_alg.c +7 -6
@@ -699,14 +699,15 @@ void af_alg_free_areq_sgls(struct af_alg_async_req *areq) } tsgl = areq->tsgl; -for_each_sg (tsgl, sg, areq->tsgl_entries, i) { -if (!sg_page (sg)) -continue ; -put_page (sg_page (sg)); - } +if (tsgl) { +for_each_sg (tsgl, sg, areq->tsgl_entries, i) { +if (!sg_page (sg)) +continue ; +put_page (sg_page (sg)); + } -if (areq->tsgl && areq->tsgl_entries)sock_kfree_s (sk, tsgl, areq->tsgl_entries *sizeof (*tsgl)); + } }EXPORT_SYMBOL_GPL (af_alg_free_areq_sgls);
crypto/algif_aead.c +1 -1
@@ -503,6 +503,7 @@ static void aead_release(void *private)struct aead_tfm *tfm = private;crypto_free_aead (tfm->aead); +crypto_put_default_null_skcipher2 ();kfree (tfm); }
@@ -535,7 +536,6 @@ static void aead_sock_destruct(struct sock *sk)unsigned int ivlen =crypto_aead_ivsize (tfm);af_alg_pull_tsgl (sk, ctx->used,NULL ,0 ); -crypto_put_default_null_skcipher2 ();sock_kzfree_s (sk, ctx->iv, ivlen);sock_kfree_s (sk, ctx, ctx->len);af_alg_release_parent (sk);
crypto/hmac.c +5 -1
@@ -195,11 +195,15 @@ static int hmac_create(struct crypto_template *tmpl, struct rtattr **tb) salg =shash_attr_alg (tb[1 ],0 ,0 );if (IS_ERR (salg))return PTR_ERR (salg); + alg = &salg->base; +/* The underlying hash algorithm must be unkeyed */ err = -EINVAL ; +if (crypto_shash_alg_has_setkey (salg)) + goto out_put_alg; + ds = salg->digestsize; ss = salg->statesize; - alg = &salg->base;if (ds > alg->cra_blocksize || ss < alg->cra_blocksize) goto out_put_alg;
crypto/rsa_helper.c +1 -1
@@ -30,7 +30,7 @@ int rsa_get_n(void *context, size_t hdrlen, unsigned char tag,return -EINVAL ;if (fips_enabled) { -while (!*ptr && n_sz) { +while (n_sz && !*ptr) { ptr++; n_sz--; }
crypto/salsa20_generic.c +0 -7
@@ -188,13 +188,6 @@ static int encrypt(struct blkcipher_desc *desc,salsa20_ivsetup (ctx, walk.iv); -if (likely (walk.nbytes == nbytes)) - { -salsa20_encrypt_bytes (ctx, walk.dst.virt.addr, - walk.src.virt.addr, nbytes); -return blkcipher_walk_done (desc, &walk,0 ); - } -while (walk.nbytes >=64 ) { salsa20_encrypt_bytes(ctx, walk.dst.virt.addr, walk.src.virt.addr,
crypto/shash.c +3 -2
@@ -25,11 +25,12 @@static const struct crypto_type crypto_shash_type; -static int shash_no_setkey (struct crypto_shash *tfm,const u8 *key, -unsigned int keylen) +int shash_no_setkey (struct crypto_shash *tfm,const u8 *key, +unsigned int keylen) {return -ENOSYS ; } +EXPORT_SYMBOL_GPL (shash_no_setkey);static int shash_setkey_unaligned (struct crypto_shash *tfm,const u8 *key,unsigned int keylen)
crypto/tcrypt.c +4 -2
@@ -340,7 +340,7 @@ static void test_aead_speed(const char *algo, int enc, unsigned int secs, }sg_init_aead (sg, xbuf, - *b_size + (enc ? authsize :0 )); + *b_size + (enc ?0 : authsize));sg_init_aead (sgout, xoutbuf, *b_size + (enc ? authsize :0 ));
@@ -348,7 +348,9 @@ static void test_aead_speed(const char *algo, int enc, unsigned int secs,sg_set_buf (&sg[0 ], assoc, aad_size);sg_set_buf (&sgout[0 ], assoc, aad_size); -aead_request_set_crypt (req, sg, sgout, *b_size, iv); +aead_request_set_crypt (req, sg, sgout, + *b_size + (enc ?0 : authsize), + iv);aead_request_set_ad (req, aad_size);if (secs)
drivers/block/null_blk.c +3 -1
@@ -1985,8 +1985,10 @@ static int __init null_init(void)for (i =0 ; i < nr_devices; i++) { dev =null_alloc_dev (); -if (!dev) +if (!dev) { + ret = -ENOMEM ; goto err_dev; + } ret =null_add_dev (dev);if (ret) {null_free_dev (dev);
drivers/bluetooth/btusb.c +1 -0
@@ -272,6 +272,7 @@ static const struct usb_device_id blacklist_table[] = { { USB_DEVICE(0x0cf3, 0xe301), .driver_info = BTUSB_QCA_ROME }, { USB_DEVICE(0x0cf3, 0xe360), .driver_info = BTUSB_QCA_ROME }, { USB_DEVICE(0x0489, 0xe092), .driver_info = BTUSB_QCA_ROME }, + { USB_DEVICE(0x0489, 0xe09f), .driver_info = BTUSB_QCA_ROME }, { USB_DEVICE(0x0489, 0xe0a2), .driver_info = BTUSB_QCA_ROME }, { USB_DEVICE(0x04ca, 0x3011), .driver_info = BTUSB_QCA_ROME }, { USB_DEVICE(0x04ca, 0x3016), .driver_info = BTUSB_QCA_ROME },
drivers/bluetooth/hci_ldisc.c +2 -2
@@ -510,13 +510,13 @@ static void hci_uart_tty_close(struct tty_struct *tty)if (hdev)hci_uart_close (hdev); -cancel_work_sync (&hu->write_work); -if (test_bit (HCI_UART_PROTO_READY , &hu->flags)) {write_lock_irqsave (&hu->proto_lock, flags);clear_bit (HCI_UART_PROTO_READY , &hu->flags);write_unlock_irqrestore (&hu->proto_lock, flags); +cancel_work_sync (&hu->write_work); +if (hdev) {if (test_bit (HCI_UART_REGISTERED , &hu->flags))hci_unregister_dev (hdev);
drivers/bus/arm-ccn.c +1 -0
@@ -1280,6 +1280,7 @@ static int arm_ccn_pmu_init(struct arm_ccn *ccn)/* Perf driver registration */ ccn->dt.pmu = (struct pmu ) { + .module =THIS_MODULE , .attr_groups = arm_ccn_pmu_attr_groups, .task_ctx_nr = perf_invalid_context, .event_init = arm_ccn_pmu_event_init,
drivers/char/ipmi/ipmi_si_intf.c +1 -0
@@ -3469,6 +3469,7 @@ static int add_smi(struct smi_info *new_smi)ipmi_addr_src_to_str (new_smi->addr_source), si_to_str[new_smi->si_type]); rv = -EBUSY ; +kfree (new_smi); goto out_err; } }
drivers/clk/hisilicon/clk-hi6220.c +1 -1
@@ -145,7 +145,7 @@ static struct hisi_gate_clock hi6220_separated_gate_clks_sys[] __initdata = { { HI6220_BBPPLL_SEL, "bbppll_sel", "pll0_bbp_gate", CLK_SET_RATE_PARENT|CLK_IGNORE_UNUSED, 0x270, 9, 0, }, { HI6220_MEDIA_PLL_SRC, "media_pll_src", "pll_media_gate", CLK_SET_RATE_PARENT|CLK_IGNORE_UNUSED, 0x270, 10, 0, }, { HI6220_MMC2_SEL, "mmc2_sel", "mmc2_mux1", CLK_SET_RATE_PARENT|CLK_IGNORE_UNUSED, 0x270, 11, 0, }, - { HI6220_CS_ATB_SYSPLL, "cs_atb_syspll", "syspll", CLK_SET_RATE_PARENT|CLK_IGNORE_UNUSED, 0x270, 12, 0, }, + { HI6220_CS_ATB_SYSPLL, "cs_atb_syspll", "syspll", CLK_SET_RATE_PARENT|CLK_IS_CRITICAL, 0x270, 12, 0, }, }; static struct hisi_mux_clock hi6220_mux_clks_sys[] __initdata = {
drivers/clk/imx/clk-imx6q.c +1 -1
@@ -761,7 +761,7 @@ static void __init imx6q_clocks_init(struct device_node *ccm_node) clk[IMX6QDL_CLK_GPU2D_CORE ] =imx_clk_gate2 ("gpu2d_core" ,"gpu2d_core_podf" , base +0x6c ,24 ); clk[IMX6QDL_CLK_GPU3D_CORE ] =imx_clk_gate2 ("gpu3d_core" ,"gpu3d_core_podf" , base +0x6c ,26 ); clk[IMX6QDL_CLK_HDMI_IAHB ] =imx_clk_gate2 ("hdmi_iahb" ,"ahb" , base +0x70 ,0 ); - clk[IMX6QDL_CLK_HDMI_ISFR ] =imx_clk_gate2 ("hdmi_isfr" ,"video_27m" , base +0x70 ,4 ); + clk[IMX6QDL_CLK_HDMI_ISFR ] =imx_clk_gate2 ("hdmi_isfr" ,"mipi_core_cfg" , base +0x70 ,4 ); clk[IMX6QDL_CLK_I2C1 ] =imx_clk_gate2 ("i2c1" ,"ipg_per" , base +0x70 ,6 ); clk[IMX6QDL_CLK_I2C2 ] =imx_clk_gate2 ("i2c2" ,"ipg_per" , base +0x70 ,8 ); clk[IMX6QDL_CLK_I2C3 ] =imx_clk_gate2 ("i2c3" ,"ipg_per" , base +0x70 ,10 );
drivers/clk/imx/clk-imx7d.c +1 -1
@@ -797,7 +797,7 @@ static void __init imx7d_clocks_init(struct device_node *ccm_node) clks[IMX7D_MAIN_AXI_ROOT_CLK ] =imx_clk_gate4 ("main_axi_root_clk" ,"axi_post_div" , base +0x4040 ,0 ); clks[IMX7D_DISP_AXI_ROOT_CLK ] =imx_clk_gate4 ("disp_axi_root_clk" ,"disp_axi_post_div" , base +0x4050 ,0 ); clks[IMX7D_ENET_AXI_ROOT_CLK ] =imx_clk_gate4 ("enet_axi_root_clk" ,"enet_axi_post_div" , base +0x4060 ,0 ); - clks[IMX7D_OCRAM_CLK ] =imx_clk_gate4 ("ocram_clk" ,"axi_post_div" , base +0x4110 ,0 ); + clks[IMX7D_OCRAM_CLK ] =imx_clk_gate4 ("ocram_clk" ,"main_axi_root_clk" , base +0x4110 ,0 ); clks[IMX7D_OCRAM_S_CLK ] =imx_clk_gate4 ("ocram_s_clk" ,"ahb_root_clk" , base +0x4120 ,0 ); clks[IMX7D_DRAM_ROOT_CLK ] =imx_clk_gate4 ("dram_root_clk" ,"dram_post_div" , base +0x4130 ,0 ); clks[IMX7D_DRAM_PHYM_ROOT_CLK ] =imx_clk_gate4 ("dram_phym_root_clk" ,"dram_phym_cg" , base +0x4130 ,0 );
drivers/clk/mediatek/clk-mtk.h +1 -0
@@ -216,6 +216,7 @@ struct mtk_pll_data {uint32_t pcw_reg;int pcw_shift;const struct mtk_pll_div_table *div_table; +const char *parent_name; }; void mtk_clk_register_plls(struct device_node *node,
drivers/clk/mediatek/clk-pll.c +4 -1
@@ -303,7 +303,10 @@ static struct clk *mtk_clk_register_pll(const struct mtk_pll_data *data, init.name = data->name; init.flags = (data->flags &PLL_AO ) ?CLK_IS_CRITICAL :0 ; init.ops = &mtk_pll_ops; - init.parent_names = &parent_name; +if (data->parent_name) + init.parent_names = &data->parent_name; +else + init.parent_names = &parent_name; init.num_parents =1 ; clk =clk_register (NULL , &pll->hw);
drivers/clk/tegra/clk-tegra210.c +2 -2
@@ -2566,8 +2566,8 @@ static int tegra210_enable_pllu(void) reg |=PLL_ENABLE ;writel (reg, clk_base +PLLU_BASE ); -readl_relaxed_poll_timeout (clk_base +PLLU_BASE , reg, - reg &PLL_BASE_LOCK ,2 ,1000 ); +readl_relaxed_poll_timeout_atomic (clk_base +PLLU_BASE , reg, + reg &PLL_BASE_LOCK ,2 ,1000 );if (!(reg &PLL_BASE_LOCK )) {pr_err ("Timed out waiting for PLL_U to lock\n" );return -ETIMEDOUT ;
drivers/clk/tegra/clk-tegra30.c +1 -1
@@ -964,7 +964,7 @@ static void __init tegra30_super_clk_init(void)* U71 divider of cclk_lp. */ clk =tegra_clk_register_divider ("pll_p_out3_cclklp" ,"pll_p_out3" , - clk_base +SUPER_CCLKG_DIVIDER ,0 , + clk_base +SUPER_CCLKLP_DIVIDER ,0 ,TEGRA_DIVIDER_INT ,16 ,8 ,1 ,NULL );clk_register_clkdev (clk,"pll_p_out3_cclklp" ,NULL );
drivers/dax/device.c +2 -1
@@ -222,7 +222,8 @@ __weak phys_addr_t dax_pgoff_to_phys(struct dev_dax *dev_dax, pgoff_t pgoff, unsigned long size) {struct resource *res; -phys_addr_t phys; +/* gcc-4.6.3-nolibc for i386 complains that this is uninitialized */ +phys_addr_t uninitialized_var (phys );int i;for (i =0 ; i < dev_dax->num_resources; i++) {
drivers/dma/dmatest.c +31 -24
113 lines not on this page · raw message
drivers/dma/ti-dma-crossbar.c +4 -4
@@ -49,12 +49,12 @@ struct ti_am335x_xbar_data {struct ti_am335x_xbar_map {u16 dma_line; -u16 mux_val; +u8 mux_val; }; -static inline void ti_am335x_xbar_write (void __iomem *iomem,int event,u16 val) +static inline void ti_am335x_xbar_write (void __iomem *iomem,int event,u8 val) { -writeb_relaxed (val &0x1f , iomem + event); +writeb_relaxed (val, iomem + event); }static void ti_am335x_xbar_free (struct device *dev,void *route_data)
@@ -105,7 +105,7 @@ static void *ti_am335x_xbar_route_allocate(struct of_phandle_args *dma_spec, } map->dma_line = (u16 )dma_spec->args[0 ]; - map->mux_val = (u16 )dma_spec->args[2 ]; + map->mux_val = (u8 )dma_spec->args[2 ]; dma_spec->args[2 ] =0 ; dma_spec->args_count =2 ;
drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c +2 -1
@@ -136,7 +136,8 @@ void amdgpu_ring_commit(struct amdgpu_ring *ring)if (ring->funcs->end_use) ring->funcs->end_use (ring); -amdgpu_ring_lru_touch (ring->adev, ring); +if (ring->funcs->type !=AMDGPU_RING_TYPE_KIQ ) +amdgpu_ring_lru_touch (ring->adev, ring); }/**
drivers/hid/hid-cp2112.c +6 -2
@@ -196,6 +196,8 @@ static int cp2112_gpio_direction_input(struct gpio_chip *chip, unsigned offset) HID_REQ_GET_REPORT);if (ret !=CP2112_GPIO_CONFIG_LENGTH ) {hid_err (hdev,"error requesting GPIO config: %d\n" , ret); +if (ret >=0 ) + ret = -EIO ; goto exit; }
@@ -205,8 +207,10 @@ static int cp2112_gpio_direction_input(struct gpio_chip *chip, unsigned offset) ret =hid_hw_raw_request (hdev,CP2112_GPIO_CONFIG , buf,CP2112_GPIO_CONFIG_LENGTH ,HID_FEATURE_REPORT ,HID_REQ_SET_REPORT ); -if (ret <0 ) { +if (ret !=CP2112_GPIO_CONFIG_LENGTH ) {hid_err (hdev,"error setting GPIO config: %d\n" , ret); +if (ret >=0 ) + ret = -EIO ; goto exit; }
@@ -214,7 +218,7 @@ static int cp2112_gpio_direction_input(struct gpio_chip *chip, unsigned offset) exit:mutex_unlock (&dev->lock); -return ret <0 ? ret : -EIO ; +return ret; }static void cp2112_gpio_set (struct gpio_chip *chip,unsigned offset,int value)
drivers/infiniband/core/addr.c +1 -1
@@ -852,7 +852,7 @@ static struct notifier_block nb = {int addr_init (void ) { - addr_wq =alloc_ordered_workqueue ("ib_addr" ,WQ_MEM_RECLAIM ); + addr_wq =alloc_ordered_workqueue ("ib_addr" ,0 );if (!addr_wq)return -ENOMEM ;
drivers/infiniband/core/cma.c +7 -4
@@ -1540,7 +1540,7 @@ static struct rdma_id_private *cma_id_from_event(struct ib_cm_id *cm_id,return id_priv; } -static inline int cma_user_data_offset (struct rdma_id_private *id_priv) +static inline u8 cma_user_data_offset (struct rdma_id_private *id_priv) {return cma_family (id_priv) ==AF_IB ?0 :sizeof (struct cma_hdr ); }
@@ -1942,7 +1942,8 @@ static int cma_req_handler(struct ib_cm_id *cm_id, struct ib_cm_event *ib_event)struct rdma_id_private *listen_id, *conn_id =NULL ;struct rdma_cm_event event;struct net_device *net_dev; -int offset, ret; +u8 offset; +int ret; listen_id =cma_id_from_event (cm_id, ib_event, &net_dev);if (IS_ERR (listen_id))
@@ -3440,7 +3441,8 @@ static int cma_resolve_ib_udp(struct rdma_id_private *id_priv,struct ib_cm_sidr_req_param req;struct ib_cm_id *id;void *private_data; -int offset, ret; +u8 offset; +int ret;memset (&req,0 ,sizeof req); offset =cma_user_data_offset (id_priv);
@@ -3497,7 +3499,8 @@ static int cma_connect_ib(struct rdma_id_private *id_priv,struct rdma_route *route;void *private_data;struct ib_cm_id *id; -int offset, ret; +u8 offset; +int ret;memset (&req,0 ,sizeof req); offset =cma_user_data_offset (id_priv);
drivers/infiniband/core/security.c +5 -2
@@ -739,8 +739,11 @@ int ib_mad_enforce_security(struct ib_mad_agent_private *map, u16 pkey_index)if (!rdma_protocol_ib (map->agent.device, map->agent.port_num))return 0 ; -if (map->agent.qp->qp_type ==IB_QPT_SMI && !map->agent.smp_allowed) -return -EACCES ; +if (map->agent.qp->qp_type ==IB_QPT_SMI ) { +if (!map->agent.smp_allowed) +return -EACCES ; +return 0 ; + } return ib_security_pkey_access(map->agent.device, map->agent.port_num,
drivers/infiniband/core/uverbs_cmd.c +6 -0
@@ -1982,6 +1982,12 @@ static int modify_qp(struct ib_uverbs_file *file, goto release_qp; } +if ((cmd->base.attr_mask &IB_QP_ALT_PATH ) && + !rdma_is_port_valid (qp->device, cmd->base.alt_port_num)) { + ret = -EINVAL ; + goto release_qp; + } + attr->qp_state = cmd->base.qp_state; attr->cur_qp_state = cmd->base.cur_qp_state; attr->path_mtu = cmd->base.path_mtu;
drivers/infiniband/hw/cxgb4/cq.c +5 -0
@@ -410,6 +410,11 @@ void c4iw_flush_hw_cq(struct c4iw_cq *chp)static int cqe_completes_wr (struct t4_cqe *cqe,struct t4_wq *wq) { +if (CQE_OPCODE (cqe) ==C4IW_DRAIN_OPCODE ) { +WARN_ONCE (1 ,"Unexpected DRAIN CQE qp id %u!\n" , wq->sq.qid); +return 0 ; + } +if (CQE_OPCODE (cqe) ==FW_RI_TERMINATE )return 0 ;
drivers/infiniband/hw/cxgb4/qp.c +12 -2
@@ -868,7 +868,12 @@ int c4iw_post_send(struct ib_qp *ibqp, struct ib_send_wr *wr, qhp =to_c4iw_qp (ibqp);spin_lock_irqsave (&qhp->lock, flag); -if (t4_wq_in_error (&qhp->wq)) { + +/* +* If the qp has been flushed, then just insert a special +* drain cqe. +*/ +if (qhp->wq.flushed) {spin_unlock_irqrestore (&qhp->lock, flag);complete_sq_drain_wr (qhp, wr);return err;
@@ -1012,7 +1017,12 @@ int c4iw_post_receive(struct ib_qp *ibqp, struct ib_recv_wr *wr, qhp =to_c4iw_qp (ibqp);spin_lock_irqsave (&qhp->lock, flag); -if (t4_wq_in_error (&qhp->wq)) { + +/* +* If the qp has been flushed, then just insert a special +* drain cqe. +*/ +if (qhp->wq.flushed) {spin_unlock_irqrestore (&qhp->lock, flag);complete_rq_drain_wr (qhp, wr);return err;
drivers/infiniband/hw/cxgb4/t4.h +1 -1
@@ -171,7 +171,7 @@ struct t4_cqe {__be32 msn; } rcqe;struct { -u32 stag; +__be32 stag;u16 nada2;u16 cidx; } scqe;
drivers/infiniband/hw/hfi1/chip.c +1 -1
@@ -9952,7 +9952,7 @@ int hfi1_get_ib_cfg(struct hfi1_pportdata *ppd, int which) goto unimplemented;case HFI1_IB_CFG_OP_VLS : - val = ppd->vls_operational; + val = ppd->actual_vls_operational;break ;case HFI1_IB_CFG_VL_HIGH_CAP :/* VL arb high priority table size */ val =VL_ARB_HIGH_PRIO_TABLE_SIZE ;
drivers/infiniband/hw/hfi1/trace.c +2 -2
@@ -154,7 +154,7 @@ void hfi1_trace_parse_9b_bth(struct ib_other_headers *ohdr, *opcode =ib_bth_get_opcode (ohdr); *tver =ib_bth_get_tver (ohdr); *pkey =ib_bth_get_pkey (ohdr); - *psn =ib_bth_get_psn (ohdr); + *psn =mask_psn (ib_bth_get_psn (ohdr)); *qpn =ib_bth_get_qpn (ohdr); }
@@ -169,7 +169,7 @@ void hfi1_trace_parse_16b_bth(struct ib_other_headers *ohdr, *pad =ib_bth_get_pad (ohdr); *se =ib_bth_get_se (ohdr); *tver =ib_bth_get_tver (ohdr); - *psn =ib_bth_get_psn (ohdr); + *psn =mask_psn (ib_bth_get_psn (ohdr)); *qpn =ib_bth_get_qpn (ohdr); }
drivers/infiniband/hw/mlx4/qp.c +9 -7
@@ -2182,11 +2182,6 @@ static int __mlx4_ib_modify_qp(void *src, enum mlx4_ib_source_type src_type, context->flags =cpu_to_be32 ((to_mlx4_state (new_state) <<28 ) | (to_mlx4_st (dev, qp->mlx4_ib_qp_type) <<16 )); -if (rwq_ind_tbl) { -fill_qp_rss_context (context, qp); - context->flags |=cpu_to_be32 (1 <<MLX4_RSS_QPC_FLAG_OFFSET ); - } -if (!(attr_mask &IB_QP_PATH_MIG_STATE )) context->flags |=cpu_to_be32 (MLX4_QP_PM_MIGRATED <<11 );else {
@@ -2387,6 +2382,7 @@ static int __mlx4_ib_modify_qp(void *src, enum mlx4_ib_source_type src_type, context->pd =cpu_to_be32 (pd->pdn);if (!rwq_ind_tbl) { + context->params1 =cpu_to_be32 (MLX4_IB_ACK_REQ_FREQ <<28 );get_cqs (qp, src_type, &send_cq, &recv_cq); }else {/* Set dummy CQs to be compatible with HV and PRM */ send_cq =to_mcq (rwq_ind_tbl->ind_tbl[0 ]->cq);
@@ -2394,7 +2390,6 @@ static int __mlx4_ib_modify_qp(void *src, enum mlx4_ib_source_type src_type, } context->cqn_send =cpu_to_be32 (send_cq->mcq.cqn); context->cqn_recv =cpu_to_be32 (recv_cq->mcq.cqn); - context->params1 =cpu_to_be32 (MLX4_IB_ACK_REQ_FREQ <<28 );/* Set "fast registration enabled" for all kernel QPs */ if (!ibuobject)
@@ -2513,7 +2508,7 @@ static int __mlx4_ib_modify_qp(void *src, enum mlx4_ib_source_type src_type,MLX4_IB_LINK_TYPE_ETH ;if (dev->dev->caps.tunnel_offload_mode ==MLX4_TUNNEL_OFFLOAD_MODE_VXLAN ) {/* set QP to receive both tunneled & non-tunneled packets */ -if (!(context->flags &cpu_to_be32 (1 <<MLX4_RSS_QPC_FLAG_OFFSET ))) +if (!rwq_ind_tbl) context->srqn =cpu_to_be32 (7 <<28 ); } }
@@ -2562,6 +2557,13 @@ static int __mlx4_ib_modify_qp(void *src, enum mlx4_ib_source_type src_type, } } +if (rwq_ind_tbl && + cur_state ==IB_QPS_RESET && + new_state ==IB_QPS_INIT ) { +fill_qp_rss_context (context, qp); + context->flags |=cpu_to_be32 (1 <<MLX4_RSS_QPC_FLAG_OFFSET ); + } + err =mlx4_qp_modify (dev->dev, &qp->mtt,to_mlx4_state (cur_state),to_mlx4_state (new_state), context, optpar, sqd_event, &qp->mqp);
drivers/infiniband/ulp/ipoib/ipoib_ib.c +6 -1
@@ -1203,10 +1203,15 @@ static void __ipoib_ib_dev_flush(struct ipoib_dev_priv *priv,ipoib_ib_dev_down (dev);if (level ==IPOIB_FLUSH_HEAVY ) { +rtnl_lock ();if (test_bit (IPOIB_FLAG_INITIALIZED , &priv->flags))ipoib_ib_dev_stop (dev); -if (ipoib_ib_dev_open (dev) !=0 ) + + result =ipoib_ib_dev_open (dev); +rtnl_unlock (); +if (result)return ; +if (netif_queue_stopped (dev))netif_start_queue (dev); }
drivers/iommu/amd_iommu.c +1 -1
@@ -3155,7 +3155,7 @@ static void amd_iommu_apply_resv_region(struct device *dev,unsigned long start, end; start =IOVA_PFN (region->start); - end =IOVA_PFN (region->start + region->length); + end =IOVA_PFN (region->start + region->length -1 );WARN_ON_ONCE (reserve_iova (&dma_dom->iovad, start, end) ==NULL ); }
drivers/iommu/mtk_iommu_v1.c +1 -1
@@ -708,7 +708,7 @@ static struct platform_driver mtk_iommu_driver = { .probe = mtk_iommu_probe, .remove = mtk_iommu_remove, .driver = { - .name = "mtk-iommu", + .name = "mtk-iommu-v1", .of_match_table = mtk_iommu_of_ids, .pm = &mtk_iommu_pm_ops, }
drivers/lightnvm/pblk-core.c +5 -3
@@ -193,7 +193,7 @@ void pblk_bio_free_pages(struct pblk *pblk, struct bio *bio, int off,bio_advance (bio, off *PBLK_EXPOSED_PAGE_SIZE );for (i = off; i < nr_pages + off; i++) { bv = bio->bi_io_vec[i]; -mempool_free (bv.bv_page, pblk->page_pool); +mempool_free (bv.bv_page, pblk->page_bio_pool); } }
@@ -205,14 +205,14 @@ int pblk_bio_add_pages(struct pblk *pblk, struct bio *bio, gfp_t flags,int i, ret;for (i =0 ; i < nr_pages; i++) { - page =mempool_alloc (pblk->page_pool, flags); + page =mempool_alloc (pblk->page_bio_pool, flags);if (!page) goto err; ret =bio_add_pc_page (q, bio, page,PBLK_EXPOSED_PAGE_SIZE ,0 );if (ret !=PBLK_EXPOSED_PAGE_SIZE ) {pr_err ("pblk: could not add page to bio\n" ); -mempool_free (page, pblk->page_pool); +mempool_free (page, pblk->page_bio_pool); goto err; } }
@@ -486,12 +486,14 @@ void pblk_dealloc_page(struct pblk *pblk, struct pblk_line *line, int nr_secs)u64 addr;int i; +spin_lock (&line->lock); addr =find_next_zero_bit (line->map_bitmap, pblk->lm.sec_per_line, line->cur_sec); line->cur_sec = addr - nr_secs;for (i =0 ; i < nr_secs; i++, line->cur_sec--)WARN_ON (!test_and_clear_bit (line->cur_sec, line->map_bitmap)); +spin_unlock (&line->lock); }u64 __pblk_alloc_page (struct pblk *pblk,struct pblk_line *line,int nr_secs)
drivers/lightnvm/pblk-gc.c +5 -4
@@ -486,10 +486,10 @@ void pblk_gc_should_start(struct pblk *pblk) {struct pblk_gc *gc = &pblk->gc; -if (gc->gc_enabled && !gc->gc_active) +if (gc->gc_enabled && !gc->gc_active) {pblk_gc_start (pblk); - -pblk_gc_kick (pblk); +pblk_gc_kick (pblk); + } }/*
@@ -628,7 +628,8 @@ void pblk_gc_exit(struct pblk *pblk)flush_workqueue (gc->gc_reader_wq);flush_workqueue (gc->gc_line_reader_wq); -del_timer (&gc->gc_timer); + gc->gc_enabled =0 ; +del_timer_sync (&gc->gc_timer);pblk_gc_stop (pblk,1 );if (gc->gc_ts)
drivers/lightnvm/pblk-init.c +12 -9
@@ -132,7 +132,6 @@ static int pblk_rwb_init(struct pblk *pblk) }/* Minimum pages needed within a lun */ -#define PAGE_POOL_SIZE 16#define ADDR_POOL_SIZE 64static int pblk_set_ppaf (struct pblk *pblk)
@@ -247,14 +246,16 @@ static int pblk_core_init(struct pblk *pblk)if (pblk_init_global_caches (pblk))return -ENOMEM ; - pblk->page_pool =mempool_create_page_pool (PAGE_POOL_SIZE ,0 ); -if (!pblk->page_pool) +/* internal bios can be at most the sectors signaled by the device. */ + pblk->page_bio_pool =mempool_create_page_pool (nvm_max_phys_sects (dev), +0 ); +if (!pblk->page_bio_pool)return -ENOMEM ; pblk->line_ws_pool =mempool_create_slab_pool (PBLK_WS_POOL_SIZE , pblk_blk_ws_cache);if (!pblk->line_ws_pool) - goto free_page_pool; + goto free_page_bio_pool; pblk->rec_pool =mempool_create_slab_pool (geo->nr_luns, pblk_rec_cache);if (!pblk->rec_pool)
@@ -309,8 +310,8 @@ static int pblk_core_init(struct pblk *pblk)mempool_destroy (pblk->rec_pool); free_blk_ws_pool:mempool_destroy (pblk->line_ws_pool); -free_page_pool: -mempool_destroy (pblk->page_pool); +free_page_bio_pool: +mempool_destroy (pblk->page_bio_pool);return -ENOMEM ; }
@@ -322,7 +323,7 @@ static void pblk_core_free(struct pblk *pblk)if (pblk->bb_wq)destroy_workqueue (pblk->bb_wq); -mempool_destroy (pblk->page_pool); +mempool_destroy (pblk->page_bio_pool);mempool_destroy (pblk->line_ws_pool);mempool_destroy (pblk->rec_pool);mempool_destroy (pblk->g_rq_pool);
@@ -681,8 +682,8 @@ static int pblk_lines_init(struct pblk *pblk) lm->blk_bitmap_len =BITS_TO_LONGS (geo->nr_luns) *sizeof (long ); lm->sec_bitmap_len =BITS_TO_LONGS (lm->sec_per_line) *sizeof (long ); lm->lun_bitmap_len =BITS_TO_LONGS (geo->nr_luns) *sizeof (long ); - lm->high_thrs = lm->sec_per_line /2 ; - lm->mid_thrs = lm->sec_per_line /4 ; + lm->mid_thrs = lm->sec_per_line /2 ; + lm->high_thrs = lm->sec_per_line /4 ; lm->meta_distance = (geo->nr_luns /2 ) * pblk->min_write_pgs;/* Calculate necessary pages for smeta. See comment over struct
@@ -923,6 +924,7 @@ static void *pblk_init(struct nvm_tgt_dev *dev, struct gendisk *tdisk, pblk->dev = dev; pblk->disk = tdisk; pblk->state =PBLK_STATE_RUNNING ; + pblk->gc.gc_enabled =0 ;spin_lock_init (&pblk->trans_lock);spin_lock_init (&pblk->lock);
@@ -944,6 +946,7 @@ static void *pblk_init(struct nvm_tgt_dev *dev, struct gendisk *tdisk,atomic_long_set (&pblk->recov_writes,0 );atomic_long_set (&pblk->recov_writes,0 );atomic_long_set (&pblk->recov_gc_writes,0 ); +atomic_long_set (&pblk->recov_gc_reads,0 );#endif atomic_long_set (&pblk->read_failed,0 );
drivers/lightnvm/pblk-read.c +6 -3
@@ -238,7 +238,7 @@ static int pblk_fill_partial_read_bio(struct pblk *pblk, struct nvm_rq *rqd,kunmap_atomic (src_p);kunmap_atomic (dst_p); -mempool_free (src_bv.bv_page, pblk->page_pool); +mempool_free (src_bv.bv_page, pblk->page_bio_pool); hole =find_next_zero_bit (read_bitmap, nr_secs, hole +1 ); }while (hole < nr_secs);
@@ -499,7 +499,7 @@ int pblk_submit_read_gc(struct pblk *pblk, u64 *lba_list, void *data, data_len = (*secs_to_gc) * geo->sec_size; bio =pblk_bio_map_addr (pblk, data, *secs_to_gc, data_len, -PBLK_KMALLOC_META ,GFP_KERNEL ); +PBLK_VMALLOC_META ,GFP_KERNEL );if (IS_ERR (bio)) {pr_err ("pblk: could not allocate GC bio (%lu)\n" ,PTR_ERR (bio)); goto err_free_dma;
@@ -519,7 +519,7 @@ int pblk_submit_read_gc(struct pblk *pblk, u64 *lba_list, void *data,if (ret) {bio_endio (bio);pr_err ("pblk: GC read request failed\n" ); - goto err_free_dma; + goto err_free_bio; } if (!wait_for_completion_io_timeout(&wait,
@@ -541,10 +541,13 @@ int pblk_submit_read_gc(struct pblk *pblk, u64 *lba_list, void *data,atomic_long_sub (*secs_to_gc, &pblk->inflight_reads);#endif +bio_put (bio); out:nvm_dev_dma_free (dev->parent, rqd.meta_list, rqd.dma_meta_list);return NVM_IO_OK ; +err_free_bio: +bio_put (bio); err_free_dma:nvm_dev_dma_free (dev->parent, rqd.meta_list, rqd.dma_meta_list);return NVM_IO_ERR ;
drivers/lightnvm/pblk.h +1 -1
@@ -618,7 +618,7 @@ struct pblk {struct list_head compl_list; -mempool_t *page_pool; +mempool_t *page_bio_pool;mempool_t *line_ws_pool;mempool_t *rec_pool;mempool_t *g_rq_pool;
drivers/md/bcache/request.c +5 -1
@@ -463,6 +463,7 @@ struct search { unsigned recoverable:1; unsigned write:1; unsigned read_dirty_data:1; + unsigned cache_missed:1;unsigned long start_time;
@@ -649,6 +650,7 @@ static inline struct search *search_alloc(struct bio *bio, s->orig_bio = bio; s->cache_miss =NULL ; + s->cache_missed =0 ; s->d = d; s->recoverable =1 ; s->write =op_is_write (bio_op (bio));
@@ -767,7 +769,7 @@ static void cached_dev_read_done_bh(struct closure *cl) struct cached_dev *dc = container_of(s->d, struct cached_dev, disk);bch_mark_cache_accounting (s->iop.c, s->d, - !s->cache_miss, s->iop.bypass); + !s->cache_missed, s->iop.bypass);trace_bcache_read (s->orig_bio, !s->cache_miss, s->iop.bypass);if (s->iop.status)
@@ -786,6 +788,8 @@ static int cached_dev_cache_miss(struct btree *b, struct search *s, struct cached_dev *dc = container_of(s->d, struct cached_dev, disk);struct bio *miss, *cache_bio; + s->cache_missed =1 ; +if (s->cache_miss || s->iop.bypass) { miss =bio_next_split (bio, sectors,GFP_NOIO , s->d->bio_split); ret = miss == bio ?MAP_DONE :MAP_CONTINUE ;
drivers/md/bcache/super.c +4 -2
@@ -2085,6 +2085,7 @@ static void bcache_exit(void)if (bcache_major)unregister_blkdev (bcache_major,"bcache" );unregister_reboot_notifier (&reboot); +mutex_destroy (&bch_register_lock); }static int __init bcache_init (void )
@@ -2103,14 +2104,15 @@ static int __init bcache_init(void) bcache_major =register_blkdev (0 ,"bcache" );if (bcache_major <0 ) {unregister_reboot_notifier (&reboot); +mutex_destroy (&bch_register_lock);return bcache_major; }if (!(bcache_wq =alloc_workqueue ("bcache" ,WQ_MEM_RECLAIM ,0 )) || !(bcache_kobj =kobject_create_and_add ("bcache" , fs_kobj)) || -sysfs_create_files (bcache_kobj, files) ||bch_request_init () || -bch_debug_init (bcache_kobj)) +bch_debug_init (bcache_kobj) || +sysfs_create_files (bcache_kobj, files)) goto err;return 0 ;
drivers/md/dm-cache-target.c +6 -6
@@ -3554,18 +3554,18 @@ static int __init dm_cache_init(void) {int r; - r =dm_register_target (&cache_target); -if (r) { -DMERR ("cache target registration failed: %d" , r); -return r; - } - migration_cache =KMEM_CACHE (dm_cache_migration,0 );if (!migration_cache) {dm_unregister_target (&cache_target);return -ENOMEM ; } + r =dm_register_target (&cache_target); +if (r) { +DMERR ("cache target registration failed: %d" , r); +return r; + } +return 0 ; }
drivers/md/dm-mpath.c +9 -9
@@ -1965,13 +1965,6 @@ static int __init dm_multipath_init(void) {int r; - r =dm_register_target (&multipath_target); -if (r <0 ) { -DMERR ("request-based register failed %d" , r); - r = -EINVAL ; - goto bad_register_target; - } - kmultipathd =alloc_workqueue ("kmpathd" ,WQ_MEM_RECLAIM ,0 );if (!kmultipathd) {DMERR ("failed to create workqueue kmpathd" );
@@ -1993,13 +1986,20 @@ static int __init dm_multipath_init(void) goto bad_alloc_kmpath_handlerd; } + r =dm_register_target (&multipath_target); +if (r <0 ) { +DMERR ("request-based register failed %d" , r); + r = -EINVAL ; + goto bad_register_target; + } +return 0 ; +bad_register_target: +destroy_workqueue (kmpath_handlerd); bad_alloc_kmpath_handlerd:destroy_workqueue (kmultipathd); bad_alloc_kmultipathd: -dm_unregister_target (&multipath_target); -bad_register_target:return r; }
drivers/md/dm-snap.c +24 -24
67 lines not on this page · raw message
drivers/md/dm-thin.c +10 -12
@@ -4355,30 +4355,28 @@ static struct target_type thin_target = {static int __init dm_thin_init (void ) { -int r; +int r = -ENOMEM ;pool_table_init (); + _new_mapping_cache =KMEM_CACHE (dm_thin_new_mapping,0 ); +if (!_new_mapping_cache) +return r; + r =dm_register_target (&thin_target);if (r) -return r; + goto bad_new_mapping_cache; r =dm_register_target (&pool_target);if (r) - goto bad_pool_target; - - r = -ENOMEM ; - - _new_mapping_cache =KMEM_CACHE (dm_thin_new_mapping,0 ); -if (!_new_mapping_cache) - goto bad_new_mapping_cache; + goto bad_thin_target;return 0 ; -bad_new_mapping_cache: -dm_unregister_target (&pool_target); -bad_pool_target: +bad_thin_target:dm_unregister_target (&thin_target); +bad_new_mapping_cache: +kmem_cache_destroy (_new_mapping_cache);return r; }
drivers/md/raid1.c +5 -5
@@ -1309,12 +1309,12 @@ static void raid1_write_request(struct mddev *mddev, struct bio *bio,sigset_t full, old;prepare_to_wait (&conf->wait_barrier, &w,TASK_INTERRUPTIBLE ); -if (bio_end_sector (bio) <= mddev->suspend_lo || - bio->bi_iter.bi_sector >= mddev->suspend_hi || - (mddev_is_clustered (mddev) && +if ((bio_end_sector (bio) <= mddev->suspend_lo || + bio->bi_iter.bi_sector >= mddev->suspend_hi) && + (!mddev_is_clustered (mddev) || !md_cluster_ops->area_resyncing (mddev,WRITE , - bio->bi_iter.bi_sector, -bio_end_sector (bio)))) + bio->bi_iter.bi_sector, +bio_end_sector (bio))))break ;sigfillset (&full);sigprocmask (SIG_BLOCK , &full, &old);
drivers/md/raid5-ppl.c +2 -1
@@ -758,7 +758,8 @@ static int ppl_recover_entry(struct ppl_log *log, struct ppl_header_entry *e, (unsigned long long)sector); rdev = conf->disks[dd_idx].rdev; -if (!rdev) { +if (!rdev || (!test_bit (In_sync, &rdev->flags) && + sector >= rdev->recovery_offset)) {pr_debug ("%s:%*s data member disk %d missing\n" , __func__, indent,"" , dd_idx); update_parity = false;
drivers/md/raid5.c +4 -1
@@ -1818,8 +1818,11 @@ static void ops_complete_reconstruct(void *stripe_head_ref)struct r5dev *dev = &sh->dev[i];if (dev->written || i == pd_idx || i == qd_idx) { -if (!discard && !test_bit (R5_SkipCopy, &dev->flags)) +if (!discard && !test_bit (R5_SkipCopy, &dev->flags)) {set_bit (R5_UPTODATE , &dev->flags); +if (test_bit (STRIPE_EXPAND_READY , &sh->state)) +set_bit (R5_Expanded, &dev->flags); + }if (fua)set_bit (R5_WantFUA, &dev->flags);if (sync)
drivers/media/platform/qcom/camss-8x16/camss-vfe.c +3 -0
@@ -622,6 +622,9 @@ static void vfe_set_xbar_cfg(struct vfe_device *vfe, struct vfe_output *output, reg = VFE_0_BUS_XBAR_CFG_x_M_PAIR_STREAM_EN;if (p ==V4L2_PIX_FMT_NV12 || p ==V4L2_PIX_FMT_NV16 ) reg |= VFE_0_BUS_XBAR_CFG_x_M_PAIR_STREAM_SWAP_INTER_INTRA; + }else { +/* On current devices output->wm_num is always <= 2 */ +break ; }if (output->wm_idx[i] %2 ==1 )
drivers/media/usb/usbtv/usbtv-video.c +2 -2
@@ -718,8 +718,8 @@ static int usbtv_s_ctrl(struct v4l2_ctrl *ctrl)*/ if (ctrl->id ==V4L2_CID_BRIGHTNESS || ctrl->id ==V4L2_CID_CONTRAST ) { ret =usb_control_msg (usbtv->udev, -usb_sndctrlpipe (usbtv->udev,0 ),USBTV_CONTROL_REG , -USB_DIR_OUT |USB_TYPE_VENDOR |USB_RECIP_DEVICE , +usb_rcvctrlpipe (usbtv->udev,0 ),USBTV_CONTROL_REG , +USB_DIR_IN |USB_TYPE_VENDOR |USB_RECIP_DEVICE ,0 ,USBTV_BASE +0x0244 , (void *)data,3 ,0 );if (ret <0 ) goto error;
drivers/mfd/fsl-imx25-tsadc.c +14 -0
@@ -180,6 +180,19 @@ static int mx25_tsadc_probe(struct platform_device *pdev)return devm_of_platform_populate (dev); } +static int mx25_tsadc_remove (struct platform_device *pdev) +{ +struct mx25_tsadc *tsadc =platform_get_drvdata (pdev); +int irq =platform_get_irq (pdev,0 ); + +if (irq) { +irq_set_chained_handler_and_data (irq,NULL ,NULL ); +irq_domain_remove (tsadc->domain); + } + +return 0 ; +} +static const struct of_device_id mx25_tsadc_ids[] = { { .compatible ="fsl,imx25-tsadc" }, {/* Sentinel */ }
@@ -192,6 +205,7 @@ static struct platform_driver mx25_tsadc_driver = { .of_match_table = of_match_ptr(mx25_tsadc_ids), }, .probe = mx25_tsadc_probe, + .remove = mx25_tsadc_remove, };module_platform_driver (mx25_tsadc_driver);
drivers/mfd/mxs-lradc.c +4 -2
@@ -196,8 +196,10 @@ static int mxs_lradc_probe(struct platform_device *pdev)platform_set_drvdata (pdev, lradc); res =platform_get_resource (pdev,IORESOURCE_MEM ,0 ); -if (!res) -return -ENOMEM ; +if (!res) { + ret = -ENOMEM ; + goto err_clk; + }switch (lradc->soc) {case IMX23_LRADC :
drivers/misc/eeprom/at24.c +1 -1
@@ -776,7 +776,7 @@ static int at24_probe(struct i2c_client *client, const struct i2c_device_id *id) at24->nvmem_config.reg_read = at24_read; at24->nvmem_config.reg_write = at24_write; at24->nvmem_config.priv = at24; - at24->nvmem_config.stride =4 ; + at24->nvmem_config.stride =1 ; at24->nvmem_config.word_size =1 ; at24->nvmem_config.size = chip.byte_len;
drivers/misc/pci_endpoint_test.c +4 -0
@@ -533,6 +533,7 @@ static int pci_endpoint_test_probe(struct pci_dev *pdev, test->base = test->bar[test_reg_bar];if (!test->base) { + err = -ENOMEM ;dev_err (dev,"Cannot perform PCI test without BAR%d\n" , test_reg_bar); goto err_iounmap;
@@ -542,6 +543,7 @@ static int pci_endpoint_test_probe(struct pci_dev *pdev, id =ida_simple_get (&pci_endpoint_test_ida,0 ,0 ,GFP_KERNEL );if (id <0 ) { + err = id;dev_err (dev,"unable to get id\n" ); goto err_iounmap; }
@@ -588,6 +590,8 @@ static void pci_endpoint_test_remove(struct pci_dev *pdev)if (sscanf (misc_device->name,DRV_MODULE_NAME ".%d" , &id) !=1 )return ; +if (id <0 ) +return ;misc_deregister (&test->miscdev);ida_simple_remove (&pci_endpoint_test_ida, id);
drivers/mmc/core/card.h +2 -0
@@ -75,9 +75,11 @@ struct mmc_fixup {#define EXT_CSD_REV_ANY (-1u)#define CID_MANFID_SANDISK 0x2 +#define CID_MANFID_ATP 0x9#define CID_MANFID_TOSHIBA 0x11#define CID_MANFID_MICRON 0x13#define CID_MANFID_SAMSUNG 0x15 +#define CID_MANFID_APACER 0x27#define CID_MANFID_KINGSTON 0x70#define CID_MANFID_HYNIX 0x90
drivers/mmc/core/quirks.h +8 -0
@@ -52,6 +52,14 @@ static const struct mmc_fixup mmc_blk_fixups[] = {MMC_FIXUP ("MMC32G" ,CID_MANFID_TOSHIBA ,CID_OEMID_ANY , add_quirk_mmc,MMC_QUIRK_BLK_NO_CMD23 ), +/* +* Some SD cards lockup while using CMD23 multiblock transfers. +*/ +MMC_FIXUP ("AF SD" ,CID_MANFID_ATP ,CID_OEMID_ANY , add_quirk_sd, +MMC_QUIRK_BLK_NO_CMD23 ), +MMC_FIXUP ("APUSD" ,CID_MANFID_APACER ,0x5048 , add_quirk_sd, + MMC_QUIRK_BLK_NO_CMD23), +/* * Some MMC cards need longer data read timeout than indicated in CSD. */
drivers/mtd/spi-nor/stm32-quadspi.c +2 -2
@@ -240,12 +240,12 @@ static int stm32_qspi_tx_poll(struct stm32_qspi *qspi, STM32_QSPI_FIFO_TIMEOUT_US);if (ret) {dev_err (qspi->dev,"fifo timeout (stat:%#x)\n" , sr); -break ; +return ret; }tx_fifo (buf++, qspi->io_base +QUADSPI_DR ); } -return ret; +return 0 ; } static int stm32_qspi_tx_mm(struct stm32_qspi *qspi,
drivers/net/dsa/lan9303-core.c +1 -1
@@ -569,7 +569,7 @@ static int lan9303_disable_processing(struct lan9303 *chip) {int p; -for (p =0 ; p <LAN9303_NUM_PORTS ; p++) { +for (p =1 ; p <LAN9303_NUM_PORTS ; p++) {int ret =lan9303_disable_processing_port (chip, p);if (ret)
drivers/net/ethernet/cavium/liquidio/lio_vf_main.c +3 -3
@@ -1289,6 +1289,9 @@ static int liquidio_stop(struct net_device *netdev)struct octeon_device *oct = lio->oct_dev;struct napi_struct *napi, *n; +/* tell Octeon to stop forwarding packets to host */ +send_rx_ctrl_cmd (lio,0 ); +if (oct->props[lio->ifidx].napi_enabled) {list_for_each_entry_safe (napi, n, &netdev->napi_list, dev_list)napi_disable (napi);
@@ -1306,9 +1309,6 @@ static int liquidio_stop(struct net_device *netdev)netif_carrier_off (netdev); lio->link_changes++; -/* tell Octeon to stop forwarding packets to host */ -send_rx_ctrl_cmd (lio,0 ); -ifstate_reset (lio,LIO_IFSTATE_RUNNING );txqs_stop (netdev);
drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c +9 -3
@@ -3981,7 +3981,7 @@ static int hclge_init_client_instance(struct hnae3_client *client, vport->roce.client = client; } -if (hdev->roce_client) { +if (hdev->roce_client && hdev->nic_client) { ret =hclge_init_roce_base_info (vport);if (ret) goto err;
@@ -4007,13 +4007,19 @@ static void hclge_uninit_client_instance(struct hnae3_client *client,for (i =0 ; i < hdev->num_vmdq_vport +1 ; i++) { vport = &hdev->vport[i]; -if (hdev->roce_client) +if (hdev->roce_client) { hdev->roce_client->ops->uninit_instance (&vport->roce,0 ); + hdev->roce_client =NULL ; + vport->roce.client =NULL ; + }if (client->type ==HNAE3_CLIENT_ROCE )return ; -if (client->ops->uninit_instance) +if (client->ops->uninit_instance) { client->ops->uninit_instance (&vport->nic,0 ); + hdev->nic_client =NULL ; + vport->nic.client =NULL ; + } } }
drivers/net/ethernet/hisilicon/hns3/hns3pf/hns3_enet.c +7 -8
@@ -721,7 +721,7 @@ static void hns3_set_txbd_baseinfo(u16 *bdtp_fe_sc_vld_ra_ri, int frag_end) HNS3_TXD_BDTYPE_M, 0);hnae_set_bit (*bdtp_fe_sc_vld_ra_ri,HNS3_TXD_FE_B , !!frag_end);hnae_set_bit (*bdtp_fe_sc_vld_ra_ri,HNS3_TXD_VLD_B ,1 ); -hnae_set_field (*bdtp_fe_sc_vld_ra_ri,HNS3_TXD_SC_M ,HNS3_TXD_SC_S ,1 ); +hnae_set_field (*bdtp_fe_sc_vld_ra_ri,HNS3_TXD_SC_M ,HNS3_TXD_SC_S ,0 ); } static int hns3_fill_desc(struct hns3_enet_ring *ring, void *priv,
@@ -1546,7 +1546,7 @@ static int hns3_reserve_buffer_map(struct hns3_enet_ring *ring,return 0 ; out_with_buf: -hns3_free_buffers (ring); +hns3_free_buffer (ring, cb); out:return ret; }
@@ -1586,7 +1586,7 @@ static int hns3_alloc_ring_buffers(struct hns3_enet_ring *ring)static void hns3_replace_buffer (struct hns3_enet_ring *ring,int i,struct hns3_desc_cb *res_cb) { -hns3_map_buffer (ring, &ring->desc_cb[i]); +hns3_unmap_buffer (ring, &ring->desc_cb[i]); ring->desc_cb[i] = *res_cb; ring->desc[i].addr =cpu_to_le64 (ring->desc_cb[i].dma); }
@@ -2460,9 +2460,8 @@ static int hns3_nic_uninit_vector_data(struct hns3_nic_priv *priv) (void )irq_set_affinity_hint ( priv->tqp_vector[i].vector_irq,NULL ); -devm_free_irq (&pdev->dev, - priv->tqp_vector[i].vector_irq, - &priv->tqp_vector[i]); +free_irq (priv->tqp_vector[i].vector_irq, + &priv->tqp_vector[i]); } priv->ring_data[i].ring->irq_init_flag =HNS3_VECTOR_NOT_INITED ;
@@ -2489,16 +2488,16 @@ static int hns3_ring_get_cfg(struct hnae3_queue *q, struct hns3_nic_priv *priv,if (ring_type ==HNAE3_RING_TYPE_TX ) { ring_data[q->tqp_index].ring = ring; + ring_data[q->tqp_index].queue_index = q->tqp_index; ring->io_base = (u8 __iomem *)q->io_base +HNS3_TX_REG_OFFSET ; }else { ring_data[q->tqp_index + queue_num].ring = ring; + ring_data[q->tqp_index + queue_num].queue_index = q->tqp_index; ring->io_base = q->io_base; }hnae_set_bit (ring->flag,HNAE3_RING_TYPE_B , ring_type); - ring_data[q->tqp_index].queue_index = q->tqp_index; - ring->tqp = q; ring->desc =NULL ; ring->desc_cb =NULL ;
drivers/net/ethernet/hisilicon/hns3/hns3pf/hns3_ethtool.c +3 -0
@@ -375,6 +375,9 @@ static int hns3_get_link_ksettings(struct net_device *netdev,break ; } +if (!cmd->base.autoneg) + advertised_caps &= ~HNS3_LM_AUTONEG_BIT ; +/* now, map driver link modes to ethtool link modes */ hns3_driv_to_eth_caps (supported_caps, cmd, false);hns3_driv_to_eth_caps (advertised_caps, cmd, true);
drivers/net/ethernet/mellanox/mlxsw/spectrum.c +1 -0
@@ -2974,6 +2974,7 @@ static int mlxsw_sp_port_create(struct mlxsw_sp *mlxsw_sp, u8 local_port,if (IS_ERR (mlxsw_sp_port_vlan)) {dev_err (mlxsw_sp->bus_info->dev,"Port %d: Failed to create VID 1\n" , mlxsw_sp_port->local_port); + err =PTR_ERR (mlxsw_sp_port_vlan); goto err_port_vlan_get; }
drivers/net/ethernet/sfc/ef10.c +1 -1
@@ -5726,7 +5726,7 @@ static int efx_ef10_set_mac_address(struct efx_nic *efx)* MCFW do not support VFs. */ rc =efx_ef10_vport_set_mac_address (efx); - }else { + }else if (rc) {efx_mcdi_display_error (efx,MC_CMD_VADAPTOR_SET_MAC ,sizeof (inbuf),NULL ,0 , rc); }
drivers/net/macvlan.c +1 -1
@@ -480,7 +480,7 @@ static rx_handler_result_t macvlan_handle_frame(struct sk_buff **pskb) struct macvlan_dev, list); else vlan =macvlan_hash_lookup (port, eth->h_dest); -if (vlan ==NULL ) +if (!vlan || vlan->mode ==MACVLAN_MODE_SOURCE )return RX_HANDLER_PASS ; dev = vlan->dev;
drivers/net/ppp/ppp_generic.c +1 -0
@@ -959,6 +959,7 @@ static __net_exit void ppp_exit_net(struct net *net)unregister_netdevice_many (&list);rtnl_unlock (); +mutex_destroy (&pn->all_ppp_mutex);idr_destroy (&pn->units_idr); }
drivers/net/wireless/ath/ath10k/pci.c +14 -15
@@ -2577,9 +2577,13 @@ void ath10k_pci_hif_power_down(struct ath10k *ar)*/ } -#ifdef CONFIG_PM -static int ath10k_pci_hif_suspend (struct ath10k *ar) +{ +/* Nothing to do; the important stuff is in the driver suspend. */ +return 0 ; +} + +static int ath10k_pci_suspend (struct ath10k *ar) {/* The grace timer can still be counting down and ar->ps_awake be true. * It is known that the device may be asleep after resuming regardless
@@ -2592,6 +2596,12 @@ static int ath10k_pci_hif_suspend(struct ath10k *ar) }static int ath10k_pci_hif_resume (struct ath10k *ar) +{ +/* Nothing to do; the important stuff is in the driver resume. */ +return 0 ; +} + +static int ath10k_pci_resume (struct ath10k *ar) {struct ath10k_pci *ar_pci =ath10k_pci_priv (ar);struct pci_dev *pdev = ar_pci->pdev;
@@ -2615,7 +2625,6 @@ static int ath10k_pci_hif_resume(struct ath10k *ar)return ret; } -#endif static bool ath10k_pci_validate_cal (void *data,size_t size) {
@@ -2770,10 +2779,8 @@ static const struct ath10k_hif_ops ath10k_pci_hif_ops = { .power_down = ath10k_pci_hif_power_down, .read32 = ath10k_pci_read32, .write32 = ath10k_pci_write32, -#ifdef CONFIG_PM .suspend = ath10k_pci_hif_suspend, .resume = ath10k_pci_hif_resume, -#endif .fetch_cal_eeprom = ath10k_pci_hif_fetch_cal_eeprom, };
@@ -3401,11 +3408,7 @@ static __maybe_unused int ath10k_pci_pm_suspend(struct device *dev)struct ath10k *ar =dev_get_drvdata (dev);int ret; -if (test_bit (ATH10K_FW_FEATURE_WOWLAN_SUPPORT , - ar->running_fw->fw_file.fw_features)) -return 0 ; - - ret =ath10k_hif_suspend (ar); + ret =ath10k_pci_suspend (ar);if (ret)ath10k_warn (ar,"failed to suspend hif: %d\n" , ret);
@@ -3417,11 +3420,7 @@ static __maybe_unused int ath10k_pci_pm_resume(struct device *dev)struct ath10k *ar =dev_get_drvdata (dev);int ret; -if (test_bit (ATH10K_FW_FEATURE_WOWLAN_SUPPORT , - ar->running_fw->fw_file.fw_features)) -return 0 ; - - ret =ath10k_hif_resume (ar); + ret =ath10k_pci_resume (ar);if (ret)ath10k_warn (ar,"failed to resume hif: %d\n" , ret);
drivers/net/wireless/ath/ath9k/tx99.c +5 -0
@@ -179,6 +179,9 @@ static ssize_t write_file_tx99(struct file *file, const char __user *user_buf,ssize_t len;int r; +if (count <1 ) +return -EINVAL ; +if (sc->cur_chan->nvifs >1 )return -EOPNOTSUPP ;
@@ -186,6 +189,8 @@ static ssize_t write_file_tx99(struct file *file, const char __user *user_buf,if (copy_from_user (buf, user_buf, len))return -EFAULT ; + buf[len] ='\0' ; +if (strtobool (buf, &start))return -EINVAL ;
drivers/net/wireless/quantenna/qtnfmac/pearl/pcie.c +1 -1
@@ -643,11 +643,11 @@ static int qtnf_tx_queue_ready(struct qtnf_pcie_bus_priv *priv) {if (!CIRC_SPACE (priv->tx_bd_w_index, priv->tx_bd_r_index, priv->tx_bd_num)) { -pr_err_ratelimited ("reclaim full Tx queue\n" );qtnf_pcie_data_tx_reclaim (priv);if (!CIRC_SPACE (priv->tx_bd_w_index, priv->tx_bd_r_index, priv->tx_bd_num)) { +pr_warn_ratelimited ("reclaim full Tx queue\n" ); priv->tx_full_count++;return 0 ; }
drivers/nvme/host/core.c +2 -1
@@ -2299,7 +2299,8 @@ static struct nvme_ns *nvme_find_get_ns(struct nvme_ctrl *ctrl, unsigned nsid)mutex_lock (&ctrl->namespaces_mutex);list_for_each_entry (ns, &ctrl->namespaces, list) {if (ns->ns_id == nsid) { -kref_get (&ns->kref); +if (!kref_get_unless_zero (&ns->kref)) +continue ; ret = ns;break ; }
drivers/pci/pcie/pme.c +4 -1
@@ -226,6 +226,9 @@ static void pcie_pme_work_fn(struct work_struct *work)break ;pcie_capability_read_dword (port,PCI_EXP_RTSTA , &rtsta); +if (rtsta == (u32 ) ~0 ) +break ; +if (rtsta &PCI_EXP_RTSTA_PME ) {/* * Clear PME status of the port. If there are other
@@ -273,7 +276,7 @@ static irqreturn_t pcie_pme_irq(int irq, void *context)spin_lock_irqsave (&data->lock, flags);pcie_capability_read_dword (port,PCI_EXP_RTSTA , &rtsta); -if (!(rtsta &PCI_EXP_RTSTA_PME )) { +if (rtsta == (u32 ) ~0 || !(rtsta &PCI_EXP_RTSTA_PME )) {spin_unlock_irqrestore (&data->lock, flags);return IRQ_NONE ; }
drivers/pci/probe.c +6 -1
@@ -1076,7 +1076,8 @@ int pci_scan_bridge(struct pci_bus *bus, struct pci_dev *dev, int max, int pass) child =pci_add_new_bus (bus, dev, max+1 );if (!child) goto out; -pci_bus_insert_busn_res (child, max+1 ,0xff ); +pci_bus_insert_busn_res (child, max+1 , + bus->busn_res.end); } max++; buses = (buses &0xff000000 )
@@ -2433,6 +2434,10 @@ unsigned int pci_scan_child_bus(struct pci_bus *bus)if (bus->self && bus->self->is_hotplug_bridge && pci_hotplug_bus_size) {if (max - bus->busn_res.start < pci_hotplug_bus_size -1 ) max = bus->busn_res.start + pci_hotplug_bus_size -1 ; + +/* Do not allocate more buses than we have room left */ +if (max > bus->busn_res.end) + max = bus->busn_res.end; }/*
drivers/pci/remove.c +1 -1
@@ -19,9 +19,9 @@ static void pci_stop_dev(struct pci_dev *dev)pci_pme_active (dev, false);if (dev->is_added) { +device_release_driver (&dev->dev);pci_proc_detach_device (dev);pci_remove_sysfs_dev_files (dev); -device_release_driver (&dev->dev); dev->is_added =0 ; }
drivers/pinctrl/Kconfig +2 -1
@@ -33,7 +33,8 @@ config DEBUG_PINCTRL config PINCTRL_ADI2 bool "ADI pin controller driver" - depends on BLACKFIN + depends on (BF54x || BF60x) + depends on !GPIO_ADI select PINMUX select IRQ_DOMAIN help
drivers/platform/x86/hp_accel.c +1 -0
@@ -240,6 +240,7 @@ static const struct dmi_system_id lis3lv02d_dmi_ids[] = {AXIS_DMI_MATCH ("HDX18" ,"HP HDX 18" , x_inverted),AXIS_DMI_MATCH ("HPB432x" ,"HP ProBook 432" , xy_rotated_left),AXIS_DMI_MATCH ("HPB440G3" ,"HP ProBook 440 G3" , x_inverted_usd), +AXIS_DMI_MATCH ("HPB440G4" ,"HP ProBook 440 G4" , x_inverted),AXIS_DMI_MATCH ("HPB442x" ,"HP ProBook 442" , xy_rotated_left),AXIS_DMI_MATCH ("HPB452x" ,"HP ProBook 452" , y_inverted), AXIS_DMI_MATCH("HPB522x", "HP ProBook 522", xy_swap),
drivers/platform/x86/intel_punit_ipc.c +4 -4
@@ -252,28 +252,28 @@ static int intel_punit_get_bars(struct platform_device *pdev)* - GTDRIVER_IPC BASE_IFACE */ res =platform_get_resource (pdev,IORESOURCE_MEM ,2 ); -if (res) { +if (res &&resource_size (res) >1 ) { addr =devm_ioremap_resource (&pdev->dev, res);if (!IS_ERR (addr)) punit_ipcdev->base[ISPDRIVER_IPC ][BASE_DATA ] = addr; } res =platform_get_resource (pdev,IORESOURCE_MEM ,3 ); -if (res) { +if (res &&resource_size (res) >1 ) { addr =devm_ioremap_resource (&pdev->dev, res);if (!IS_ERR (addr)) punit_ipcdev->base[ISPDRIVER_IPC ][BASE_IFACE ] = addr; } res =platform_get_resource (pdev,IORESOURCE_MEM ,4 ); -if (res) { +if (res &&resource_size (res) >1 ) { addr =devm_ioremap_resource (&pdev->dev, res);if (!IS_ERR (addr)) punit_ipcdev->base[GTDRIVER_IPC ][BASE_DATA ] = addr; } res =platform_get_resource (pdev,IORESOURCE_MEM ,5 ); -if (res) { +if (res &&resource_size (res) >1 ) { addr =devm_ioremap_resource (&pdev->dev, res);if (!IS_ERR (addr)) punit_ipcdev->base[GTDRIVER_IPC ][BASE_IFACE ] = addr;
drivers/rpmsg/qcom_glink_native.c +1 -0
@@ -227,6 +227,7 @@ static struct glink_channel *qcom_glink_alloc_channel(struct qcom_glink *glink,init_completion (&channel->open_req);init_completion (&channel->open_ack); +init_completion (&channel->intent_req_comp);INIT_LIST_HEAD (&channel->done_intents);INIT_WORK (&channel->intent_work, qcom_glink_rx_done_work);
drivers/rtc/rtc-pcf8563.c +1 -1
@@ -422,7 +422,7 @@ static unsigned long pcf8563_clkout_recalc_rate(struct clk_hw *hw,return 0 ; buf &=PCF8563_REG_CLKO_F_MASK ; -return clkout_rates[ret]; +return clkout_rates[buf]; } static long pcf8563_clkout_round_rate(struct clk_hw *hw, unsigned long rate,
drivers/scsi/aacraid/commsup.c +13 -13
@@ -2383,19 +2383,19 @@ static int aac_send_wellness_command(struct aac_dev *dev, char *wellness_str, goto out; } -int aac_send_safw_hostttime (struct aac_dev *dev,struct timeval *now) +int aac_send_safw_hostttime (struct aac_dev *dev,struct timespec64 *now) {struct tm cur_tm;char wellness_str[] ="<HW>TD\010\0\0\0\0\0\0\0\0\0DW\0\0ZZ" ;u32 datasize =sizeof (wellness_str); -unsigned long local_time; +time64_t local_time;int ret = -ENODEV ;if (!dev->sa_firmware) goto out; - local_time = (u32)(now->tv_sec - (sys_tz.tz_minuteswest *60 )); -time_to_tm (local_time,0 , &cur_tm); + local_time = (now->tv_sec - (sys_tz.tz_minuteswest *60 )); +time64_to_tm (local_time,0 , &cur_tm); cur_tm.tm_mon +=1 ; cur_tm.tm_year +=1900 ; wellness_str[8 ] =bin2bcd (cur_tm.tm_hour);
@@ -2412,7 +2412,7 @@ int aac_send_safw_hostttime(struct aac_dev *dev, struct timeval *now)return ret; } -int aac_send_hosttime (struct aac_dev *dev,struct timeval *now) +int aac_send_hosttime (struct aac_dev *dev,struct timespec64 *now) {int ret = -ENOMEM ;struct fib *fibptr;
@@ -2424,7 +2424,7 @@ int aac_send_hosttime(struct aac_dev *dev, struct timeval *now)aac_fib_init (fibptr); info = (__le32 *)fib_data (fibptr); - *info =cpu_to_le32 (now->tv_sec); + *info =cpu_to_le32 (now->tv_sec);/* overflow in y2106 */ ret =aac_fib_send (SendHostTime, fibptr,sizeof (*info), FsaNormal,1 ,1 ,NULL ,NULL );
@@ -2496,7 +2496,7 @@ int aac_command_thread(void *data) }if (!time_before (next_check_jiffies,next_jiffies) && ((difference = next_jiffies - jiffies) <=0 )) { -struct timeval now; +struct timespec64 now;int ret;/* Don't even try to talk to adapter if its sick */
@@ -2506,15 +2506,15 @@ int aac_command_thread(void *data) next_check_jiffies = jiffies + ((long )(unsigned )check_interval) *HZ ; -do_gettimeofday (&now); +ktime_get_real_ts64 (&now);/* Synchronize our watches */ -if (((1000000 - (1000000 /HZ )) > now.tv_usec) - && (now.tv_usec > (1000000 /HZ ))) - difference = (((1000000 - now.tv_usec) *HZ ) - +500000 ) /1000000 ; +if (((NSEC_PER_SEC - (NSEC_PER_SEC /HZ )) > now.tv_nsec) + && (now.tv_nsec > (NSEC_PER_SEC /HZ ))) + difference = (((NSEC_PER_SEC - now.tv_nsec) *HZ ) + +NSEC_PER_SEC /2 ) /NSEC_PER_SEC ;else { -if (now.tv_usec >500000 ) +if (now.tv_nsec >NSEC_PER_SEC /2 ) ++now.tv_sec;if (dev->sa_firmware)
drivers/scsi/bfa/bfad_debugfs.c +3 -2
@@ -255,7 +255,8 @@ bfad_debugfs_write_regrd(struct file *file, const char __user *buf,struct bfad_s *bfad = port->bfad;struct bfa_s *bfa = &bfad->bfa;struct bfa_ioc_s *ioc = &bfa->ioc; -int addr, len, rc, i; +int addr, rc, i; +u32 len;u32 *regbuf;void __iomem *rb, *reg_addr;unsigned long flags;
@@ -266,7 +267,7 @@ bfad_debugfs_write_regrd(struct file *file, const char __user *buf,return PTR_ERR (kern_buf); rc =sscanf (kern_buf,"%x:%x" , &addr, &len); -if (rc <2 ) { +if (rc <2 || len > (UINT_MAX >>2 )) {printk (KERN_INFO "bfad[%d]: %s failed to read user buf\n" , bfad->inst_no, __func__);
drivers/scsi/hisi_sas/hisi_sas_main.c +6 -3
@@ -185,13 +185,16 @@ void hisi_sas_slot_task_free(struct hisi_hba *hisi_hba, struct sas_task *task,struct domain_device *device = task->dev;struct hisi_sas_device *sas_dev = device->lldd_dev; +if (!task->lldd_task) +return ; + + task->lldd_task =NULL ; +if (!sas_protocol_ata (task->task_proto))if (slot->n_elem)dma_unmap_sg (dev, task->scatter, slot->n_elem, task->data_dir); - task->lldd_task =NULL ; -if (sas_dev)atomic64_dec (&sas_dev->running_req); }
@@ -199,8 +202,8 @@ void hisi_sas_slot_task_free(struct hisi_hba *hisi_hba, struct sas_task *task,if (slot->buf)dma_pool_free (hisi_hba->buffer_pool, slot->buf, slot->buf_dma); -list_del_init (&slot->entry); + slot->buf =NULL ; slot->task =NULL ; slot->port =NULL ;hisi_sas_slot_index_free (hisi_hba, slot->idx);
drivers/scsi/hpsa.c +3 -3
@@ -8684,6 +8684,8 @@ static void hpsa_remove_one(struct pci_dev *pdev)destroy_workqueue (h->rescan_ctlr_wq);destroy_workqueue (h->resubmit_wq); +hpsa_delete_sas_host (h); +/* * Call before disabling interrupts. * scsi_remove_host can trigger I/O operations especially
@@ -8718,8 +8720,6 @@ static void hpsa_remove_one(struct pci_dev *pdev) h->lockup_detected =NULL ;/* init_one 2 */ /* (void) pci_disable_pcie_error_reporting(pdev); */ /* init_one 1 */ -hpsa_delete_sas_host (h); -kfree (h);/* init_one 1 */ }
@@ -9207,9 +9207,9 @@ static void hpsa_free_sas_phy(struct hpsa_sas_phy *hpsa_sas_phy)struct sas_phy *phy = hpsa_sas_phy->phy;sas_port_delete_phy (hpsa_sas_phy->parent_port->port, phy); -sas_phy_free (phy);if (hpsa_sas_phy->added_to_port)list_del (&hpsa_sas_phy->phy_list_entry); +sas_phy_delete (phy);kfree (hpsa_sas_phy); }
drivers/scsi/libsas/sas_expander.c +5 -5
@@ -2145,7 +2145,7 @@ void sas_smp_handler(struct bsg_job *job, struct Scsi_Host *shost, struct sas_rphy *rphy) {struct domain_device *dev; -unsigned int reslen =0 ; +unsigned int rcvlen =0 ;int ret = -EINVAL ;/* no rphy means no smp target support (ie aic94xx host) */
@@ -2179,12 +2179,12 @@ void sas_smp_handler(struct bsg_job *job, struct Scsi_Host *shost, ret =smp_execute_task_sg (dev, job->request_payload.sg_list, job->reply_payload.sg_list); -if (ret >0 ) { -/* positive number is the untransferred residual */ - reslen = ret; +if (ret >=0 ) { +/* bsg_job_done() requires the length received */ + rcvlen = job->reply_payload.payload_len - ret; ret =0 ; } out: -bsg_job_done (job, ret, reslen); +bsg_job_done (job, ret, rcvlen); }
drivers/scsi/scsi_debug.c +3 -3
@@ -3001,11 +3001,11 @@ static int resp_write_same(struct scsi_cmnd *scp, u64 lba, u32 num,if (-1 == ret) {write_unlock_irqrestore (&atomic_rw, iflags);return DID_ERROR <<16 ; - }else if (sdebug_verbose && (ret < (num * sdebug_sector_size))) + }else if (sdebug_verbose && !ndob && (ret < sdebug_sector_size))sdev_printk (KERN_INFO , scp->device, -"%s: %s: cdb indicated=%u, IO sent=%d bytes\n" , +"%s: %s: lb size=%u, IO sent=%d bytes\n" , my_name,"write same" , - num * sdebug_sector_size, ret); + sdebug_sector_size, ret);/* Copy first sector to remaining blocks */ for (i =1 ; i < num ; i++)
drivers/scsi/scsi_debugfs.c +4 -2
@@ -8,9 +8,11 @@ void scsi_show_rq(struct seq_file *m, struct request *rq) {struct scsi_cmnd *cmd =container_of (scsi_req (rq),typeof (*cmd), req);int msecs =jiffies_to_msecs (jiffies - cmd->jiffies_at_alloc); -char buf[80 ]; +const u8 *const cdb =READ_ONCE (cmd->cmnd); +char buf[80 ] ="(?)" ; -__scsi_format_command (buf,sizeof (buf), cmd->cmnd, cmd->cmd_len); +if (cdb) +__scsi_format_command (buf,sizeof (buf), cdb, cmd->cmd_len);seq_printf (m,", .cmd=%s, .retries=%d, allocated %d.%03d s ago" , buf, cmd->retries, msecs /1000 , msecs %1000 ); }
drivers/scsi/scsi_devinfo.c +1 -1
@@ -161,7 +161,7 @@ static struct { {"DGC", "RAID", NULL, BLIST_SPARSELUN}, /* Dell PV 650F, storage on LUN 0 */ {"DGC", "DISK", NULL, BLIST_SPARSELUN}, /* Dell PV 650F, no storage on LUN 0 */ {"EMC", "Invista", "*", BLIST_SPARSELUN | BLIST_LARGELUN}, - {"EMC", "SYMMETRIX", NULL, BLIST_SPARSELUN | BLIST_LARGELUN | BLIST_FORCELUN}, + {"EMC", "SYMMETRIX", NULL, BLIST_SPARSELUN | BLIST_LARGELUN | BLIST_REPORTLUN2}, {"EMULEX", "MD21/S2 ESDI", NULL, BLIST_SINGLELUN}, {"easyRAID", "16P", NULL, BLIST_NOREPORTLUN}, {"easyRAID", "X6P", NULL, BLIST_NOREPORTLUN},
drivers/scsi/sd.c +13 -3
@@ -231,11 +231,15 @@ manage_start_stop_store(struct device *dev, struct device_attribute *attr, {struct scsi_disk *sdkp =to_scsi_disk (dev);struct scsi_device *sdp = sdkp->device; +bool v;if (!capable (CAP_SYS_ADMIN ))return -EACCES ; - sdp->manage_start_stop =simple_strtoul (buf,NULL ,10 ); +if (kstrtobool (buf, &v)) +return -EINVAL ; + + sdp->manage_start_stop = v;return count; }
@@ -253,6 +257,7 @@ static ssize_t allow_restart_store(struct device *dev, struct device_attribute *attr, const char *buf, size_t count) { + bool v;struct scsi_disk *sdkp =to_scsi_disk (dev);struct scsi_device *sdp = sdkp->device;
@@ -262,7 +267,10 @@ allow_restart_store(struct device *dev, struct device_attribute *attr,if (sdp->type !=TYPE_DISK && sdp->type !=TYPE_ZBC )return -EINVAL ; - sdp->allow_restart =simple_strtoul (buf,NULL ,10 ); +if (kstrtobool (buf, &v)) +return -EINVAL ; + + sdp->allow_restart = v;return count; }
@@ -1284,6 +1292,7 @@ static int sd_init_command(struct scsi_cmnd *cmd)static void sd_uninit_command (struct scsi_cmnd *SCpnt) {struct request *rq = SCpnt->request; +u8 *cmnd;if (SCpnt->flags &SCMD_ZONE_WRITE_LOCK )sd_zbc_write_unlock_zone (SCpnt);
@@ -1292,9 +1301,10 @@ static void sd_uninit_command(struct scsi_cmnd *SCpnt)__free_page (rq->special_vec.bv_page);if (SCpnt->cmnd !=scsi_req (rq)->cmd) { -mempool_free (SCpnt->cmnd, sd_cdb_pool); + cmnd = SCpnt->cmnd; SCpnt->cmnd =NULL ; SCpnt->cmd_len =0 ; +mempool_free (cmnd, sd_cdb_pool); } }
drivers/soc/mediatek/mtk-pmic-wrap.c +1 -1
@@ -522,7 +522,7 @@ struct pmic_wrapper_type {u32 int_en_all;u32 spi_w;u32 wdt_src; - int has_bridge:1; + unsigned int has_bridge:1;int (*init_reg_clock)(struct pmic_wrapper *wrp);int (*init_soc_specific)(struct pmic_wrapper *wrp); };
drivers/staging/rtl8188eu/core/rtw_ap.c +1 -1
@@ -754,7 +754,7 @@ static void start_bss_network(struct adapter *padapter, u8 *pbuf) }/* setting only at first time */ -if (!(pmlmepriv->cur_network.join_res)) { +if (pmlmepriv->cur_network.join_res != true) {/* WEP Key will be set before this function, do not * clear CAM. */
drivers/staging/rtl8188eu/core/rtw_cmd.c +2 -2
@@ -333,7 +333,7 @@ u8 rtw_createbss_cmd(struct adapter *padapter)else RT_TRACE (_module_rtl871x_cmd_c_, _drv_info_, (" createbss for SSid:%s\n" , pmlmepriv->assoc_ssid.Ssid)); - pcmd =kzalloc (sizeof (struct cmd_obj ),GFP_KERNEL ); + pcmd =kzalloc (sizeof (struct cmd_obj ),GFP_ATOMIC );if (!pcmd) { res = _FAIL; goto exit;
@@ -508,7 +508,7 @@ u8 rtw_disassoc_cmd(struct adapter *padapter, u32 deauth_timeout_ms, bool enqueuif (enqueue) {/* need enqueue, prepare cmd_obj and enqueue */ - cmdobj =kzalloc (sizeof (*cmdobj),GFP_KERNEL ); + cmdobj =kzalloc (sizeof (*cmdobj),GFP_ATOMIC );if (!cmdobj) { res = _FAIL;kfree (param);
drivers/staging/vt6655/device_main.c +2 -1
@@ -1693,10 +1693,11 @@ static int vt6655_suspend(struct pci_dev *pcid, pm_message_t state)MACbShutdown (priv);pci_disable_device (pcid); -pci_set_power_state (pcid,pci_choose_state (pcid, state));spin_unlock_irqrestore (&priv->lock, flags); +pci_set_power_state (pcid,pci_choose_state (pcid, state)); +return 0 ; }
drivers/target/iscsi/iscsi_target.c +2 -1
@@ -834,6 +834,7 @@ static int iscsit_add_reject_from_cmd( unsigned char *buf) {struct iscsi_conn *conn; +const bool do_put = cmd->se_cmd.se_tfo !=NULL ;if (!cmd->conn) { pr_err("cmd->conn is NULL for ITT: 0x%08x\n",
@@ -864,7 +865,7 @@ static int iscsit_add_reject_from_cmd(* Perform the kref_put now if se_cmd has already been setup by * scsit_setup_scsi_cmd() */ -if (cmd->se_cmd.se_tfo !=NULL ) { +if (do_put) {pr_debug ("iscsi reject: calling target_put_sess_cmd >>>>>>\n" );target_put_sess_cmd (&cmd->se_cmd); }
drivers/target/iscsi/iscsi_target_configfs.c +2 -1
@@ -1123,7 +1123,7 @@ static struct se_portal_group *lio_target_tiqn_addtpg( ret =core_tpg_register (wwn, &tpg->tpg_se_tpg,SCSI_PROTOCOL_ISCSI );if (ret <0 ) -return NULL ; + goto free_out; ret =iscsit_tpg_add_portal_group (tiqn, tpg);if (ret !=0 )
@@ -1135,6 +1135,7 @@ static struct se_portal_group *lio_target_tiqn_addtpg(return &tpg->tpg_se_tpg; out:core_tpg_deregister (&tpg->tpg_se_tpg); +free_out:kfree (tpg);return NULL ; }
drivers/target/iscsi/iscsi_target_util.c +4 -0
@@ -694,6 +694,8 @@ void iscsit_release_cmd(struct iscsi_cmd *cmd)struct iscsi_session *sess;struct se_cmd *se_cmd = &cmd->se_cmd; +WARN_ON (!list_empty (&cmd->i_conn_node)); +if (cmd->conn) sess = cmd->conn->sess;else
@@ -716,6 +718,8 @@ void __iscsit_free_cmd(struct iscsi_cmd *cmd, bool check_queues) {struct iscsi_conn *conn = cmd->conn; +WARN_ON (!list_empty (&cmd->i_conn_node)); +if (cmd->data_direction ==DMA_TO_DEVICE ) {iscsit_stop_dataout_timer (cmd);iscsit_free_r2ts_from_list (cmd);
drivers/target/target_core_file.c +4 -0
@@ -482,6 +482,10 @@ fd_execute_unmap(struct se_cmd *cmd, sector_t lba, sector_t nolb)struct inode *inode = file->f_mapping->host;int ret; +if (!nolb) { +return 0 ; + } +if (cmd->se_dev->dev_attrib.pi_prot_type) { ret =fd_do_prot_unmap (cmd, lba, nolb);if (ret)
drivers/target/target_core_pr.c +3 -1
@@ -58,8 +58,10 @@ void core_pr_dump_initiator_port( char *buf, u32 size) { -if (!pr_reg->isid_present_at_reg) +if (!pr_reg->isid_present_at_reg) { buf[0 ] ='\0' ; +return ; + }snprintf (buf, size,",i,0x%s" , pr_reg->pr_reg_isid); }
drivers/thermal/step_wise.c +6 -5
@@ -31,8 +31,7 @@* If the temperature is higher than a trip point, * a. if the trend is THERMAL_TREND_RAISING, use higher cooling * state for this trip point -* b. if the trend is THERMAL_TREND_DROPPING, use lower cooling -* state for this trip point +* b. if the trend is THERMAL_TREND_DROPPING, do nothing * c. if the trend is THERMAL_TREND_RAISE_FULL, use upper limit * for this trip point * d. if the trend is THERMAL_TREND_DROP_FULL, use lower limit
@@ -94,9 +93,11 @@ static unsigned long get_target_state(struct thermal_instance *instance,if (!throttle) next_target =THERMAL_NO_TARGET ; }else { - next_target = cur_state -1 ; -if (next_target > instance->upper) - next_target = instance->upper; +if (!throttle) { + next_target = cur_state -1 ; +if (next_target > instance->upper) + next_target = instance->upper; + } }break ;case THERMAL_TREND_DROP_FULL :
drivers/thunderbolt/tb.c +1 -0
@@ -225,6 +225,7 @@ static void tb_activate_pcie_devices(struct tb *tb)tb_port_info (up_port,"PCIe tunnel activation failed, aborting\n" );tb_pci_free (tunnel); +continue ; }list_add (&tunnel->list, &tcm->tunnel_list);
drivers/tty/serdev/serdev-ttyport.c +10 -4
@@ -120,10 +120,10 @@ static int ttyport_open(struct serdev_controller *ctrl)return PTR_ERR (tty); serport->tty = tty; -if (tty->ops->open) - tty->ops->open (serport->tty,NULL ); -else -tty_port_open (serport->port, tty,NULL ); +if (!tty->ops->open) + goto err_unlock; + + tty->ops->open (serport->tty,NULL );/* Bring the UART into a known 8 bits no parity hw fc state */ ktermios = tty->termios;
@@ -140,6 +140,12 @@ static int ttyport_open(struct serdev_controller *ctrl)tty_unlock (serport->tty);return 0 ; + +err_unlock: +tty_unlock (tty); +tty_release_struct (tty, serport->tty_idx); + +return -ENODEV ; }static void ttyport_close (struct serdev_controller *ctrl)
drivers/usb/core/config.c +3 -1
@@ -555,6 +555,9 @@ static int usb_parse_configuration(struct usb_device *dev, int cfgidx,unsigned iad_num =0 ;memcpy (&config->desc, buffer,USB_DT_CONFIG_SIZE ); + nintf = nintf_orig = config->desc.bNumInterfaces; + config->desc.bNumInterfaces =0 ;// Adjusted later +if (config->desc.bDescriptorType !=USB_DT_CONFIG || config->desc.bLength <USB_DT_CONFIG_SIZE || config->desc.bLength > size) {
@@ -568,7 +571,6 @@ static int usb_parse_configuration(struct usb_device *dev, int cfgidx, buffer += config->desc.bLength; size -= config->desc.bLength; - nintf = nintf_orig = config->desc.bNumInterfaces;if (nintf >USB_MAXINTERFACES ) { dev_warn(ddev, "config %d has too many interfaces: %d, " "using maximum allowed: %d\n",
drivers/usb/host/xhci-mem.c +11 -4
@@ -983,10 +983,9 @@ int xhci_alloc_virt_device(struct xhci_hcd *xhci, int slot_id,return 0 ; } - xhci->devs[slot_id] =kzalloc (sizeof (*xhci->devs[slot_id]), flags); -if (!xhci->devs[slot_id]) + dev =kzalloc (sizeof (*dev), flags); +if (!dev)return 0 ; - dev = xhci->devs[slot_id];/* Allocate the (output) device context that will be used in the HC. */ dev->out_ctx =xhci_alloc_container_ctx (xhci,XHCI_CTX_TYPE_DEVICE , flags);
@@ -1027,9 +1026,17 @@ int xhci_alloc_virt_device(struct xhci_hcd *xhci, int slot_id,trace_xhci_alloc_virt_device (dev); + xhci->devs[slot_id] = dev; +return 1 ; fail: -xhci_free_virt_device (xhci, slot_id); + +if (dev->in_ctx) +xhci_free_container_ctx (xhci, dev->in_ctx); +if (dev->out_ctx) +xhci_free_container_ctx (xhci, dev->out_ctx); +kfree (dev); +return 0 ; }
drivers/usb/host/xhci-ring.c +3 -3
@@ -3121,7 +3121,7 @@ static u32 xhci_td_remainder(struct xhci_hcd *xhci, int transferred, {u32 maxp, total_packet_count; -/* MTK xHCI is mostly 0.97 but contains some features from 1.0 */ +/* MTK xHCI 0.96 contains some features from 1.0 */ if (xhci->hci_version <0x100 && !(xhci->quirks &XHCI_MTK_HOST ))return ((td_total_len - transferred) >>10 );
@@ -3130,8 +3130,8 @@ static u32 xhci_td_remainder(struct xhci_hcd *xhci, int transferred, trb_buff_len == td_total_len)return 0 ; -/* for MTK xHCI, TD size doesn't include this TRB */ -if (xhci->quirks &XHCI_MTK_HOST ) +/* for MTK xHCI 0.96, TD size include this TRB, but not in 1.x */ +if ((xhci->quirks &XHCI_MTK_HOST ) && (xhci->hci_version <0x100 )) trb_buff_len =0 ; maxp =usb_endpoint_maxp (&urb->ep->desc);
drivers/usb/musb/da8xx.c +9 -1
@@ -305,7 +305,15 @@ static irqreturn_t da8xx_musb_interrupt(int irq, void *hci) musb->xceiv->otg->state =OTG_STATE_A_WAIT_VRISE ;portstate (musb->port1_status |=USB_PORT_STAT_POWER );del_timer (&otg_workaround); - }else { + }else if (!(musb->int_usb &MUSB_INTR_BABBLE )){ +/* +* When babble condition happens, drvvbus interrupt +* is also generated. Ignore this drvvbus interrupt +* and let babble interrupt handler recovers the +* controller; otherwise, the host-mode flag is lost +* due to the MUSB_DEV_MODE() call below and babble +* recovery logic will not called. +*/ musb->is_active =0 ;MUSB_DEV_MODE (musb); otg->default_a =0 ;
drivers/usb/storage/unusual_devs.h +7 -0
@@ -2113,6 +2113,13 @@ UNUSUAL_DEV( 0x152d, 0x0567, 0x0114, 0x0116, USB_SC_DEVICE, USB_PR_DEVICE, NULL, US_FL_BROKEN_FUA ), +/* Reported by David Kozub <[email protected]> */ +UNUSUAL_DEV (0x152d ,0x0578 ,0x0000 ,0x9999 , +"JMicron" , +"JMS567" , +USB_SC_DEVICE ,USB_PR_DEVICE ,NULL , + US_FL_BROKEN_FUA), +/* * Reported by Alexandre Oliva <[email protected]> * JMicron responds to USN and several other SCSI ioctls with a
drivers/usb/storage/unusual_uas.h +7 -0
@@ -142,6 +142,13 @@ UNUSUAL_DEV(0x152d, 0x0567, 0x0000, 0x9999, USB_SC_DEVICE, USB_PR_DEVICE, NULL, US_FL_BROKEN_FUA | US_FL_NO_REPORT_OPCODES), +/* Reported-by: David Kozub <[email protected]> */ +UNUSUAL_DEV (0x152d ,0x0578 ,0x0000 ,0x9999 , +"JMicron" , +"JMS567" , +USB_SC_DEVICE ,USB_PR_DEVICE ,NULL , +US_FL_BROKEN_FUA ), +/* Reported-by: Hans de Goede <[email protected]> */ UNUSUAL_DEV(0x2109, 0x0711, 0x0000, 0x9999, "VIA",
drivers/usb/usbip/stub_rx.c +41 -10
93 lines not on this page · raw message
drivers/usb/usbip/stub_tx.c +7 -0
@@ -181,6 +181,13 @@ static int stub_send_ret_submit(struct stub_device *sdev)memset (&pdu_header,0 ,sizeof (pdu_header));memset (&msg,0 ,sizeof (msg)); +if (urb->actual_length >0 && !urb->transfer_buffer) { +dev_err (&sdev->udev->dev, +"urb: actual_length %d transfer_buffer null\n" , + urb->actual_length); +return -1 ; + } +if (usb_pipetype (urb->pipe) ==PIPE_ISOCHRONOUS ) iovnum =2 + urb->number_of_packets;else
drivers/usb/usbip/usbip_common.h +1 -0
@@ -270,6 +270,7 @@ struct usbip_device {/* lock for status */ spinlock_t lock; +int sockfd;struct socket *tcp_socket;struct task_struct *tcp_rx;
drivers/usb/usbip/vhci_sysfs.c +16 -9
@@ -31,15 +31,20 @@/* * output example: -* hub port sta spd dev socket local_busid -* hs 0000 004 000 00000000 c5a7bb80 1-2.3 +* hub port sta spd dev sockfd local_busid +* hs 0000 004 000 00000000 3 1-2.3 * ................................................ -* ss 0008 004 000 00000000 d8cee980 2-3.4 +* ss 0008 004 000 00000000 4 2-3.4 * ................................................ * -* IP address can be retrieved from a socket pointer address by looking -* up /proc/net/{tcp,tcp6}. Also, a userland program may remember a -* port number and its peer IP address. +* Output includes socket fd instead of socket pointer address to avoid +* leaking kernel memory address in: +* /sys/devices/platform/vhci_hcd.0/status and in debug output. +* The socket pointer address is not used at the moment and it was made +* visible as a convenient way to find IP address from socket pointer +* address by looking up /proc/net/{tcp,tcp6}. As this opens a security +* hole, the change is made to use sockfd instead. +* */ static void port_show_vhci (char **out,int hub,int port,struct vhci_device *vdev) {
@@ -53,8 +58,8 @@ static void port_show_vhci(char **out, int hub, int port, struct vhci_device *vdif (vdev->ud.status ==VDEV_ST_USED ) { *out +=sprintf (*out,"%03u %08x " , vdev->speed, vdev->devid); - *out +=sprintf (*out,"%16p %s" , - vdev->ud.tcp_socket, + *out +=sprintf (*out,"%u %s" , + vdev->ud.sockfd,dev_name (&vdev->udev->dev)); }else {
@@ -174,7 +179,8 @@ static ssize_t nports_show(struct device *dev, struct device_attribute *attr,char *s = out;/* -* Half the ports are for SPEED_HIGH and half for SPEED_SUPER, thus the * 2. +* Half the ports are for SPEED_HIGH and half for SPEED_SUPER, +* thus the * 2. */ out +=sprintf (out,"%d\n" ,VHCI_PORTS * vhci_num_controllers);return out - s;
@@ -380,6 +386,7 @@ static ssize_t store_attach(struct device *dev, struct device_attribute *attr, vdev->devid = devid; vdev->speed = speed; + vdev->ud.sockfd = sockfd; vdev->ud.tcp_socket = socket; vdev->ud.status =VDEV_ST_NOTASSIGNED ;
drivers/video/fbdev/au1200fb.c +5 -2
@@ -1681,8 +1681,10 @@ static int au1200fb_drv_probe(struct platform_device *dev) fbi =framebuffer_alloc (sizeof (struct au1200fb_device ), &dev->dev); -if (!fbi) +if (!fbi) { + ret = -ENOMEM ; goto failed; + } _au1200fb_infos[plane] = fbi; fbdev = fbi->par;
@@ -1701,7 +1703,8 @@ static int au1200fb_drv_probe(struct platform_device *dev)if (!fbdev->fb_mem) {print_err ("fail to allocate frambuffer (size: %dK))" , fbdev->fb_len /1024 ); -return -ENOMEM ; + ret = -ENOMEM ; + goto failed; }/*
drivers/video/fbdev/controlfb.h +2 -0
@@ -141,5 +141,7 @@ static struct max_cmodes control_mac_modes[] = { {{ 1, 2}}, /* 1152x870, 75Hz */ {{ 0, 1}}, /* 1280x960, 75Hz */ {{ 0, 1}}, /* 1280x1024, 75Hz */ + {{ 1, 2}}, /* 1152x768, 60Hz */ + {{ 0, 1}}, /* 1600x1024, 60Hz */ };
drivers/video/fbdev/udlfb.c +5 -5
@@ -769,11 +769,11 @@ static int dlfb_get_edid(struct dlfb_data *dev, char *edid, int len)for (i =0 ; i < len; i++) { ret =usb_control_msg (dev->udev, -usb_rcvctrlpipe (dev->udev,0 ), (0x02 ), - (0x80 | (0x02 <<5 )), i <<8 ,0xA1 , rbuf,2 , -HZ ); -if (ret <1 ) { -pr_err ("Read EDID byte %d failed err %x\n" , i, ret); +usb_rcvctrlpipe (dev->udev,0 ),0x02 , + (0x80 | (0x02 <<5 )), i <<8 ,0xA1 , + rbuf,2 ,USB_CTRL_GET_TIMEOUT ); +if (ret <2 ) { +pr_err ("Read EDID byte %d failed: %d\n" , i, ret); i--;break ; }
fs/autofs4/waitq.c +0 -1
@@ -170,7 +170,6 @@ static void autofs4_notify_daemon(struct autofs_sb_info *sbi,mutex_unlock (&sbi->wq_mutex); -if (autofs4_write (sbi, pipe, &pkt, pktsz))switch (ret =autofs4_write (sbi, pipe, &pkt, pktsz)) {case 0 :break ;
fs/btrfs/ioctl.c +6 -1
@@ -1842,8 +1842,13 @@ static noinline int btrfs_ioctl_subvol_setflags(struct file *file, ret =btrfs_update_root (trans, fs_info->tree_root, &root->root_key, &root->root_item); +if (ret <0 ) { +btrfs_end_transaction (trans); + goto out_reset; + } + + ret =btrfs_commit_transaction (trans); -btrfs_commit_transaction (trans); out_reset:if (ret)btrfs_set_root_flags (&root->root_item, root_flags);
fs/btrfs/super.c +2 -2
@@ -202,7 +202,6 @@ static struct ratelimit_state printk_limits[] = {void btrfs_printk (const struct btrfs_fs_info *fs_info,const char *fmt, ...) { -struct super_block *sb = fs_info->sb;char lvl[PRINTK_MAX_SINGLE_HEADER_LEN +1 ] ="\0" ;struct va_format vaf;va_list args;
@@ -228,7 +227,8 @@ void btrfs_printk(const struct btrfs_fs_info *fs_info, const char *fmt, ...) vaf.va = &args;if (__ratelimit (ratelimit)) -printk ("%sBTRFS %s (device %s): %pV\n" , lvl, type, sb->s_id, &vaf); +printk ("%sBTRFS %s (device %s): %pV\n" , lvl, type, + fs_info ? fs_info->sb->s_id :"<unknown>" , &vaf);va_end (args); }
fs/btrfs/tests/free-space-tree-tests.c +2 -1
@@ -500,7 +500,8 @@ static int run_test(test_func_t test_func, int bitmaps, u32 sectorsize, path =btrfs_alloc_path ();if (!path) {test_msg ("Couldn't allocate path\n" ); -return -ENOMEM ; + ret = -ENOMEM ; + goto out; } ret =add_block_group_free_space (&trans, root->fs_info, cache);
fs/btrfs/volumes.c +6 -1
@@ -2501,6 +2501,8 @@ int btrfs_init_new_device(struct btrfs_fs_info *fs_info, const char *device_pathreturn ret; error_trans: +if (seeding_dev) + sb->s_flags |=MS_RDONLY ;btrfs_end_transaction (trans);rcu_string_free (device->name);btrfs_sysfs_rm_device_link (fs_info->fs_devices, device);
@@ -6144,7 +6146,10 @@ static void bbio_error(struct btrfs_bio *bbio, struct bio *bio, u64 logical)btrfs_io_bio (bio)->mirror_num = bbio->mirror_num; bio->bi_iter.bi_sector = logical >>9 ; - bio->bi_status =BLK_STS_IOERR ; +if (atomic_read (&bbio->error) > bbio->max_errors) + bio->bi_status =BLK_STS_IOERR ; +else + bio->bi_status =BLK_STS_OK ;btrfs_end_bbio (bbio, bio); } }
fs/ceph/mds_client.c +38 -4
60 lines not on this page · raw message
fs/cifs/smb2pdu.c +15 -15
@@ -2678,27 +2678,27 @@ SMB2_read(const unsigned int xid, struct cifs_io_parms *io_parms,cifs_small_buf_release (req); rsp = (struct smb2_read_rsp *)rsp_iov.iov_base; - shdr =get_sync_hdr (rsp); -if (shdr->Status ==STATUS_END_OF_FILE ) { +if (rc) { +if (rc != -ENODATA ) { +cifs_stats_fail_inc (io_parms->tcon,SMB2_READ_HE ); +cifs_dbg (VFS ,"Send error in read = %d\n" , rc); + }free_rsp_buf (resp_buftype, rsp_iov.iov_base); -return 0 ; +return rc == -ENODATA ?0 : rc; } -if (rc) { -cifs_stats_fail_inc (io_parms->tcon,SMB2_READ_HE ); -cifs_dbg (VFS ,"Send error in read = %d\n" , rc); - }else { - *nbytes =le32_to_cpu (rsp->DataLength); -if ((*nbytes >CIFS_MAX_MSGSIZE ) || - (*nbytes > io_parms->length)) { -cifs_dbg (FYI ,"bad length %d for count %d\n" , - *nbytes, io_parms->length); - rc = -EIO ; - *nbytes =0 ; - } + *nbytes =le32_to_cpu (rsp->DataLength); +if ((*nbytes >CIFS_MAX_MSGSIZE ) || + (*nbytes > io_parms->length)) { +cifs_dbg (FYI ,"bad length %d for count %d\n" , + *nbytes, io_parms->length); + rc = -EIO ; + *nbytes =0 ; } + shdr =get_sync_hdr (rsp); +if (*buf) {memcpy (*buf, (char *)shdr + rsp->DataOffset, *nbytes);free_rsp_buf (resp_buftype, rsp_iov.iov_base);
fs/exec.c +1 -6
@@ -1340,15 +1340,10 @@ void setup_new_exec(struct linux_binprm * bprm)* avoid bad behavior from the prior rlimits. This has to * happen before arch_pick_mmap_layout(), which examines * RLIMIT_STACK, but after the point of no return to avoid -* races from other threads changing the limits. This also -* must be protected from races with prlimit() calls. +* needing to clean up the change on failure. */ -task_lock (current->group_leader);if (current->signal->rlim[RLIMIT_STACK ].rlim_cur > _STK_LIM) current->signal->rlim[RLIMIT_STACK ].rlim_cur = _STK_LIM; -if (current->signal->rlim[RLIMIT_STACK ].rlim_max > _STK_LIM) - current->signal->rlim[RLIMIT_STACK ].rlim_max = _STK_LIM; -task_unlock (current->group_leader); }arch_pick_mmap_layout (current->mm);
fs/ext4/extents.c +1 -0
@@ -4722,6 +4722,7 @@ static int ext4_alloc_file_blocks(struct file *file, ext4_lblk_t offset, EXT4_INODE_EOFBLOCKS); }ext4_mark_inode_dirty (handle, inode); +ext4_update_inode_fsync_trans (handle, inode,1 ); ret2 =ext4_journal_stop (handle);if (ret2)break ;
fs/ext4/ialloc.c +2 -0
@@ -816,6 +816,8 @@ struct inode *__ext4_new_inode(handle_t *handle, struct inode *dir,#ifdef CONFIG_EXT4_FS_POSIX_ACL struct posix_acl *p =get_acl (dir,ACL_TYPE_DEFAULT ); +if (IS_ERR (p)) +return ERR_CAST (p);if (p) {int acl_size = p->a_count *sizeof (ext4_acl_entry);
fs/ext4/inode.c +9 -0
@@ -149,6 +149,15 @@ static int ext4_meta_trans_blocks(struct inode *inode, int lblocks,*/ int ext4_inode_is_fast_symlink (struct inode *inode) { +if (!(EXT4_I (inode)->i_flags &EXT4_EA_INODE_FL )) { +int ea_blocks =EXT4_I (inode)->i_file_acl ? +EXT4_CLUSTER_SIZE (inode->i_sb) >>9 :0 ; + +if (ext4_has_inline_data (inode)) +return 0 ; + +return (S_ISLNK (inode->i_mode) && inode->i_blocks - ea_blocks ==0 ); + }return S_ISLNK (inode->i_mode) && inode->i_size && (inode->i_size <EXT4_N_BLOCKS *4 ); }
fs/ext4/namei.c +4 -0
@@ -1399,6 +1399,10 @@ static struct buffer_head * ext4_find_entry (struct inode *dir, "falling back\n")); } nblocks = dir->i_size >>EXT4_BLOCK_SIZE_BITS (sb); +if (!nblocks) { + ret =NULL ; + goto cleanup_and_exit; + } start =EXT4_I (dir)->i_dir_start_lookup;if (start >= nblocks) start =0 ;
fs/gfs2/file.c +3 -1
@@ -256,7 +256,7 @@ static int do_gfs2_set_flags(struct file *filp, u32 reqflags, u32 mask) goto out; }if ((flags ^ new_flags) &GFS2_DIF_JDATA ) { -if (flags &GFS2_DIF_JDATA ) +if (new_flags &GFS2_DIF_JDATA )gfs2_log_flush (sdp, ip->i_gl,NORMAL_FLUSH ); error =filemap_fdatawrite (inode->i_mapping);if (error)
@@ -264,6 +264,8 @@ static int do_gfs2_set_flags(struct file *filp, u32 reqflags, u32 mask) error =filemap_fdatawait (inode->i_mapping);if (error) goto out; +if (new_flags &GFS2_DIF_JDATA ) +gfs2_ordered_del_inode (ip); } error =gfs2_trans_begin (sdp,RES_DINODE ,0 );if (error)
fs/nfs/write.c +2 -0
@@ -1889,6 +1889,8 @@ int nfs_commit_inode(struct inode *inode, int how)if (res) error =nfs_generic_commit_list (inode, &head, how, &cinfo);nfs_commit_end (cinfo.mds); +if (res ==0 ) +return res;if (error <0 ) goto out_error;if (!may_wait)
fs/nfsd/auth.c +3 -0
@@ -60,6 +60,9 @@ int nfsd_setuser(struct svc_rqst *rqstp, struct svc_export *exp) gi->gid[i] = exp->ex_anon_gid; else gi->gid[i] = rqgi->gid[i]; + +/* Each thread allocates its own gi, no race */ +groups_sort (gi); } }else { gi =get_group_info (rqgi);
fs/overlayfs/namei.c +1 -1
@@ -437,7 +437,7 @@ int ovl_verify_index(struct dentry *index, struct path *lowerstack,/* Check if index is orphan and don't warn before cleaning it */ if (d_inode (index)->i_nlink ==1 && -ovl_get_nlink (index, origin.dentry,0 ) ==0 ) +ovl_get_nlink (origin.dentry, index,0 ) ==0 ) err = -ENOENT ;dput (origin.dentry);
fs/overlayfs/readdir.c +4 -1
@@ -645,7 +645,10 @@ static int ovl_iterate_real(struct file *file, struct dir_context *ctx)return PTR_ERR (rdt.cache); } -return iterate_dir (od->realfile, &rdt.ctx); + err =iterate_dir (od->realfile, &rdt.ctx); + ctx->pos = rdt.ctx.pos; + +return err; }
fs/proc/proc_tty.c +2 -1
@@ -15,6 +15,7 @@#include <linux/tty.h> #include <linux/seq_file.h> #include <linux/bitops.h> +#include "internal.h" /* * The /proc/tty directory inodes...
@@ -165,7 +166,7 @@ void proc_tty_unregister_driver(struct tty_driver *driver)if (!ent)return ; -remove_proc_entry (driver->driver_name, proc_tty_driver); +remove_proc_entry (ent->name, proc_tty_driver); driver->proc_entry =NULL ; }
fs/udf/super.c +1 -1
@@ -703,7 +703,7 @@ static loff_t udf_check_vsd(struct super_block *sb)else sectorsize = sb->s_blocksize; - sector += (sbi->s_session << sb->s_blocksize_bits); + sector += (((loff_t )sbi->s_session) << sb->s_blocksize_bits); udf_debug("Starting at sector %u (%ld byte sectors)\n", (unsigned int)(sector >> sb->s_blocksize_bits),
fs/xfs/libxfs/xfs_bmap.c +1 -1
@@ -2560,7 +2560,7 @@ xfs_bmap_add_extent_unwritten_real( &i))) goto done;XFS_WANT_CORRUPTED_GOTO (mp, i ==0 , done); - cur->bc_rec.b.br_state =XFS_EXT_NORM ; + cur->bc_rec.b.br_state = new->br_state;if ((error =xfs_btree_insert (cur, &i))) goto done;XFS_WANT_CORRUPTED_GOTO (mp, i ==1 , done);
fs/xfs/xfs_icache.c +1 -1
@@ -610,7 +610,7 @@ xfs_iget( }else {rcu_read_unlock ();if (flags &XFS_IGET_INCORE ) { - error = -ENOENT ; + error = -ENODATA ; goto out_error_or_again; }XFS_STATS_INC (mp, xs_ig_missed);
fs/xfs/xfs_iops.c +20 -16
@@ -885,22 +885,6 @@ xfs_setattr_size(if (error)return error; -/* -* We are going to log the inode size change in this transaction so -* any previous writes that are beyond the on disk EOF and the new -* EOF that have not been written out need to be written here. If we -* do not write the data out, we expose ourselves to the null files -* problem. Note that this includes any block zeroing we did above; -* otherwise those blocks may not be zeroed after a crash. -*/ -if (did_zeroing || - (newsize > ip->i_d.di_size && oldsize != ip->i_d.di_size)) { - error =filemap_write_and_wait_range (VFS_I (ip)->i_mapping, - ip->i_d.di_size, newsize); -if (error) -return error; - } -/* * We've already locked out new page faults, so now we can safely remove * pages from the page cache knowing they won't get refaulted until we
@@ -917,9 +901,29 @@ xfs_setattr_size(* user visible changes). There's not much we can do about this, except * to hope that the caller sees ENOMEM and retries the truncate * operation. +* +* And we update in-core i_size and truncate page cache beyond newsize +* before writeback the [di_size, newsize] range, so we're guaranteed +* not to write stale data past the new EOF on truncate down. */ truncate_setsize (inode, newsize); +/* +* We are going to log the inode size change in this transaction so +* any previous writes that are beyond the on disk EOF and the new +* EOF that have not been written out need to be written here. If we +* do not write the data out, we expose ourselves to the null files +* problem. Note that this includes any block zeroing we did above; +* otherwise those blocks may not be zeroed after a crash. +*/ +if (did_zeroing || + (newsize > ip->i_d.di_size && oldsize != ip->i_d.di_size)) { + error =filemap_write_and_wait_range (VFS_I (ip)->i_mapping, + ip->i_d.di_size, newsize -1 ); +if (error) +return error; + } + error =xfs_trans_alloc (mp, &M_RES (mp)->tr_itruncate,0 ,0 ,0 , &tp);if (error)return error;
fs/xfs/xfs_log_recover.c +1 -1
@@ -753,7 +753,7 @@ xlog_find_head(* in the in-core log. The following number can be made tighter if * we actually look at the block size of the filesystem. */ - num_scan_bblks =XLOG_TOTAL_REC_SHIFT (log); + num_scan_bblks =min_t (int, log_bbnum,XLOG_TOTAL_REC_SHIFT (log));if (head_blk >= num_scan_bblks) {/* * We are guaranteed that the entire check can be performed
include/crypto/internal/hash.h +8 -0
@@ -82,6 +82,14 @@ int ahash_register_instance(struct crypto_template *tmpl, struct ahash_instance *inst);void ahash_free_instance (struct crypto_instance *inst); +int shash_no_setkey (struct crypto_shash *tfm,const u8 *key, +unsigned int keylen); + +static inline bool crypto_shash_alg_has_setkey (struct shash_alg *alg) +{ +return alg->setkey != shash_no_setkey; +} + int crypto_init_ahash_spawn(struct crypto_ahash_spawn *spawn, struct hash_alg_common *alg,
Lines of this file are not shown. View the raw message.
sound/soc/intel/skylake/skl-sst-utils.c +11 -4
Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
Part of the diff is not shown here. View the raw message.