Linux 4.14.56
Greg KH
maintainerI'm announcing the release of the 4.14.56 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
------------
Documentation/kbuild/kbuild.txt | 9 Makefile | 2 arch/arm64/include/asm/simd.h | 19 arch/mips/kernel/process.c | 43 arch/mips/kernel/traps.c | 1 arch/mips/mm/ioremap.c | 37 arch/x86/crypto/Makefile | 4 arch/x86/crypto/salsa20-i586-asm_32.S | 1114 -------------------- arch/x86/crypto/salsa20-x86_64-asm_64.S | 919 ---------------- arch/x86/crypto/salsa20_glue.c | 116 -- arch/x86/kernel/uprobes.c | 2 arch/x86/xen/enlighten_pv.c | 24 arch/x86/xen/irq.c | 4 crypto/Kconfig | 26 drivers/ata/ahci.c | 59 + drivers/ata/libata-core.c | 3 drivers/ata/libata-scsi.c | 18 drivers/block/loop.c | 79 - drivers/block/loop.h | 1 drivers/i2c/busses/i2c-tegra.c | 17 drivers/infiniband/Kconfig | 12 drivers/infiniband/core/Makefile | 4 drivers/infiniband/hw/cxgb4/mem.c | 2 drivers/infiniband/hw/hfi1/rc.c | 2 drivers/infiniband/hw/hfi1/uc.c | 4 drivers/infiniband/hw/hfi1/ud.c | 4 drivers/infiniband/hw/hfi1/verbs_txreq.c | 4 drivers/infiniband/hw/hfi1/verbs_txreq.h | 4 drivers/media/rc/ir-mce_kbd-decoder.c | 2 drivers/misc/ibmasm/ibmasmfs.c | 27 drivers/misc/vmw_balloon.c | 4 drivers/mmc/host/dw_mmc.c | 7 drivers/mmc/host/sdhci-esdhc-imx.c | 21 drivers/nvme/host/pci.c | 27 drivers/scsi/megaraid/megaraid_sas.h | 10 drivers/scsi/megaraid/megaraid_sas_base.c | 296 +++-- drivers/scsi/megaraid/megaraid_sas_fp.c | 20 drivers/scsi/megaraid/megaraid_sas_fusion.c | 54 drivers/scsi/megaraid/megaraid_sas_fusion.h | 7 drivers/staging/rtl8723bs/core/rtw_ap.c | 2 drivers/staging/rtlwifi/rtl8822be/hw.c | 2 drivers/staging/rtlwifi/wifi.h | 1 drivers/usb/core/quirks.c | 4 drivers/usb/host/xhci-mem.c | 2 drivers/usb/misc/yurex.c | 23 drivers/usb/serial/ch341.c | 2 drivers/usb/serial/cp210x.c | 1 drivers/usb/serial/keyspan_pda.c | 4 drivers/usb/serial/mos7840.c | 3 fs/binfmt_elf.c | 5 fs/devpts/inode.c | 48 fs/f2fs/f2fs.h | 13 fs/f2fs/inode.c | 13 fs/f2fs/node.c | 21 fs/inode.c | 6 fs/proc/task_mmu.c | 2 include/linux/libata.h | 1 kernel/irq/affinity.c | 30 kernel/power/user.c | 5 kernel/trace/trace.c | 8 kernel/trace/trace_output.c | 5 mm/gup.c | 2 mm/mmap.c | 29 mm/rmap.c | 8 net/bridge/netfilter/ebtables.c | 2 net/ipv4/netfilter/ip_tables.c | 1 net/ipv6/netfilter/ip6_tables.c | 1 net/netfilter/nfnetlink_queue.c | 3 sound/pci/hda/patch_hdmi.c | 19 sound/pci/hda/patch_realtek.c | 6 sound/soc/mediatek/common/mtk-afe-platform-driver.c | 4 tools/build/Build.include | 4 72 files changed, 664 insertions(+), 2624 deletions(-)
Chris Wilson (1):
ALSA: hda - Handle pm failure during hotplug
Christian Borntraeger (1):
mm: do not drop unused pages when userfaultd is running
Christian Brauner (2):
devpts: hoist out check for DEVPTS_SUPER_MAGIC
devpts: resolve devpts bind-mounts
Christoph Hellwig (1):
genirq/affinity: assign vectors to all possible CPUs
Damien Le Moal (2):
ata: Fix ZBC_OUT command block check
ata: Fix ZBC_OUT all bit handling
Dan Carpenter (2):
USB: serial: ch341: fix type promotion bug in ch341_control_in()
xhci: xhci-mem: off by one in xhci_stream_id_to_ring()
Eric Biggers (1):
crypto: x86/salsa20 - remove x86 salsa20 implementations
Eric Dumazet (1):
netfilter: nf_queue: augment nfqa_cfg_policy
Florian Westphal (1):
netfilter: x_tables: initialise match/target check parameter struct
Greg Kroah-Hartman (1):
Linux 4.14.56
Hans de Goede (1):
ahci: Disable LPM on Lenovo 50 series laptops with a too old BIOS
Hui Wang (1):
ALSA: hda/realtek - two more lenovo models need fixup of MIC_LOCATION
Jaegeuk Kim (1):
f2fs: give message and set need_fsck given broken node id
Jann Horn (2):
ibmasm: don't write out of bounds in read handler
USB: yurex: fix out-of-bounds uaccess in read handler
Joel Fernandes (Google) (1):
tracing: Reorder display of TGID to be after PID
Johan Hovold (2):
USB: serial: keyspan_pda: fix modem-status error handling
USB: serial: mos7840: fix status-register error handling
Jon Hunter (1):
i2c: tegra: Fix NACK error handling
Juergen Gross (1):
xen: setup pv irq ops vector earlier
Kai Chieh Chuang (1):
ASoC: mediatek: preallocate pages use platform device
Keith Busch (1):
nvme-pci: Remap CMB SQ entries on every controller reset
Leon Romanovsky (1):
RDMA/ucm: Mark UCM interface as BROKEN
Linus Torvalds (1):
Fix up non-directory creation in SGID directories
Michael J. Ruhl (1):
IB/hfi1: Fix incorrect mixing of ERR_PTR and NULL return values
Michal Hocko (1):
mm: do not bug_on on incorrect length in __mm_populate()
Ming Lei (1):
scsi: megaraid_sas: fix selection of reply queue
Murray McAllister (1):
staging: rtl8723bs: Prevent an underflow in rtw_check_beacon_data().
Nadav Amit (1):
vmw_balloon: fix inflation with batching
Nico Sneck (1):
usb: quirks: add delay quirks for Corsair Strafe
Oleg Nesterov (1):
uprobes/x86: Remove incorrect WARN_ON() in uprobe_init_insn()
Olli Salonen (1):
USB: serial: cp210x: add another USB ID for Qivicon ZigBee stick
Oscar Salvador (1):
fs, elf: make sure to page align bss in load_elf_library
Paul Burton (3):
MIPS: Call dump_stack() from show_regs()
MIPS: Use async IPIs for arch_trigger_cpumask_backtrace()
MIPS: Fix ioremap() RAM check
Paul Menzel (1):
tools build: fix # escaping in .cmd files for future Make
Ping-Ke Shih (1):
staging: r8822be: Fix RTL8822be can't find any wireless AP
Randy Dunlap (1):
kbuild: delete INSTALL_FW_PATH from kbuild documentation
Sean Young (1):
media: rc: mce_kbd decoder: fix stuck keys
Shivasharan S (4):
scsi: megaraid_sas: use adapter_type for all gen controllers
scsi: megaraid_sas: replace instance->ctrl_context checks with instance->adapter_type
scsi: megaraid_sas: replace is_ventura with adapter_type checks
scsi: megaraid_sas: Create separate functions to allocate ctrl memory
Stefan Agner (1):
mmc: sdhci-esdhc-imx: allow 1.8V modes without 100/200MHz pinctrl states
Steve Wise (1):
iw_cxgb4: correctly enforce the max reg_mr depth
Tetsuo Handa (2):
PM / hibernate: Fix oops at snapshot_write()
loop: remember whether sysfs_create_group() was done
Theodore Ts'o (1):
loop: add recursion validation to LOOP_CHANGE_FD
Vlastimil Babka (1):
fs/proc/task_mmu.c: fix Locked field in /proc/pid/smaps*
Yandong Zhao (1):
arm64: neon: Fix function may_use_simd() return error status
x00270170 (1):
mmc: dw_mmc: fix card threshold control configuration
Greg KH
maintainerDocumentation/kbuild/kbuild.txt +0 -9
@@ -152,15 +152,6 @@ stripped after they are installed. If INSTALL_MOD_STRIP is '1', then the default option --strip-debug will be used. Otherwise, INSTALL_MOD_STRIP value will be used as the options to the strip command. -INSTALL_FW_PATH --------------------------------------------------- -INSTALL_FW_PATH specifies where to install the firmware blobs. -The default value is: - - $(INSTALL_MOD_PATH)/lib/firmware - -The value can be overridden in which case the default value is ignored. - INSTALL_HDR_PATH -------------------------------------------------- INSTALL_HDR_PATH specifies where to install user space headers when
Makefile +1 -1
@@ -1,7 +1,7 @@ # SPDX-License-Identifier: GPL-2.0 VERSION = 4 PATCHLEVEL = 14 -SUBLEVEL = 55 +SUBLEVEL = 56 EXTRAVERSION = NAME = Petit Gorille
arch/arm64/include/asm/simd.h +7 -12
@@ -29,20 +29,15 @@ DECLARE_PER_CPU(bool, kernel_neon_busy);static __must_check inline bool may_use_simd (void ) {/* -* The raw_cpu_read() is racy if called with preemption enabled. -* This is not a bug: kernel_neon_busy is only set when -* preemption is disabled, so we cannot migrate to another CPU -* while it is set, nor can we migrate to a CPU where it is set. -* So, if we find it clear on some CPU then we're guaranteed to -* find it clear on any CPU we could migrate to. -* -* If we are in between kernel_neon_begin()...kernel_neon_end(), -* the flag will be set, but preemption is also disabled, so we -* can't migrate to another CPU and spuriously see it become -* false. +* kernel_neon_busy is only set while preemption is disabled, +* and is clear whenever preemption is enabled. Since +* this_cpu_read() is atomic w.r.t. preemption, kernel_neon_busy +* cannot change under our feet -- if it's set we cannot be +* migrated, and if it's clear we cannot be migrated to a CPU +* where it is set. */ return !in_irq () && !irqs_disabled () && !in_nmi () && - !raw_cpu_read (kernel_neon_busy); + !this_cpu_read (kernel_neon_busy); }#else /* ! CONFIG_KERNEL_MODE_NEON */
arch/mips/kernel/process.c +29 -14
63 lines not on this page · raw message
arch/mips/kernel/traps.c +1 -0
@@ -351,6 +351,7 @@ static void __show_regs(const struct pt_regs *regs)void show_regs (struct pt_regs *regs) {__show_regs ((struct pt_regs *)regs); +dump_stack (); }void show_registers (struct pt_regs *regs)
arch/mips/mm/ioremap.c +25 -12
@@ -9,6 +9,7 @@#include <linux/export.h> #include <asm/addrspace.h> #include <asm/byteorder.h> +#include <linux/ioport.h> #include <linux/sched.h> #include <linux/slab.h> #include <linux/vmalloc.h>
@@ -98,6 +99,20 @@ static int remap_area_pages(unsigned long address, phys_addr_t phys_addr,return error; } +static int __ioremap_check_ram (unsigned long start_pfn,unsigned long nr_pages, +void *arg) +{ +unsigned long i; + +for (i =0 ; i < nr_pages; i++) { +if (pfn_valid (start_pfn + i) && + !PageReserved (pfn_to_page (start_pfn + i))) +return 1 ; + } + +return 0 ; +} +/* * Generic mapping function (not visible outside): */
@@ -116,8 +131,8 @@ static int remap_area_pages(unsigned long address, phys_addr_t phys_addr,void __iomem *__ioremap (phys_addr_t phys_addr,phys_addr_t size,unsigned long flags) { +unsigned long offset, pfn, last_pfn;struct vm_struct * area; -unsigned long offset;phys_addr_t last_addr;void * addr;
@@ -137,18 +152,16 @@ void __iomem * __ioremap(phys_addr_t phys_addr, phys_addr_t size, unsigned longreturn (void __iomem *)CKSEG1ADDR (phys_addr);/* -* Don't allow anybody to remap normal RAM that we're using.. +* Don't allow anybody to remap RAM that may be allocated by the page +* allocator, since that could lead to races & data clobbering. */ -if (phys_addr <virt_to_phys (high_memory)) { -char *t_addr, *t_end; -struct page *page; - - t_addr =__va (phys_addr); - t_end = t_addr + (size -1 ); - -for (page =virt_to_page (t_addr); page <=virt_to_page (t_end); page++) -if (!PageReserved (page)) -return NULL ; + pfn =PFN_DOWN (phys_addr); + last_pfn =PFN_DOWN (last_addr); +if (walk_system_ram_range (pfn, last_pfn - pfn +1 ,NULL , + __ioremap_check_ram) ==1 ) { +WARN_ONCE (1 ,"ioremap on RAM at %pa - %pa\n" , + &phys_addr, &last_addr); +return NULL ; }/*
arch/x86/crypto/Makefile +0 -4
@@ -15,7 +15,6 @@ obj-$(CONFIG_CRYPTO_GLUE_HELPER_X86) += glue_helper.o obj-$(CONFIG_CRYPTO_AES_586) += aes-i586.o obj-$(CONFIG_CRYPTO_TWOFISH_586) += twofish-i586.o -obj-$(CONFIG_CRYPTO_SALSA20_586) += salsa20-i586.o obj-$(CONFIG_CRYPTO_SERPENT_SSE2_586) += serpent-sse2-i586.o obj-$(CONFIG_CRYPTO_AES_X86_64) += aes-x86_64.o
@@ -24,7 +23,6 @@ obj-$(CONFIG_CRYPTO_CAMELLIA_X86_64) += camellia-x86_64.o obj-$(CONFIG_CRYPTO_BLOWFISH_X86_64) += blowfish-x86_64.o obj-$(CONFIG_CRYPTO_TWOFISH_X86_64) += twofish-x86_64.o obj-$(CONFIG_CRYPTO_TWOFISH_X86_64_3WAY) += twofish-x86_64-3way.o -obj-$(CONFIG_CRYPTO_SALSA20_X86_64) += salsa20-x86_64.o obj-$(CONFIG_CRYPTO_CHACHA20_X86_64) += chacha20-x86_64.o obj-$(CONFIG_CRYPTO_SERPENT_SSE2_X86_64) += serpent-sse2-x86_64.o obj-$(CONFIG_CRYPTO_AES_NI_INTEL) += aesni-intel.o
@@ -59,7 +57,6 @@ endif aes-i586-y := aes-i586-asm_32.o aes_glue.o twofish-i586-y := twofish-i586-asm_32.o twofish_glue.o -salsa20-i586-y := salsa20-i586-asm_32.o salsa20_glue.o serpent-sse2-i586-y := serpent-sse2-i586-asm_32.o serpent_sse2_glue.o aes-x86_64-y := aes-x86_64-asm_64.o aes_glue.o
@@ -68,7 +65,6 @@ camellia-x86_64-y := camellia-x86_64-asm_64.o camellia_glue.o blowfish-x86_64-y := blowfish-x86_64-asm_64.o blowfish_glue.o twofish-x86_64-y := twofish-x86_64-asm_64.o twofish_glue.o twofish-x86_64-3way-y := twofish-x86_64-asm_64-3way.o twofish_glue_3way.o -salsa20-x86_64-y := salsa20-x86_64-asm_64.o salsa20_glue.o chacha20-x86_64-y := chacha20-ssse3-x86_64.o chacha20_glue.o serpent-sse2-x86_64-y := serpent-sse2-x86_64-asm_64.o serpent_sse2_glue.o
arch/x86/crypto/salsa20-i586-asm_32.S deleted +0 -1114
1,114 lines not on this page · raw message
arch/x86/crypto/salsa20-x86_64-asm_64.S deleted +0 -919
919 lines not on this page · raw message
arch/x86/crypto/salsa20_glue.c deleted +0 -116
116 lines not on this page · raw message
arch/x86/kernel/uprobes.c +1 -1
@@ -290,7 +290,7 @@ static int uprobe_init_insn(struct arch_uprobe *auprobe, struct insn *insn, boolinsn_init (insn, auprobe->insn,sizeof (auprobe->insn), x86_64);/* has the side-effect of processing the entire instruction */ insn_get_length (insn); -if (WARN_ON_ONCE (!insn_complete (insn))) +if (!insn_complete (insn))return -ENOEXEC ;if (is_prefix_bad (insn))
arch/x86/xen/enlighten_pv.c +11 -13
@@ -1230,12 +1230,20 @@ asmlinkage __visible void __init xen_start_kernel(void)xen_setup_features (); -xen_setup_machphys_mapping (); -/* Install Xen paravirt ops */ pv_info = xen_info; pv_init_ops.patch = paravirt_patch_default; pv_cpu_ops = xen_cpu_ops; +xen_init_irq_ops (); + +/* +* Setup xen_vcpu early because it is needed for +* local_irq_disable(), irqs_disabled(), e.g. in printk(). +* +* Don't do the full vcpu_info placement stuff until we have +* the cpu_possible_mask and a non-dummy shared_info. +*/ +xen_vcpu_info_reset (0 ); x86_platform.get_nmi_reason = xen_get_nmi_reason;
@@ -1247,6 +1255,7 @@ asmlinkage __visible void __init xen_start_kernel(void)* Set up some pagetable state before starting to set any ptes. */ +xen_setup_machphys_mapping ();xen_init_mmu_ops ();/* Prevent unwanted bits from being set in PTEs. */
@@ -1271,20 +1280,9 @@ asmlinkage __visible void __init xen_start_kernel(void)get_cpu_cap (&boot_cpu_data);x86_configure_nx (); -xen_init_irq_ops (); -/* Let's presume PV guests always boot on vCPU with id 0. */ per_cpu (xen_vcpu_id,0 ) =0 ; -/* -* Setup xen_vcpu early because idt_setup_early_handler needs it for -* local_irq_disable(), irqs_disabled(). -* -* Don't do the full vcpu_info placement stuff until we have -* the cpu_possible_mask and a non-dummy shared_info. -*/ -xen_vcpu_info_reset (0 ); -idt_setup_early_handler ();xen_init_capabilities ();
arch/x86/xen/irq.c +1 -3
@@ -128,8 +128,6 @@ static const struct pv_irq_ops xen_irq_ops __initconst = {void __init xen_init_irq_ops (void ) { -/* For PVH we use default pv_irq_ops settings. */ -if (!xen_feature (XENFEAT_hvm_callback_vector)) - pv_irq_ops = xen_irq_ops; + pv_irq_ops = xen_irq_ops; x86_init.irqs.intr_init = xen_init_IRQ; }
crypto/Kconfig +0 -26
@@ -1324,32 +1324,6 @@ config CRYPTO_SALSA20 The Salsa20 stream cipher algorithm is designed by Daniel J. Bernstein <[email protected]>. See <http://cr.yp.to/snuffle.html> -config CRYPTO_SALSA20_586 - tristate "Salsa20 stream cipher algorithm (i586)" - depends on (X86 || UML_X86) && !64BIT - select CRYPTO_BLKCIPHER - help - Salsa20 stream cipher algorithm. - - Salsa20 is a stream cipher submitted to eSTREAM, the ECRYPT - Stream Cipher Project. See <http://www.ecrypt.eu.org/stream/> - - The Salsa20 stream cipher algorithm is designed by Daniel J. - Bernstein <[email protected]>. See <http://cr.yp.to/snuffle.html> - -config CRYPTO_SALSA20_X86_64 - tristate "Salsa20 stream cipher algorithm (x86_64)" - depends on (X86 || UML_X86) && 64BIT - select CRYPTO_BLKCIPHER - help - Salsa20 stream cipher algorithm. - - Salsa20 is a stream cipher submitted to eSTREAM, the ECRYPT - Stream Cipher Project. See <http://www.ecrypt.eu.org/stream/> - - The Salsa20 stream cipher algorithm is designed by Daniel J. - Bernstein <[email protected]>. See <http://cr.yp.to/snuffle.html> - config CRYPTO_CHACHA20 tristate "ChaCha20 cipher algorithm" select CRYPTO_BLKCIPHER
drivers/ata/ahci.c +59 -0
71 lines not on this page · raw message
drivers/ata/libata-core.c +3 -0
@@ -2501,6 +2501,9 @@ int ata_dev_configure(struct ata_device *dev) (id[ATA_ID_SATA_CAPABILITY] & 0xe) == 0x2) dev->horkage |= ATA_HORKAGE_NOLPM; +if (ap->flags &ATA_FLAG_NO_LPM ) + dev->horkage |=ATA_HORKAGE_NOLPM ; +if (dev->horkage &ATA_HORKAGE_NOLPM ) {ata_dev_warn (dev,"LPM support broken, forcing max_power\n" ); dev->link->ap->target_lpm_policy =ATA_LPM_MAX_POWER ;
drivers/ata/libata-scsi.c +12 -6
@@ -3801,10 +3801,20 @@ static unsigned int ata_scsi_zbc_out_xlat(struct ata_queued_cmd *qc)*/ goto invalid_param_len; } -if (block > dev->n_sectors) - goto out_of_range; all = cdb[14 ] &0x1 ; +if (all) { +/* +* Ignore the block address (zone ID) as defined by ZBC. +*/ + block =0 ; + }else if (block >= dev->n_sectors) { +/* +* Block must be a valid zone ID (a zone start LBA). +*/ + fp =2 ; + goto invalid_fld; + }if (ata_ncq_enabled (qc->dev) &&ata_fpdma_zac_mgmt_out_supported (qc->dev)) {
@@ -3833,10 +3843,6 @@ static unsigned int ata_scsi_zbc_out_xlat(struct ata_queued_cmd *qc) invalid_fld:ata_scsi_set_invalid_field (qc->dev, scmd, fp,0xff );return 1 ; - out_of_range: -/* "Logical Block Address out of range" */ -ata_scsi_set_sense (qc->dev, scmd,ILLEGAL_REQUEST ,0x21 ,0x00 ); -return 1 ; invalid_param_len:/* "Parameter list length error" */ ata_scsi_set_sense (qc->dev, scmd,ILLEGAL_REQUEST ,0x1a ,0x0 );
drivers/block/loop.c +44 -35
129 lines not on this page · raw message
drivers/block/loop.h +1 -0
@@ -58,6 +58,7 @@ struct loop_device {struct kthread_worker worker;struct task_struct *worker_task;bool use_dio; +bool sysfs_inited;struct request_queue *lo_queue;struct blk_mq_tag_set tag_set;
drivers/i2c/busses/i2c-tegra.c +8 -9
@@ -547,6 +547,14 @@ static int tegra_i2c_disable_packet_mode(struct tegra_i2c_dev *i2c_dev) {u32 cnfg; +/* +* NACK interrupt is generated before the I2C controller generates +* the STOP condition on the bus. So wait for 2 clock periods +* before disabling the controller so that the STOP condition has +* been delivered properly. +*/ +udelay (DIV_ROUND_UP (2 *1000000 , i2c_dev->bus_clk_rate)); + cnfg =i2c_readl (i2c_dev,I2C_CNFG );if (cnfg &I2C_CNFG_PACKET_MODE_EN )i2c_writel (i2c_dev, cnfg & ~I2C_CNFG_PACKET_MODE_EN ,I2C_CNFG );
@@ -708,15 +716,6 @@ static int tegra_i2c_xfer_msg(struct tegra_i2c_dev *i2c_dev,if (likely (i2c_dev->msg_err ==I2C_ERR_NONE ))return 0 ; -/* -* NACK interrupt is generated before the I2C controller generates -* the STOP condition on the bus. So wait for 2 clock periods -* before resetting the controller so that the STOP condition has -* been delivered properly. -*/ -if (i2c_dev->msg_err ==I2C_ERR_NO_ACK ) -udelay (DIV_ROUND_UP (2 *1000000 , i2c_dev->bus_clk_rate)); -tegra_i2c_init (i2c_dev);if (i2c_dev->msg_err ==I2C_ERR_NO_ACK ) {if (msg->flags &I2C_M_IGNORE_NAK )
drivers/infiniband/Kconfig +12 -0
@@ -34,6 +34,18 @@ config INFINIBAND_USER_ACCESS libibverbs, libibcm and a hardware driver library from <http://www.openfabrics.org/git/>. +config INFINIBAND_USER_ACCESS_UCM + bool "Userspace CM (UCM, DEPRECATED)" + depends on BROKEN + depends on INFINIBAND_USER_ACCESS + help + The UCM module has known security flaws, which no one is + interested to fix. The user-space part of this code was + dropped from the upstream a long time ago. + + This option is DEPRECATED and planned to be removed. + + config INFINIBAND_EXP_USER_ACCESS bool "Allow experimental support for Infiniband ABI" depends on INFINIBAND_USER_ACCESS
drivers/infiniband/core/Makefile +2 -2
@@ -5,8 +5,8 @@ user_access-$(CONFIG_INFINIBAND_ADDR_TRANS) := rdma_ucm.o obj-$(CONFIG_INFINIBAND) += ib_core.o ib_cm.o iw_cm.o \ $(infiniband-y) obj-$(CONFIG_INFINIBAND_USER_MAD) += ib_umad.o -obj-$(CONFIG_INFINIBAND_USER_ACCESS) += ib_uverbs.o ib_ucm.o \ - $(user_access-y) +obj-$(CONFIG_INFINIBAND_USER_ACCESS) += ib_uverbs.o $(user_access-y) +obj-$(CONFIG_INFINIBAND_USER_ACCESS_UCM) += ib_ucm.o $(user_access-y) ib_core-y := packer.o ud_header.o verbs.o cq.o rw.o sysfs.o \ device.o fmr_pool.o cache.o netlink.o \
drivers/infiniband/hw/cxgb4/mem.c +1 -1
@@ -720,7 +720,7 @@ static int c4iw_set_page(struct ib_mr *ibmr, u64 addr) {struct c4iw_mr *mhp =to_c4iw_mr (ibmr); -if (unlikely (mhp->mpl_len == mhp->max_mpl_len)) +if (unlikely (mhp->mpl_len == mhp->attr.pbl_size))return -ENOMEM ; mhp->mpl[mhp->mpl_len++] = addr;
drivers/infiniband/hw/hfi1/rc.c +1 -1
@@ -273,7 +273,7 @@ int hfi1_make_rc_req(struct rvt_qp *qp, struct hfi1_pkt_state *ps)lockdep_assert_held (&qp->s_lock); ps->s_txreq =get_txreq (ps->dev, qp); -if (IS_ERR (ps->s_txreq)) +if (!ps->s_txreq) goto bail_no_tx; ps->s_txreq->phdr.hdr.hdr_type = priv->hdr_type;
drivers/infiniband/hw/hfi1/uc.c +2 -2
@@ -1,5 +1,5 @@/* -* Copyright(c) 2015, 2016 Intel Corporation. +* Copyright(c) 2015 - 2018 Intel Corporation. * * This file is provided under a dual BSD/GPLv2 license. When using or * redistributing this file, you may do so under either license.
@@ -72,7 +72,7 @@ int hfi1_make_uc_req(struct rvt_qp *qp, struct hfi1_pkt_state *ps)int middle =0 ; ps->s_txreq =get_txreq (ps->dev, qp); -if (IS_ERR (ps->s_txreq)) +if (!ps->s_txreq) goto bail_no_tx;if (!(ib_rvt_state_ops[qp->state] &RVT_PROCESS_SEND_OK )) {
drivers/infiniband/hw/hfi1/ud.c +2 -2
@@ -1,5 +1,5 @@/* -* Copyright(c) 2015, 2016 Intel Corporation. +* Copyright(c) 2015 - 2018 Intel Corporation. * * This file is provided under a dual BSD/GPLv2 license. When using or * redistributing this file, you may do so under either license.
@@ -479,7 +479,7 @@ int hfi1_make_ud_req(struct rvt_qp *qp, struct hfi1_pkt_state *ps)u32 lid; ps->s_txreq =get_txreq (ps->dev, qp); -if (IS_ERR (ps->s_txreq)) +if (!ps->s_txreq) goto bail_no_tx;if (!(ib_rvt_state_ops[qp->state] &RVT_PROCESS_NEXT_SEND_OK )) {
drivers/infiniband/hw/hfi1/verbs_txreq.c +2 -2
@@ -1,5 +1,5 @@/* -* Copyright(c) 2016 - 2017 Intel Corporation. +* Copyright(c) 2016 - 2018 Intel Corporation. * * This file is provided under a dual BSD/GPLv2 license. When using or * redistributing this file, you may do so under either license.
@@ -94,7 +94,7 @@ struct verbs_txreq *__get_txreq(struct hfi1_ibdev *dev, struct rvt_qp *qp) __must_hold(&qp->s_lock) { -struct verbs_txreq *tx =ERR_PTR (-EBUSY ); +struct verbs_txreq *tx =NULL ;write_seqlock (&dev->txwait_lock);if (ib_rvt_state_ops[qp->state] &RVT_PROCESS_RECV_OK ) {
drivers/infiniband/hw/hfi1/verbs_txreq.h +2 -2
@@ -1,5 +1,5 @@/* -* Copyright(c) 2016 Intel Corporation. +* Copyright(c) 2016 - 2018 Intel Corporation. * * This file is provided under a dual BSD/GPLv2 license. When using or * redistributing this file, you may do so under either license.
@@ -83,7 +83,7 @@ static inline struct verbs_txreq *get_txreq(struct hfi1_ibdev *dev,if (unlikely (!tx)) {/* call slow path to get the lock */ tx =__get_txreq (dev, qp); -if (IS_ERR (tx)) +if (!tx)return tx; } tx->qp = qp;
drivers/media/rc/ir-mce_kbd-decoder.c +2 -0
@@ -130,6 +130,8 @@ static void mce_kbd_rx_timeout(unsigned long data)for (i =0 ; i <MCIR2_MASK_KEYS_START ; i++)input_report_key (mce_kbd->idev, kbd_keycodes[i],0 ); + +input_sync (mce_kbd->idev); }static enum mce_kbd_mode mce_kbd_mode (struct mce_kbd_dec *data)
drivers/misc/ibmasm/ibmasmfs.c +3 -24
@@ -507,35 +507,14 @@ static int remote_settings_file_close(struct inode *inode, struct file *file)static ssize_t remote_settings_file_read (struct file *file,char __user *buf,size_t count,loff_t *offset) {void __iomem *address = (void __iomem *)file->private_data; -unsigned char *page; -int retval;int len =0 ;unsigned int value; - -if (*offset <0 ) -return -EINVAL ; -if (count ==0 || count >1024 ) -return 0 ; -if (*offset !=0 ) -return 0 ; - - page = (unsigned char *)__get_free_page (GFP_KERNEL ); -if (!page) -return -ENOMEM ; +char lbuf[20 ]; value =readl (address); - len =sprintf (page,"%d\n" , value); - -if (copy_to_user (buf, page, len)) { - retval = -EFAULT ; - goto exit; - } - *offset += len; - retval = len; + len =snprintf (lbuf,sizeof (lbuf),"%d\n" , value); -exit: -free_page ((unsigned long )page); -return retval; +return simple_read_from_buffer (buf, count, offset, lbuf, len); }static ssize_t remote_settings_file_write (struct file *file,const char __user *ubuff,size_t count,loff_t *offset)
drivers/misc/vmw_balloon.c +2 -2
@@ -467,7 +467,7 @@ static int vmballoon_send_batched_lock(struct vmballoon *b, unsigned int num_pages, bool is_2m_pages, unsigned int *target) { unsigned long status; -unsigned long pfn =page_to_pfn (b->page); +unsigned long pfn =PHYS_PFN (virt_to_phys (b->batch_page));STATS_INC (b->stats.lock[is_2m_pages]);
@@ -515,7 +515,7 @@ static bool vmballoon_send_batched_unlock(struct vmballoon *b, unsigned int num_pages, bool is_2m_pages, unsigned int *target) { unsigned long status; -unsigned long pfn =page_to_pfn (b->page); +unsigned long pfn =PHYS_PFN (virt_to_phys (b->batch_page));STATS_INC (b->stats.unlock[is_2m_pages]);
drivers/mmc/host/dw_mmc.c +4 -3
@@ -1089,8 +1089,8 @@ static void dw_mci_ctrl_thld(struct dw_mci *host, struct mmc_data *data)* It's used when HS400 mode is enabled. */ if (data->flags &MMC_DATA_WRITE && - !(host->timing !=MMC_TIMING_MMC_HS400 )) -return ; + host->timing !=MMC_TIMING_MMC_HS400 ) + goto disable;if (data->flags &MMC_DATA_WRITE ) enable =SDMMC_CARD_WR_THR_EN ;
@@ -1098,7 +1098,8 @@ static void dw_mci_ctrl_thld(struct dw_mci *host, struct mmc_data *data) enable =SDMMC_CARD_RD_THR_EN ;if (host->timing !=MMC_TIMING_MMC_HS200 && - host->timing !=MMC_TIMING_UHS_SDR104 ) + host->timing !=MMC_TIMING_UHS_SDR104 && + host->timing !=MMC_TIMING_MMC_HS400 ) goto disable; blksz_depth = blksz / (1 << host->data_shift);
drivers/mmc/host/sdhci-esdhc-imx.c +9 -12
@@ -305,6 +305,15 @@ static u32 esdhc_readl_le(struct sdhci_host *host, int reg)if (imx_data->socdata->flags &ESDHC_FLAG_HS400 ) val |=SDHCI_SUPPORT_HS400 ; + +/* +* Do not advertise faster UHS modes if there are no +* pinctrl states for 100MHz/200MHz. +*/ +if (IS_ERR_OR_NULL (imx_data->pins_100mhz) || +IS_ERR_OR_NULL (imx_data->pins_200mhz)) + val &= ~(SDHCI_SUPPORT_SDR50 |SDHCI_SUPPORT_DDR50 + |SDHCI_SUPPORT_SDR104 |SDHCI_SUPPORT_HS400 ); } }
@@ -1135,18 +1144,6 @@ sdhci_esdhc_imx_probe_dt(struct platform_device *pdev, ESDHC_PINCTRL_STATE_100MHZ); imx_data->pins_200mhz =pinctrl_lookup_state (imx_data->pinctrl,ESDHC_PINCTRL_STATE_200MHZ ); -if (IS_ERR (imx_data->pins_100mhz) || -IS_ERR (imx_data->pins_200mhz)) { -dev_warn (mmc_dev (host->mmc), -"could not get ultra high speed state, work on normal mode\n" ); -/* -* fall back to not supporting uhs by specifying no -* 1.8v quirk -*/ - host->quirks2 |=SDHCI_QUIRK2_NO_1_8_V ; - } - }else { - host->quirks2 |=SDHCI_QUIRK2_NO_1_8_V ; }/* call to generic mmc_of_parse to support additional capabilities */
drivers/nvme/host/pci.c +16 -11
@@ -1233,17 +1233,15 @@ static int nvme_cmb_qdepth(struct nvme_dev *dev, int nr_io_queues,static int nvme_alloc_sq_cmds (struct nvme_dev *dev,struct nvme_queue *nvmeq,int qid,int depth) { -if (qid && dev->cmb && use_cmb_sqes &&NVME_CMB_SQS (dev->cmbsz)) { -unsigned offset = (qid -1 ) *roundup (SQ_SIZE (depth), - dev->ctrl.page_size); - nvmeq->sq_dma_addr = dev->cmb_bus_addr + offset; - nvmeq->sq_cmds_io = dev->cmb + offset; - }else { - nvmeq->sq_cmds =dma_alloc_coherent (dev->dev,SQ_SIZE (depth), - &nvmeq->sq_dma_addr,GFP_KERNEL ); -if (!nvmeq->sq_cmds) -return -ENOMEM ; - } + +/* CMB SQEs will be mapped before creation */ +if (qid && dev->cmb && use_cmb_sqes &&NVME_CMB_SQS (dev->cmbsz)) +return 0 ; + + nvmeq->sq_cmds =dma_alloc_coherent (dev->dev,SQ_SIZE (depth), + &nvmeq->sq_dma_addr,GFP_KERNEL ); +if (!nvmeq->sq_cmds) +return -ENOMEM ;return 0 ; }
@@ -1320,6 +1318,13 @@ static int nvme_create_queue(struct nvme_queue *nvmeq, int qid)struct nvme_dev *dev = nvmeq->dev;int result; +if (qid && dev->cmb && use_cmb_sqes &&NVME_CMB_SQS (dev->cmbsz)) { +unsigned offset = (qid -1 ) *roundup (SQ_SIZE (nvmeq->q_depth), + dev->ctrl.page_size); + nvmeq->sq_dma_addr = dev->cmb_bus_addr + offset; + nvmeq->sq_cmds_io = dev->cmb + offset; + } + nvmeq->cq_vector = qid -1 ; result =adapter_alloc_cq (dev, qid, nvmeq);if (result <0 )
drivers/scsi/megaraid/megaraid_sas.h +9 -1
@@ -1504,6 +1504,13 @@ enum FW_BOOT_CONTEXT {#define MR_CAN_HANDLE_SYNC_CACHE_OFFSET 0X01000000 +enum MR_ADAPTER_TYPE { +MFI_SERIES =1 , +THUNDERBOLT_SERIES =2 , +INVADER_SERIES =3 , +VENTURA_SERIES =4 , +}; +/* * register set for both 1068 and 1078 controllers
Lines of this file are not shown. View the raw message.
drivers/scsi/megaraid/megaraid_sas_base.c +194 -102
296 lines not on this page · raw message
drivers/scsi/megaraid/megaraid_sas_fp.c +10 -10
Lines of this file are not shown. View the raw message.
drivers/scsi/megaraid/megaraid_sas_fusion.c +25 -29
54 lines not on this page · raw message
drivers/scsi/megaraid/megaraid_sas_fusion.h +0 -7
Lines of this file are not shown. View the raw message.
drivers/staging/rtl8723bs/core/rtw_ap.c +1 -1
Lines of this file are not shown. View the raw message.
fs/devpts/inode.c +29 -19
48 lines not on this page · raw message
sound/soc/mediatek/common/mtk-afe-platform-driver.c +2 -2
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.