Linux 4.14.173
Greg KH
maintainerI'm announcing the release of the 4.14.173 kernel.
All users of the 4.14 kernel series must upgrade.
The updated 4.14.y git tree can be found at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git linux-4.14.y
and can be browsed at the normal kernel.org git web browser:
https://git.kernel.org/?p=linux/kernel/git/stable/linux-stable.git;a=summary
thanks,
greg k-h
------------
Makefile | 2 arch/arm/boot/dts/dra76x.dtsi | 5 + arch/arm/boot/dts/ls1021a.dtsi | 4 arch/arm/mach-imx/Makefile | 2 arch/arm/mach-imx/common.h | 4 arch/arm/mach-imx/resume-imx6.S | 24 +++++ arch/arm/mach-imx/suspend-imx6.S | 14 -- arch/mips/kernel/vpe.c | 2 arch/powerpc/kernel/cputable.c | 4 arch/x86/boot/compressed/pagetable.c | 3 arch/x86/kernel/cpu/common.c | 2 arch/x86/kernel/cpu/mcheck/mce-inject.c | 14 +- arch/x86/kernel/cpu/mcheck/mce.c | 22 +--- arch/x86/kvm/svm.c | 43 +++++++++ arch/x86/kvm/vmx.c | 15 +++ arch/x86/xen/enlighten_pv.c | 7 - drivers/acpi/acpi_watchdog.c | 3 drivers/char/ipmi/ipmi_ssif.c | 10 +- drivers/char/random.c | 5 - drivers/devfreq/devfreq.c | 4 drivers/dma/coh901318.c | 4 drivers/dma/tegra20-apb-dma.c | 6 - drivers/edac/amd64_edac.c | 1 drivers/gpu/drm/i915/gvt/vgpu.c | 2 drivers/gpu/drm/msm/dsi/dsi_manager.c | 7 + drivers/gpu/drm/msm/dsi/phy/dsi_phy.c | 4 drivers/gpu/drm/msm/mdp/mdp5/mdp5_crtc.c | 4 drivers/gpu/drm/msm/msm_drv.c | 8 + drivers/hid/hid-core.c | 4 drivers/hid/hid-ite.c | 5 - drivers/hid/usbhid/hiddev.c | 2 drivers/hwmon/adt7462.c | 2 drivers/i2c/busses/i2c-altera.c | 2 drivers/i2c/busses/i2c-jz4780.c | 36 ------- drivers/infiniband/core/cm.c | 1 drivers/infiniband/core/iwcm.c | 4 drivers/infiniband/core/security.c | 14 +- drivers/infiniband/hw/hfi1/verbs.c | 4 drivers/infiniband/hw/qib/qib_verbs.c | 2 drivers/md/dm-cache-target.c | 4 drivers/md/dm-integrity.c | 15 ++- drivers/net/dsa/bcm_sf2.c | 3 drivers/net/ethernet/amazon/ena/ena_com.c | 48 ++++++++-- drivers/net/ethernet/amazon/ena/ena_com.h | 9 + drivers/net/ethernet/amazon/ena/ena_ethtool.c | 46 +++++++++ drivers/net/ethernet/amazon/ena/ena_netdev.c | 6 - drivers/net/ethernet/amazon/ena/ena_netdev.h | 2 drivers/net/ethernet/apm/xgene/xgene_enet_main.c | 2 drivers/net/ethernet/aquantia/atlantic/aq_nic.c | 4 drivers/net/ethernet/cavium/thunder/thunder_bgx.c | 62 ++++++++++++- drivers/net/ethernet/cavium/thunder/thunder_bgx.h | 9 + drivers/net/ethernet/micrel/ks8851_mll.c | 53 +---------- drivers/net/ethernet/qlogic/qede/qede.h | 2 drivers/net/ethernet/qlogic/qede/qede_rdma.c | 29 +++++- drivers/net/phy/mdio-bcm-iproc.c | 20 ++++ drivers/net/tun.c | 19 +++- drivers/net/usb/qmi_wwan.c | 43 +++------ drivers/net/wireless/intel/iwlwifi/pcie/trans.c | 15 ++- drivers/net/wireless/marvell/mwifiex/tdls.c | 75 +++++----------- drivers/nfc/pn544/i2c.c | 1 drivers/nvme/host/core.c | 2 drivers/s390/cio/blacklist.c | 5 - drivers/tty/serial/8250/8250_exar.c | 33 +++++++ drivers/tty/serial/ar933x_uart.c | 8 + drivers/tty/serial/mvebu-uart.c | 2 drivers/tty/sysrq.c | 8 - drivers/tty/vt/selection.c | 26 ++++- drivers/tty/vt/vt.c | 2 drivers/usb/core/hub.c | 8 + drivers/usb/core/port.c | 10 +- drivers/usb/core/quirks.c | 3 drivers/usb/gadget/composite.c | 24 +++-- drivers/usb/gadget/function/f_fs.c | 5 - drivers/usb/gadget/function/u_serial.c | 4 drivers/usb/host/xhci-ring.c | 6 + drivers/usb/storage/unusual_devs.h | 6 + drivers/vhost/net.c | 13 -- drivers/video/console/vgacon.c | 3 drivers/watchdog/da9062_wdt.c | 7 - drivers/watchdog/wdat_wdt.c | 2 fs/cifs/cifsacl.c | 4 fs/cifs/connect.c | 2 fs/cifs/inode.c | 8 + fs/dax.c | 3 fs/ecryptfs/keystore.c | 4 fs/ext4/balloc.c | 14 ++ fs/ext4/ext4.h | 30 +++++- fs/ext4/ialloc.c | 23 ++-- fs/ext4/mballoc.c | 61 ++++++++----- fs/ext4/resize.c | 62 ++++++++++--- fs/ext4/super.c | 103 +++++++++++++++------- fs/fat/inode.c | 19 +--- fs/namei.c | 2 include/acpi/actypes.h | 3 include/linux/bitops.h | 3 include/linux/hid.h | 2 include/net/flow_dissector.h | 9 + include/uapi/linux/usb/charger.h | 16 +-- kernel/audit.c | 40 ++++---- kernel/auditfilter.c | 71 ++++++++------- kernel/kprobes.c | 71 +++++++++------ kernel/trace/trace.c | 2 mm/huge_memory.c | 26 +---- mm/mprotect.c | 38 +++++++- net/core/fib_rules.c | 2 net/ipv6/ip6_fib.c | 7 - net/ipv6/route.c | 1 net/mac80211/util.c | 18 ++- net/netfilter/nf_conntrack_core.c | 30 ++++-- net/netlink/af_netlink.c | 5 - net/sched/cls_flower.c | 1 net/sctp/sm_statefuns.c | 29 ++++-- net/wireless/ethtool.c | 8 + net/wireless/nl80211.c | 1 sound/soc/codecs/pcm512x.c | 8 + sound/soc/intel/skylake/skl-debug.c | 32 +++--- sound/soc/soc-dapm.c | 2 sound/soc/soc-pcm.c | 16 +-- sound/soc/soc-topology.c | 17 ++- tools/perf/ui/browsers/hists.c | 1 tools/testing/selftests/lib.mk | 23 ++-- virt/kvm/kvm_main.c | 12 +- 122 files changed, 1162 insertions(+), 612 deletions(-)
Ahmad Fatoum (1):
ARM: imx: build v7_cpu_resume() unconditionally
Aleksa Sarai (1):
namei: only return -ECHILD from follow_dotdot_rcu()
Arnaldo Carvalho de Melo (1):
perf hists browser: Restore ESC as "Zoom out" of DSO/thread/etc
Arthur Kiyanovski (8):
net: ena: fix potential crash when rxfh key is NULL
net: ena: fix uses of round_jiffies()
net: ena: add missing ethtool TX timestamping indication
net: ena: fix incorrect default RSS key
net: ena: rss: store hash function as values and not bits
net: ena: fix incorrectly saving queue numbers when setting RSS indirection table
net: ena: ena-com.c: prevent NULL pointer dereference
net: ena: make ena rxfh support ETH_RSS_HASH_NO_CHANGE
Arun Parameswaran (1):
net: phy: restore mdio regs in the iproc mdio driver
Benjamin Poirier (2):
ipv6: Fix nlmsg_flags when splitting a multipath route
ipv6: Fix route replacement with dev-only route
Bernard Metzler (1):
RDMA/iwcm: Fix iwcm work deallocation
Bjørn Mork (2):
qmi_wwan: re-add DW5821e pre-production variant
qmi_wwan: unconditionally reject 2 ep interfaces
Brian Masney (1):
drm/msm/mdp5: rate limit pp done timeout warnings
Brian Norris (1):
mwifiex: drop most magic numbers from mwifiex_process_tdls_action_frame()
Charles Keepax (1):
ASoC: dapm: Correct DAPM handling of active widgets during shutdown
Chris Wilson (1):
include/linux/bitops.h: introduce BITS_PER_TYPE
Christophe JAILLET (2):
MIPS: VPE: Fix a double free and a memory leak in 'release_vpe()'
drivers: net: xgene: Fix the order of the arguments of 'alloc_etherdev_mqs()'
Corey Minyard (1):
ipmi:ssif: Handle a possible NULL pointer reference
Dan Carpenter (3):
ext4: potential crash on allocation error in ext4_alloc_flex_bg_array()
hwmon: (adt7462) Fix an error return in ADT7462_REG_VOLT()
dmaengine: coh901318: Fix a double lock bug in dma_tc_handle()
Dan Lazewatsky (1):
usb: quirks: add NO_LPM quirk for Logitech Screen Share
Daniel Golle (1):
serial: ar933x_uart: set UART_CS_{RX,TX}_READY_ORIDE
David Rientjes (1):
mm, thp: fix defrag setting if newline is not used
Dennis Dalessandro (1):
IB/hfi1, qib: Ensure RCU is locked when accessing list
Desnes A. Nunes do Rosario (1):
powerpc: fix hardware PMU exception bug on PowerVM compatibility mode systems
Dmitry Osipenko (3):
nfc: pn544: Fix occasional HW initialization failure
dmaengine: tegra-apb: Fix use-after-free
dmaengine: tegra-apb: Prevent race conditions of tasklet vs free list
Dragos Tarcatu (2):
ASoC: topology: Fix memleak in soc_tplg_link_elems_load()
ASoC: topology: Fix memleak in soc_tplg_manifest_load()
Eugenio Pérez (1):
vhost: Check docket sk_family instead of call getname
Eugeniu Rosca (3):
usb: core: hub: fix unhandled return by employing a void function
usb: core: hub: do error out if usb_autopm_get_interface() fails
usb: core: port: do error out if usb_autopm_get_interface() fails
Faiz Abbas (1):
arm: dts: dra76x: Fix mmc3 max-frequency
Florian Fainelli (1):
net: dsa: bcm_sf2: Forcibly configure IMP port for 1Gb/sec
Frank Sorenson (1):
cifs: Fix mode output in debugging statements
Greg Kroah-Hartman (2):
Revert "char/random: silence a lockdep splat with printk()" Linux 4.14.173
Gustavo A. R. Silva (1):
i2c: altera: Fix potential integer overflow
H.J. Lu (1):
x86/boot/compressed: Don't declare __force_order in kaslr_64.c
Hans de Goede (1):
HID: ite: Only bind to keyboard USB interface on Acer SW5-012 keyboard dock
Harigovindan P (1):
drm/msm/dsi: save pll state before dsi host is powered off
Jack Pham (1):
usb: gadget: composite: Support more than 500mA MaxPower
Jason Baron (1):
net: sched: correct flower port blocking
Jason Gunthorpe (1):
RMDA/cm: Fix missing ib_cm_destroy_id() in ib_cm_insert_listen()
Jason Wang (1):
tuntap: correctly set SOCKWQ_ASYNC_NOSPACE
Jay Dolan (1):
serial: 8250_exar: add support for ACCES cards
Jeff Moyer (1):
dax: pass NOWAIT flag to iomap_apply
Jethro Beekman (1):
net: fib_rules: Correctly set table field when table number exceeds 8 bits
Jim Lin (1):
usb: storage: Add quirk for Samsung Fit flash
Jiri Benc (1):
selftests: fix too long argument
Jiri Slaby (3):
vt: selection, close sel_buffer race
vt: selection, push console lock down
vt: selection, push sel_lock up
Johan Korsnes (2):
HID: core: fix off-by-one memset in hid_report_raw_event()
HID: core: increase HID report buffer size to 8KiB
Johannes Berg (2):
iwlwifi: pcie: fix rb_allocator workqueue allocation
mac80211: consider more elements in parsing CRC
John Stultz (1):
drm: msm: Fix return type of dsi_mgr_connector_mode_valid for kCFI
Kees Cook (1):
x86/xen: Distribute switch variables for initialization
Keith Busch (1):
nvme: Fix uninitialized-variable warning
Lars-Peter Clausen (1):
usb: gadget: ffs: ffs_aio_cancel(): Save/restore IRQ flags
Maor Gottlieb (1):
RDMA/core: Fix pkey and port assignment in get_new_pps
Marco Felsch (1):
watchdog: da9062: do not ping the hw during stop()
Marek Vasut (3):
net: ks8851-ml: Remove 8-bit bus accessors
net: ks8851-ml: Fix 16-bit data access
net: ks8851-ml: Fix 16-bit IO operationMartynas Pumputis (1):
netfilter: nf_conntrack: resolve clash for matching conntracks
Masami Hiramatsu (2):
kprobes: Set unoptimized flag after unoptimizing code
kprobes: Fix optimize_kprobe()/unoptimize_kprobe() cancellation logic
Mathias Nyman (1):
xhci: handle port status events for removed USB3 hcd
Matthias Reichl (1):
ASoC: pcm512x: Fix unbalanced regulator enable call in probe error path
Mel Gorman (1):
mm, numa: fix bad pmd by atomically check for pmd_trans_huge when marking page tables prot_numa
Michal Kalderon (1):
qede: Fix race between rdma destroy workqueue and link change event
Mika Westerberg (2):
ACPICA: Introduce ACPI_ACCESS_BYTE_WIDTH() macro
ACPI: watchdog: Fix gas->access_width usage
Mikulas Patocka (2):
dm cache: fix a crash due to incorrect work item cancelling dm integrity: fix a deadlock due to offloading to an incorrect workqueue
Nathan Chancellor (2):
ecryptfs: Fix up bad backport of fe2e082f5da5b4a0a92ae32978f81507ef37ec66 RDMA/core: Fix use of logical OR in get_new_pps
Nikolay Aleksandrov (1):
net: netlink: cap max groups which will be considered in netlink_bind()
OGAWA Hirofumi (1):
fat: fix uninit-memory access for partial initialized inode
Oliver Upton (1):
KVM: VMX: check descriptor table exits on instruction emulation
Orson Zhai (1):
Revert "PM / devfreq: Modify the device name as devfreq(X) for sysfs"
Paul Moore (2):
audit: fix error handling in audit_data_to_entry()
audit: always check the netlink payload length in audit_receive_msg()
Pavel Belous (1):
net: atlantic: fix potential error handling
Peter Chen (1):
usb: charger: assign specific number for enum value
Petr Mladek (2):
sysrq: Restore original console_loglevel when sysrq disabled
sysrq: Remove duplicated sysrq message
Ronnie Sahlberg (1):
cifs: don't leak -EAGAIN for stat() during reconnect
Sameeh Jubran (2):
net: ena: rss: fix failure to get indirection table
net: ena: ethtool: use correct value for crc32 hash
Sean Christopherson (2):
KVM: Check for a bad hva before dropping into the ghc slow path x86/pkeys: Manually set X86_FEATURE_OSPKE to preserve existing changes
Sean Paul (1):
drm/msm: Set dma maximum segment size for mdss
Sergey Matyukevich (2):
cfg80211: check wiphy driver existence for drvinfo report
cfg80211: add missing policy for NL80211_ATTR_STATUS_CODE
Sergey Organov (1):
usb: gadget: serial: fix Tx stall after buffer overflow
Steven Rostedt (VMware) (1):
tracing: Disable trace_printk() on post poned tests
Suraj Jitindar Singh (2):
ext4: fix potential race between s_flex_groups online resizing and access
ext4: fix potential race between s_group_info online resizing and access
Takashi Iwai (3):
ASoC: intel: skl: Fix pin debug prints
ASoC: intel: skl: Fix possible buffer overflow in debug outputs
ASoC: pcm: Fix possible buffer overflow in dpcm state sysfs output
Theodore Ts'o (1):
ext4: fix potential race between online resizing and write operations
Tim Harvey (1):
net: thunderx: workaround BGX TX Underflow issue
Tina Zhang (1):
drm/i915/gvt: Separate display reset from ALL_ENGINES reset
Tom Lendacky (1):
KVM: SVM: Override default MMIO mask if memory encryption is enabled
Vasily Averin (1):
s390/cio: cio_ignore_proc_seq_next should increase position index
Vladimir Oltean (1):
ARM: dts: ls1021a: Restore MDIO compatible to gianfar
Wei Yang (1):
mm/huge_memory.c: use head to check huge zero page
Wolfram Sang (1):
i2c: jz4780: silence log flood on txabrt
Xin Long (1):
sctp: move the format error check out of __sctp_sf_do_9_1_abort
Yazen Ghannam (2):
x86/mce: Handle varying MCA bank counts
EDAC/amd64: Set grain per DIMM
Zhang Xiaoxu (1):
vgacon: Fix a UAF in vgacon_invert_region
[email protected] (1):
HID: hiddev: Fix race in in hiddev_disconnect()
tangbin (1):
tty:serial:mvebu-uart:fix a wrong return
Greg KH
maintainerMakefile +1 -1
@@ -1,7 +1,7 @@ # SPDX-License-Identifier: GPL-2.0 VERSION = 4 PATCHLEVEL = 14 -SUBLEVEL = 172 +SUBLEVEL = 173 EXTRAVERSION = NAME = Petit Gorille
arch/arm/boot/dts/dra76x.dtsi +5 -0
@@ -17,3 +17,8 @@ &crossbar_mpu { ti,irqs-skip = <10 67 68 133 139 140>; }; + +&mmc3 { + /* dra76x is not affected by i887 */ + max-frequency = <96000000>; +};
arch/arm/boot/dts/ls1021a.dtsi +2 -2
@@ -562,7 +562,7 @@ }; mdio0: mdio@2d24000 { - compatible = "fsl,etsec2-mdio"; + compatible = "gianfar"; device_type = "mdio"; #address-cells = <1>; #size-cells = <0>;
@@ -570,7 +570,7 @@ }; mdio1: mdio@2d64000 { - compatible = "fsl,etsec2-mdio"; + compatible = "gianfar"; device_type = "mdio"; #address-cells = <1>; #size-cells = <0>;
arch/arm/mach-imx/Makefile +2 -0
@@ -87,6 +87,8 @@ AFLAGS_suspend-imx6.o :=-Wa,-march=armv7-a obj-$(CONFIG_SOC_IMX6) += suspend-imx6.o obj-$(CONFIG_SOC_IMX53) += suspend-imx53.o endif +AFLAGS_resume-imx6.o :=-Wa,-march=armv7-a +obj-$(CONFIG_SOC_IMX6) += resume-imx6.o obj-$(CONFIG_SOC_IMX6) += pm-imx6.o obj-$(CONFIG_SOC_IMX1) += mach-imx1.o
arch/arm/mach-imx/common.h +2 -2
@@ -111,17 +111,17 @@ void imx_cpu_die(unsigned int cpu);int imx_cpu_kill (unsigned int cpu);#ifdef CONFIG_SUSPEND -void v7_cpu_resume (void );void imx53_suspend (void __iomem *ocram_vbase);extern const u32 imx53_suspend_sz;void imx6_suspend (void __iomem *ocram_vbase);#else -static inline void v7_cpu_resume (void ) {}static inline void imx53_suspend (void __iomem *ocram_vbase) {}static const u32 imx53_suspend_sz;static inline void imx6_suspend (void __iomem *ocram_vbase) {}#endif +void v7_cpu_resume (void ); +void imx6_pm_ccm_init (const char *ccm_compat);void imx6q_pm_init (void );void imx6dl_pm_init (void );
arch/arm/mach-imx/resume-imx6.S new file +24 -0
@@ -0,0 +1,24 @@ +/* SPDX-License-Identifier: GPL-2.0-or-later */ +/* + * Copyright 2014 Freescale Semiconductor, Inc. + */ + +#include <linux/linkage.h> +#include <asm/assembler.h> +#include <asm/asm-offsets.h> +#include <asm/hardware/cache-l2x0.h> +#include "hardware.h" + +/* + * The following code must assume it is running from physical address + * where absolute virtual addresses to the data section have to be + * turned into relative ones. + */ + +ENTRY(v7_cpu_resume) + bl v7_invalidate_l1 +#ifdef CONFIG_CACHE_L2X0 + bl l2c310_early_resume +#endif + b cpu_resume +ENDPROC(v7_cpu_resume)
arch/arm/mach-imx/suspend-imx6.S +0 -14
@@ -333,17 +333,3 @@ resume: ret lr ENDPROC(imx6_suspend) - -/* - * The following code must assume it is running from physical address - * where absolute virtual addresses to the data section have to be - * turned into relative ones. - */ - -ENTRY(v7_cpu_resume) - bl v7_invalidate_l1 -#ifdef CONFIG_CACHE_L2X0 - bl l2c310_early_resume -#endif - b cpu_resume -ENDPROC(v7_cpu_resume)
arch/mips/kernel/vpe.c +1 -1
@@ -134,7 +134,7 @@ void release_vpe(struct vpe *v) {list_del (&v->list);if (v->load_addr) -release_progmem (v); +release_progmem (v->load_addr);kfree (v); }
arch/powerpc/kernel/cputable.c +3 -1
@@ -2232,11 +2232,13 @@ static struct cpu_spec * __init setup_cpu_spec(unsigned long offset,* oprofile_cpu_type already has a value, then we are * possibly overriding a real PVR with a logical one, * and, in that case, keep the current value for -* oprofile_cpu_type. +* oprofile_cpu_type. Futhermore, let's ensure that the +* fix for the PMAO bug is enabled on compatibility mode. */ if (old.oprofile_cpu_type !=NULL ) { t->oprofile_cpu_type = old.oprofile_cpu_type; t->oprofile_type = old.oprofile_type; + t->cpu_features |= old.cpu_features &CPU_FTR_PMAO_BUG ; } }
arch/x86/boot/compressed/pagetable.c +0 -3
@@ -36,9 +36,6 @@#define __PAGE_OFFSET __PAGE_OFFSET_BASE#include "../../mm/ident_map.c" -/* Used by pgtable.h asm code to force instruction serialization. */ -unsigned long __force_order; -/* Used to track our page table allocation area. */ struct alloc_pgt_data {unsigned char *pgt_buf;
arch/x86/kernel/cpu/common.c +1 -1
@@ -360,7 +360,7 @@ static __always_inline void setup_pku(struct cpuinfo_x86 *c)* cpuid bit to be set. We need to ensure that we * update that bit in this CPU's "cpu_info". */ -get_cpu_cap (c); +set_cpu_cap (c,X86_FEATURE_OSPKE ); }#ifdef CONFIG_X86_INTEL_MEMORY_PROTECTION_KEYS
arch/x86/kernel/cpu/mcheck/mce-inject.c +7 -7
@@ -46,8 +46,6 @@static struct mce i_mce;static struct dentry *dfs_inj; -static u8 n_banks; -#define MAX_FLAG_OPT_SIZE 4#define NBCFG 0x44
@@ -570,9 +568,15 @@ static void do_inject(void)static int inj_bank_set (void *data,u64 val) {struct mce *m = (struct mce *)data; +u8 n_banks; +u64 cap; + +/* Get bank count on target CPU so we can handle non-uniform values. */ +rdmsrl_on_cpu (m->extcpu,MSR_IA32_MCG_CAP , &cap); + n_banks = cap &MCG_BANKCNT_MASK ;if (val >= n_banks) { -pr_err ("Non-existent MCE bank: %llu\n" , val); +pr_err ("MCA bank %llu non-existent on CPU%d\n" , val, m->extcpu);return -EINVAL ; }
@@ -665,10 +669,6 @@ static struct dfs_node {static int __init debugfs_init (void ) {unsigned int i; -u64 cap; - -rdmsrl (MSR_IA32_MCG_CAP , cap); - n_banks = cap &MCG_BANKCNT_MASK ; dfs_inj =debugfs_create_dir ("mce-inject" ,NULL );if (!dfs_inj)
arch/x86/kernel/cpu/mcheck/mce.c +7 -15
@@ -1499,13 +1499,12 @@ EXPORT_SYMBOL_GPL(mce_notify_irq);static int __mcheck_cpu_mce_banks_init (void ) {int i; -u8 num_banks = mca_cfg.banks; - mce_banks =kzalloc (num_banks *sizeof (struct mce_bank ),GFP_KERNEL ); + mce_banks =kcalloc (MAX_NR_BANKS ,sizeof (struct mce_bank ),GFP_KERNEL );if (!mce_banks)return -ENOMEM ; -for (i =0 ; i < num_banks; i++) { +for (i =0 ; i <MAX_NR_BANKS ; i++) {struct mce_bank *b = &mce_banks[i]; b->ctl =-1ULL ;
@@ -1519,28 +1518,19 @@ static int __mcheck_cpu_mce_banks_init(void)*/ static int __mcheck_cpu_cap_init (void ) { -unsigned b;u64 cap; +u8 b;rdmsrl (MSR_IA32_MCG_CAP , cap); b = cap &MCG_BANKCNT_MASK ; -if (!mca_cfg.banks) -pr_info ("CPU supports %d MCE banks\n" , b); - -if (b >MAX_NR_BANKS ) { -pr_warn ("Using only %u machine check banks out of %u\n" , -MAX_NR_BANKS , b); +if (WARN_ON_ONCE (b >MAX_NR_BANKS )) b =MAX_NR_BANKS ; - } -/* Don't support asymmetric configurations today */ -WARN_ON (mca_cfg.banks !=0 && b != mca_cfg.banks); - mca_cfg.banks = b; + mca_cfg.banks =max (mca_cfg.banks, b);if (!mce_banks) {int err =__mcheck_cpu_mce_banks_init (); -if (err)return err; }
@@ -2470,6 +2460,8 @@ EXPORT_SYMBOL_GPL(mcsafe_key);static int __init mcheck_late_init (void ) { +pr_info ("Using %d MCE banks\n" , mca_cfg.banks); +if (mca_cfg.recovery)static_branch_inc (&mcsafe_key);
arch/x86/kvm/svm.c +43 -0
55 lines not on this page · raw message
arch/x86/kvm/vmx.c +15 -0
@@ -12370,6 +12370,7 @@ static int vmx_check_intercept_io(struct kvm_vcpu *vcpu,else intercept =nested_vmx_check_io_bitmaps (vcpu, port, size); +/* FIXME: produce nested vmexit and return X86EMUL_INTERCEPTED. */ return intercept ?X86EMUL_UNHANDLEABLE :X86EMUL_CONTINUE ; }
@@ -12399,6 +12400,20 @@ static int vmx_check_intercept(struct kvm_vcpu *vcpu,case x86_intercept_outs:return vmx_check_intercept_io (vcpu, info); +case x86_intercept_lgdt: +case x86_intercept_lidt: +case x86_intercept_lldt: +case x86_intercept_ltr: +case x86_intercept_sgdt: +case x86_intercept_sidt: +case x86_intercept_sldt: +case x86_intercept_str: +if (!nested_cpu_has2 (vmcs12,SECONDARY_EXEC_DESC )) +return X86EMUL_CONTINUE ; + +/* FIXME: produce nested vmexit and return X86EMUL_INTERCEPTED. */ +break ; +/* TODO: check more intercepts... */ default :break ;
arch/x86/xen/enlighten_pv.c +4 -3
@@ -909,14 +909,15 @@ static u64 xen_read_msr_safe(unsigned int msr, int *err)static int xen_write_msr_safe (unsigned int msr,unsigned low,unsigned high) {int ret; +#ifdef CONFIG_X86_64 +unsigned int which; +u64 base; +#endif ret =0 ;switch (msr) {#ifdef CONFIG_X86_64 -unsigned which; -u64 base; -case MSR_FS_BASE : which =SEGBASE_FS ; goto set;case MSR_KERNEL_GS_BASE : which =SEGBASE_GS_USER ; goto set;case MSR_GS_BASE : which =SEGBASE_GS_KERNEL ; goto set;
drivers/acpi/acpi_watchdog.c +1 -2
@@ -129,12 +129,11 @@ void __init acpi_watchdog_init(void) gas = &entries[i].register_region; res.start = gas->address; + res.end = res.start +ACPI_ACCESS_BYTE_WIDTH (gas->access_width) -1 ;if (gas->space_id ==ACPI_ADR_SPACE_SYSTEM_MEMORY ) { res.flags =IORESOURCE_MEM ; - res.end = res.start +ALIGN (gas->access_width,4 ) -1 ; }else if (gas->space_id ==ACPI_ADR_SPACE_SYSTEM_IO ) { res.flags =IORESOURCE_IO ; - res.end = res.start + gas->access_width -1 ; }else {pr_warn ("Unsupported address space: %u\n" , gas->space_id);
drivers/char/ipmi/ipmi_ssif.c +7 -3
@@ -750,10 +750,14 @@ static void msg_done_handler(struct ssif_info *ssif_info, int result, flags =ipmi_ssif_lock_cond (ssif_info, &oflags); msg = ssif_info->curr_msg;if (msg) { +if (data) { +if (len >IPMI_MAX_MSG_LENGTH ) + len =IPMI_MAX_MSG_LENGTH ; +memcpy (msg->rsp, data, len); + }else { + len =0 ; + } msg->rsp_size = len; -if (msg->rsp_size >IPMI_MAX_MSG_LENGTH ) - msg->rsp_size =IPMI_MAX_MSG_LENGTH ; -memcpy (msg->rsp, data, msg->rsp_size); ssif_info->curr_msg =NULL ; }
drivers/char/random.c +2 -3
@@ -1598,9 +1598,8 @@ static void _warn_unseeded_randomness(const char *func_name, void *caller, print_once = true;#endif if (__ratelimit (&unseeded_warning)) -printk_deferred (KERN_NOTICE "random: %s called from %pS " -"with crng_init=%d\n" , func_name, caller, - crng_init); +pr_notice ("random: %s called from %pS with crng_init=%d\n" , + func_name, caller, crng_init); }/*
drivers/devfreq/devfreq.c +1 -3
@@ -513,7 +513,6 @@ struct devfreq *devfreq_add_device(struct device *dev, {struct devfreq *devfreq;struct devfreq_governor *governor; -static atomic_t devfreq_no =ATOMIC_INIT (-1 );int err =0 ;if (!dev || !profile || !governor_name) {
@@ -556,8 +555,7 @@ struct devfreq *devfreq_add_device(struct device *dev,mutex_lock (&devfreq->lock); } -dev_set_name (&devfreq->dev,"devfreq%d" , -atomic_inc_return (&devfreq_no)); +dev_set_name (&devfreq->dev,"%s" ,dev_name (dev)); err =device_register (&devfreq->dev);if (err) {mutex_unlock (&devfreq->lock);
drivers/dma/coh901318.c +0 -4
@@ -1944,8 +1944,6 @@ static void dma_tc_handle(struct coh901318_chan *cohc)return ; } -spin_lock (&cohc->lock); -/* * When we reach this point, at least one queue item * should have been moved over from cohc->queue to
@@ -1966,8 +1964,6 @@ static void dma_tc_handle(struct coh901318_chan *cohc)if (coh901318_queue_start (cohc) ==NULL ) cohc->busy =0 ; -spin_unlock (&cohc->lock); -/* * This tasklet will remove items from cohc->active * and thus terminates them.
drivers/dma/tegra20-apb-dma.c +1 -5
@@ -288,7 +288,7 @@ static struct tegra_dma_desc *tegra_dma_desc_get(/* Do not allocate if desc are waiting for ack */ list_for_each_entry (dma_desc, &tdc->free_dma_desc, node) { -if (async_tx_test_ack (&dma_desc->txd)) { +if (async_tx_test_ack (&dma_desc->txd) && !dma_desc->cb_count) {list_del (&dma_desc->node);spin_unlock_irqrestore (&tdc->lock, flags); dma_desc->txd.flags =0 ;
@@ -755,10 +755,6 @@ static int tegra_dma_terminate_all(struct dma_chan *dc)bool was_busy;spin_lock_irqsave (&tdc->lock, flags); -if (list_empty (&tdc->pending_sg_req)) { -spin_unlock_irqrestore (&tdc->lock, flags); -return 0 ; - }if (!tdc->busy) goto skip_dma_stop;
drivers/edac/amd64_edac.c +1 -0
@@ -2863,6 +2863,7 @@ static int init_csrows(struct mem_ctl_info *mci) dimm = csrow->channels[j]->dimm; dimm->mtype = pvt->dram_type; dimm->edac_mode = edac_mode; + dimm->grain =64 ; } }
drivers/gpu/drm/i915/gvt/vgpu.c +1 -1
@@ -513,9 +513,9 @@ void intel_gvt_reset_vgpu_locked(struct intel_vgpu *vgpu, bool dmlr,intel_vgpu_reset_mmio (vgpu, dmlr);populate_pvinfo_page (vgpu); -intel_vgpu_reset_display (vgpu);if (dmlr) { +intel_vgpu_reset_display (vgpu);intel_vgpu_reset_cfg_space (vgpu);/* only reset the failsafe mode when dmlr reset */ vgpu->failsafe = false;
drivers/gpu/drm/msm/dsi/dsi_manager.c +6 -1
@@ -400,7 +400,7 @@ static int dsi_mgr_connector_get_modes(struct drm_connector *connector)return num; } -static int dsi_mgr_connector_mode_valid (struct drm_connector *connector, +static enum drm_mode_status dsi_mgr_connector_mode_valid (struct drm_connector *connector,struct drm_display_mode *mode) {int id =dsi_mgr_connector_get_id (connector);
@@ -543,6 +543,7 @@ static void dsi_mgr_bridge_post_disable(struct drm_bridge *bridge)struct msm_dsi *msm_dsi1 =dsi_mgr_get_dsi (DSI_1 );struct mipi_dsi_host *host = msm_dsi->host;struct drm_panel *panel = msm_dsi->panel; +struct msm_dsi_pll *src_pll;bool is_dual_dsi =IS_DUAL_DSI ();int ret;
@@ -583,6 +584,10 @@ static void dsi_mgr_bridge_post_disable(struct drm_bridge *bridge) id, ret); } +/* Save PLL status if it is a clock source */ + src_pll =msm_dsi_phy_get_pll (msm_dsi->phy); +msm_dsi_pll_save_state (src_pll); + ret =msm_dsi_host_power_off (host);if (ret)pr_err ("%s: host %d power off failed,%d\n" , __func__, id, ret);
drivers/gpu/drm/msm/dsi/phy/dsi_phy.c +0 -4
@@ -613,10 +613,6 @@ void msm_dsi_phy_disable(struct msm_dsi_phy *phy)if (!phy || !phy->cfg->ops.disable)return ; -/* Save PLL status if it is a clock source */ -if (phy->usecase !=MSM_DSI_PHY_SLAVE ) -msm_dsi_pll_save_state (phy->pll); - phy->cfg->ops.disable (phy);dsi_phy_regulator_disable (phy);
drivers/gpu/drm/msm/mdp/mdp5/mdp5_crtc.c +2 -2
@@ -1004,8 +1004,8 @@ static void mdp5_crtc_wait_for_pp_done(struct drm_crtc *crtc) ret =wait_for_completion_timeout (&mdp5_crtc->pp_completion,msecs_to_jiffies (50 ));if (ret ==0 ) -dev_warn (dev->dev,"pp done time out, lm=%d\n" , - mdp5_cstate->pipeline.mixer->lm); +dev_warn_ratelimited (dev->dev,"pp done time out, lm=%d\n" , + mdp5_cstate->pipeline.mixer->lm); }static void mdp5_crtc_wait_for_flush_done (struct drm_crtc *crtc)
drivers/gpu/drm/msm/msm_drv.c +8 -0
@@ -420,6 +420,14 @@ static int msm_drm_init(struct device *dev, struct drm_driver *drv)if (ret) goto fail; +if (!dev->dma_parms) { + dev->dma_parms =devm_kzalloc (dev,sizeof (*dev->dma_parms), +GFP_KERNEL ); +if (!dev->dma_parms) +return -ENOMEM ; + } +dma_set_max_seg_size (dev,DMA_BIT_MASK (32 )); +msm_gem_shrinker_init (ddev);switch (get_mdp_ver (pdev)) {
drivers/hid/hid-core.c +3 -1
@@ -1567,7 +1567,9 @@ int hid_report_raw_event(struct hid_device *hid, int type, u8 *data, u32 size, rsize = ((report->size -1 ) >>3 ) +1 ; -if (rsize >HID_MAX_BUFFER_SIZE ) +if (report_enum->numbered && rsize >=HID_MAX_BUFFER_SIZE ) + rsize =HID_MAX_BUFFER_SIZE -1 ; +else if (rsize >HID_MAX_BUFFER_SIZE ) rsize =HID_MAX_BUFFER_SIZE ;if (csize < rsize) {
drivers/hid/hid-ite.c +3 -2
@@ -44,8 +44,9 @@ static const struct hid_device_id ite_devices[] = { { HID_USB_DEVICE(USB_VENDOR_ID_ITE, USB_DEVICE_ID_ITE8595) }, { HID_USB_DEVICE(USB_VENDOR_ID_258A, USB_DEVICE_ID_258A_6A88) },/* ITE8595 USB kbd ctlr, with Synaptics touchpad connected to it. */ - { HID_USB_DEVICE(USB_VENDOR_ID_SYNAPTICS, - USB_DEVICE_ID_SYNAPTICS_ACER_SWITCH5_012) }, + { HID_DEVICE(BUS_USB, HID_GROUP_GENERIC, +USB_VENDOR_ID_SYNAPTICS , + USB_DEVICE_ID_SYNAPTICS_ACER_SWITCH5_012) }, { } };MODULE_DEVICE_TABLE (hid, ite_devices);
drivers/hid/usbhid/hiddev.c +1 -1
@@ -954,9 +954,9 @@ void hiddev_disconnect(struct hid_device *hid) hiddev->exist =0 ;if (hiddev->open) { -mutex_unlock (&hiddev->existancelock);hid_hw_close (hiddev->hid);wake_up_interruptible (&hiddev->wait); +mutex_unlock (&hiddev->existancelock); }else {mutex_unlock (&hiddev->existancelock);kfree (hiddev);
drivers/hwmon/adt7462.c +1 -1
@@ -426,7 +426,7 @@ static int ADT7462_REG_VOLT(struct adt7462_data *data, int which)return 0x95 ;break ; } -return -ENODEV ; +return 0 ; }/* Provide labels for sysfs */
drivers/i2c/busses/i2c-altera.c +1 -1
@@ -182,7 +182,7 @@ static void altr_i2c_init(struct altr_i2c_dev *idev)/* SCL Low Time */ writel (t_low, idev->base +ALTR_I2C_SCL_LOW );/* SDA Hold Time, 300ns */ -writel (div_u64 (300 * clk_mhz,1000 ), idev->base +ALTR_I2C_SDA_HOLD ); +writel (3 * clk_mhz /10 , idev->base +ALTR_I2C_SDA_HOLD );/* Mask all master interrupt bits */ altr_i2c_int_enable (idev,ALTR_I2C_ALL_IRQ , false);
drivers/i2c/busses/i2c-jz4780.c +2 -34
@@ -82,25 +82,6 @@#define JZ4780_I2C_STA_TFNF BIT(1)#define JZ4780_I2C_STA_ACT BIT(0) -static const char *const jz4780_i2c_abrt_src[] = { -"ABRT_7B_ADDR_NOACK" , -"ABRT_10ADDR1_NOACK" , -"ABRT_10ADDR2_NOACK" , -"ABRT_XDATA_NOACK" , -"ABRT_GCALL_NOACK" , -"ABRT_GCALL_READ" , -"ABRT_HS_ACKD" , -"SBYTE_ACKDET" , -"ABRT_HS_NORSTRT" , -"SBYTE_NORSTRT" , -"ABRT_10B_RD_NORSTRT" , -"ABRT_MASTER_DIS" , -"ARB_LOST" , -"SLVFLUSH_TXFIFO" , -"SLV_ARBLOST" , -"SLVRD_INTX" , -}; -#define JZ4780_I2C_INTST_IGC BIT(11)#define JZ4780_I2C_INTST_ISTT BIT(10)#define JZ4780_I2C_INTST_ISTP BIT(9)
@@ -538,21 +519,8 @@ static irqreturn_t jz4780_i2c_irq(int irqno, void *dev_id)static void jz4780_i2c_txabrt (struct jz4780_i2c *i2c,int src) { -int i; - -dev_err (&i2c->adap.dev,"txabrt: 0x%08x\n" , src); -dev_err (&i2c->adap.dev,"device addr=%x\n" , -jz4780_i2c_readw (i2c,JZ4780_I2C_TAR )); -dev_err (&i2c->adap.dev,"send cmd count:%d %d\n" , - i2c->cmd, i2c->cmd_buf[i2c->cmd]); -dev_err (&i2c->adap.dev,"receive data count:%d %d\n" , - i2c->cmd, i2c->data_buf[i2c->cmd]); - -for (i =0 ; i <16 ; i++) { -if (src &BIT (i)) -dev_dbg (&i2c->adap.dev,"I2C TXABRT[%d]=%s\n" , - i, jz4780_i2c_abrt_src[i]); - } +dev_dbg (&i2c->adap.dev,"txabrt: 0x%08x, cmd: %d, send: %d, recv: %d\n" , + src, i2c->cmd, i2c->cmd_buf[i2c->cmd], i2c->data_buf[i2c->cmd]); } static inline int jz4780_i2c_xfer_read(struct jz4780_i2c *i2c,
drivers/infiniband/core/cm.c +1 -0
@@ -1143,6 +1143,7 @@ struct ib_cm_id *ib_cm_insert_listen(struct ib_device *device,/* Sharing an ib_cm_id with different handlers is not * supported */ spin_unlock_irqrestore (&cm.lock, flags); +ib_destroy_cm_id (cm_id);return ERR_PTR (-EINVAL ); }atomic_inc (&cm_id_priv->refcount);
drivers/infiniband/core/iwcm.c +3 -1
@@ -158,8 +158,10 @@ static void dealloc_work_entries(struct iwcm_id_private *cm_id_priv) {struct list_head *e, *tmp; -list_for_each_safe (e, tmp, &cm_id_priv->work_free_list) +list_for_each_safe (e, tmp, &cm_id_priv->work_free_list) { +list_del (e);kfree (list_entry(e ,struct iwcm_work ,free_list )); + } }static int alloc_work_entries (struct iwcm_id_private *cm_id_priv,int count)
drivers/infiniband/core/security.c +9 -5
@@ -339,15 +339,19 @@ static struct ib_ports_pkeys *get_new_pps(const struct ib_qp *qp,return NULL ;if (qp_attr_mask &IB_QP_PORT ) - new_pps->main.port_num = - (qp_pps) ? qp_pps->main.port_num : qp_attr->port_num; + new_pps->main.port_num = qp_attr->port_num; +else if (qp_pps) + new_pps->main.port_num = qp_pps->main.port_num; +if (qp_attr_mask &IB_QP_PKEY_INDEX ) - new_pps->main.pkey_index = (qp_pps) ? qp_pps->main.pkey_index : - qp_attr->pkey_index; + new_pps->main.pkey_index = qp_attr->pkey_index; +else if (qp_pps) + new_pps->main.pkey_index = qp_pps->main.pkey_index; +if ((qp_attr_mask &IB_QP_PKEY_INDEX ) && (qp_attr_mask &IB_QP_PORT )) new_pps->main.state =IB_PORT_PKEY_VALID ; -if (!(qp_attr_mask & (IB_QP_PKEY_INDEX ||IB_QP_PORT )) && qp_pps) { +if (!(qp_attr_mask & (IB_QP_PKEY_INDEX |IB_QP_PORT )) && qp_pps) { new_pps->main.port_num = qp_pps->main.port_num; new_pps->main.pkey_index = qp_pps->main.pkey_index;if (qp_pps->main.state !=IB_PORT_PKEY_NOT_VALID )
drivers/infiniband/hw/hfi1/verbs.c +3 -1
@@ -593,10 +593,11 @@ static inline void hfi1_handle_packet(struct hfi1_packet *packet, opa_get_lid(packet->dlid, 9B));if (!mcast) goto drop; +rcu_read_lock ();list_for_each_entry_rcu (p, &mcast->qp_list, list) { packet->qp = p->qp;if (hfi1_do_pkey_check (packet)) - goto drop; + goto unlock_drop;spin_lock_irqsave (&packet->qp->r_lock, flags); packet_handler =qp_ok (packet);if (likely (packet_handler))
@@ -605,6 +606,7 @@ static inline void hfi1_handle_packet(struct hfi1_packet *packet, ibp->rvp.n_pkt_drops++;spin_unlock_irqrestore (&packet->qp->r_lock, flags); } +rcu_read_unlock ();/* * Notify rvt_multicast_detach() if it is waiting for us * to finish.
drivers/infiniband/hw/qib/qib_verbs.c +2 -0
@@ -360,8 +360,10 @@ void qib_ib_rcv(struct qib_ctxtdata *rcd, void *rhdr, void *data, u32 tlen)if (mcast ==NULL ) goto drop;this_cpu_inc (ibp->pmastats->n_multicast_rcv); +rcu_read_lock ();list_for_each_entry_rcu (p, &mcast->qp_list, list)qib_qp_rcv (rcd, hdr,1 , data, tlen, p->qp); +rcu_read_unlock ();/* * Notify rvt_multicast_detach() if it is waiting for us * to finish.
drivers/md/dm-cache-target.c +2 -2
@@ -2971,8 +2971,8 @@ static void cache_postsuspend(struct dm_target *ti)prevent_background_work (cache);BUG_ON (atomic_read (&cache->nr_io_migrations)); -cancel_delayed_work (&cache->waker); -flush_workqueue (cache->wq); +cancel_delayed_work_sync (&cache->waker); +drain_workqueue (cache->wq);WARN_ON (cache->tracker.in_flight);/*
drivers/md/dm-integrity.c +13 -2
@@ -187,6 +187,7 @@ struct dm_integrity_c {struct rb_root in_progress;wait_queue_head_t endio_wait;struct workqueue_struct *wait_wq; +struct workqueue_struct *offload_wq;unsigned char commit_seq;commit_id_t commit_ids[N_COMMIT_IDS ];
@@ -1157,7 +1158,7 @@ static void dec_in_flight(struct dm_integrity_io *dio) dio->range.logical_sector += dio->range.n_sectors;bio_advance (bio, dio->range.n_sectors <<SECTOR_SHIFT );INIT_WORK (&dio->work, integrity_bio_wait); -queue_work (ic->wait_wq, &dio->work); +queue_work (ic->offload_wq, &dio->work);return ; }do_endio_flush (ic, dio);
@@ -1577,7 +1578,7 @@ static void dm_integrity_map_continue(struct dm_integrity_io *dio, bool from_mapif (need_sync_io && from_map) {INIT_WORK (&dio->work, integrity_bio_wait); -queue_work (ic->metadata_wq, &dio->work); +queue_work (ic->offload_wq, &dio->work);return ; }
@@ -3005,6 +3006,14 @@ static int dm_integrity_ctr(struct dm_target *ti, unsigned argc, char **argv) goto bad; } + ic->offload_wq =alloc_workqueue ("dm-integrity-offload" ,WQ_MEM_RECLAIM , +METADATA_WORKQUEUE_MAX_ACTIVE ); +if (!ic->offload_wq) { + ti->error ="Cannot allocate workqueue" ; + r = -ENOMEM ; + goto bad; + } + ic->commit_wq =alloc_workqueue ("dm-integrity-commit" ,WQ_MEM_RECLAIM ,1 );if (!ic->commit_wq) { ti->error ="Cannot allocate workqueue" ;
@@ -3189,6 +3198,8 @@ static void dm_integrity_dtr(struct dm_target *ti)destroy_workqueue (ic->metadata_wq);if (ic->wait_wq)destroy_workqueue (ic->wait_wq); +if (ic->offload_wq) +destroy_workqueue (ic->offload_wq);if (ic->commit_wq)destroy_workqueue (ic->commit_wq);if (ic->writer_wq)
drivers/net/dsa/bcm_sf2.c +1 -2
@@ -138,8 +138,7 @@ static void bcm_sf2_imp_setup(struct dsa_switch *ds, int port)/* Force link status for IMP port */ reg =core_readl (priv, offset); reg |= (MII_SW_OR |LINK_STS ); -if (priv->type ==BCM7278_DEVICE_ID ) - reg |=GMII_SPEED_UP_2G ; + reg &= ~GMII_SPEED_UP_2G ;core_writel (priv, reg, offset);/* Enable Broadcast, Multicast, Unicast forwarding to IMP port */
drivers/net/ethernet/amazon/ena/ena_com.c +39 -9
79 lines not on this page · raw message
drivers/net/ethernet/amazon/ena/ena_com.h +9 -0
@@ -42,6 +42,7 @@#include <linux/spinlock.h> #include <linux/types.h> #include <linux/wait.h> +#include <linux/netdevice.h> #include "ena_common_defs.h" #include "ena_admin_defs.h"
@@ -631,6 +632,14 @@ int ena_com_rss_init(struct ena_com_dev *ena_dev, u16 log_size);*/ void ena_com_rss_destroy (struct ena_com_dev *ena_dev); +/* ena_com_get_current_hash_function - Get RSS hash function +* @ena_dev: ENA communication layer struct +* +* Return the current hash function. +* @return: 0 or one of the ena_admin_hash_functions values. +*/ +int ena_com_get_current_hash_function (struct ena_com_dev *ena_dev); +/* ena_com_fill_hash_function - Fill RSS hash function * @ena_dev: ENA communication layer struct * @func: The hash function (Toeplitz or crc)
drivers/net/ethernet/amazon/ena/ena_ethtool.c +43 -3
83 lines not on this page · raw message
drivers/net/ethernet/amazon/ena/ena_netdev.c +3 -3
@@ -2803,8 +2803,8 @@ static void check_for_missing_keep_alive(struct ena_adapter *adapter)if (adapter->keep_alive_timeout ==ENA_HW_HINTS_NO_TIMEOUT )return ; - keep_alive_expired =round_jiffies (adapter->last_keep_alive_jiffies + - adapter->keep_alive_timeout); + keep_alive_expired = adapter->last_keep_alive_jiffies + + adapter->keep_alive_timeout;if (unlikely (time_is_before_jiffies (keep_alive_expired))) {netif_err (adapter, drv, adapter->netdev,"Keep alive watchdog timeout.\n" );
@@ -2906,7 +2906,7 @@ static void ena_timer_service(unsigned long data) }/* Reset the timer */ -mod_timer (&adapter->timer_service, jiffies +HZ ); +mod_timer (&adapter->timer_service,round_jiffies (jiffies +HZ )); } static int ena_calc_io_queue_num(struct pci_dev *pdev,
drivers/net/ethernet/amazon/ena/ena_netdev.h +2 -0
@@ -113,6 +113,8 @@#define ENA_IO_TXQ_IDX (q) (2 * (q))#define ENA_IO_RXQ_IDX (q) (2 * (q) + 1) +#define ENA_IO_TXQ_IDX_TO_COMBINED_IDX (q) ((q) / 2) +#define ENA_IO_RXQ_IDX_TO_COMBINED_IDX (q) (((q) - 1) / 2)#define ENA_MGMNT_IRQ_IDX 0#define ENA_IO_IRQ_FIRST_IDX 1
drivers/net/ethernet/apm/xgene/xgene_enet_main.c +1 -1
@@ -2034,7 +2034,7 @@ static int xgene_enet_probe(struct platform_device *pdev)int ret; ndev =alloc_etherdev_mqs (sizeof (struct xgene_enet_pdata ), -XGENE_NUM_RX_RING ,XGENE_NUM_TX_RING ); +XGENE_NUM_TX_RING ,XGENE_NUM_RX_RING );if (!ndev)return -ENOMEM ;
drivers/net/ethernet/aquantia/atlantic/aq_nic.c +3 -1
@@ -519,8 +519,10 @@ static unsigned int aq_nic_map_skb(struct aq_nic_s *self, dx_buff->len, DMA_TO_DEVICE); -if (unlikely (dma_mapping_error (aq_nic_get_dev (self), dx_buff->pa))) +if (unlikely (dma_mapping_error (aq_nic_get_dev (self), dx_buff->pa))) { + ret =0 ; goto exit; + } first = dx_buff; dx_buff->len_pkt = skb->len;
drivers/net/ethernet/cavium/thunder/thunder_bgx.c +59 -3
100 lines not on this page · raw message
drivers/net/ethernet/cavium/thunder/thunder_bgx.h +9 -0
@@ -179,6 +179,15 @@#define BGX_GMP_GMI_TXX_BURST 0x38228#define BGX_GMP_GMI_TXX_MIN_PKT 0x38240#define BGX_GMP_GMI_TXX_SGMII_CTL 0x38300 +#define BGX_GMP_GMI_TXX_INT 0x38500 +#define BGX_GMP_GMI_TXX_INT_W1S 0x38508 +#define BGX_GMP_GMI_TXX_INT_ENA_W1C 0x38510 +#define BGX_GMP_GMI_TXX_INT_ENA_W1S 0x38518 +#define GMI_TXX_INT_PTP_LOST BIT_ULL(4) +#define GMI_TXX_INT_LATE_COL BIT_ULL(3) +#define GMI_TXX_INT_XSDEF BIT_ULL(2) +#define GMI_TXX_INT_XSCOL BIT_ULL(1) +#define GMI_TXX_INT_UNDFLW BIT_ULL(0)#define BGX_MSIX_VEC_0_29_ADDR 0x400000/* +(0..29) << 4 */ #define BGX_MSIX_VEC_0_29_CTL 0x400008
drivers/net/ethernet/micrel/ks8851_mll.c +9 -44
116 lines not on this page · raw message
drivers/net/ethernet/qlogic/qede/qede.h +2 -0
@@ -156,6 +156,8 @@ struct qede_rdma_dev {struct list_head entry;struct list_head rdma_event_list;struct workqueue_struct *rdma_wq; +struct kref refcnt; +struct completion event_comp; };struct qede_ptp ;
drivers/net/ethernet/qlogic/qede/qede_rdma.c +28 -1
@@ -57,6 +57,9 @@ static void _qede_rdma_dev_add(struct qede_dev *edev)static int qede_rdma_create_wq (struct qede_dev *edev) {INIT_LIST_HEAD (&edev->rdma_info.rdma_event_list); +kref_init (&edev->rdma_info.refcnt); +init_completion (&edev->rdma_info.event_comp); + edev->rdma_info.rdma_wq =create_singlethread_workqueue ("rdma_wq" );if (!edev->rdma_info.rdma_wq) {DP_NOTICE (edev,"qedr: Could not create workqueue\n" );
@@ -81,8 +84,23 @@ static void qede_rdma_cleanup_event(struct qede_dev *edev) } } +static void qede_rdma_complete_event (struct kref *ref) +{ +struct qede_rdma_dev *rdma_dev = + container_of(ref, struct qede_rdma_dev, refcnt); + +/* no more events will be added after this */ +complete (&rdma_dev->event_comp); +} +static void qede_rdma_destroy_wq (struct qede_dev *edev) { +/* Avoid race with add_event flow, make sure it finishes before +* we start accessing the list and cleaning up the work +*/ +kref_put (&edev->rdma_info.refcnt, qede_rdma_complete_event); +wait_for_completion (&edev->rdma_info.event_comp); +qede_rdma_cleanup_event (edev);destroy_workqueue (edev->rdma_info.rdma_wq); }
@@ -287,15 +305,24 @@ static void qede_rdma_add_event(struct qede_dev *edev,if (!edev->rdma_info.qedr_dev)return ; +/* We don't want the cleanup flow to start while we're allocating and +* scheduling the work +*/ +if (!kref_get_unless_zero (&edev->rdma_info.refcnt)) +return ;/* already being destroyed */ + event_node =qede_rdma_get_free_event_node (edev);if (!event_node) -return ; + goto out; event_node->event = event; event_node->ptr = edev;INIT_WORK (&event_node->work, qede_rdma_handle_event);queue_work (edev->rdma_info.rdma_wq, &event_node->work); + +out: +kref_put (&edev->rdma_info.refcnt, qede_rdma_complete_event); }void qede_rdma_dev_event_open (struct qede_dev *edev)
drivers/net/phy/mdio-bcm-iproc.c +20 -0
@@ -188,6 +188,23 @@ static int iproc_mdio_remove(struct platform_device *pdev)return 0 ; } +#ifdef CONFIG_PM_SLEEP +int iproc_mdio_resume (struct device *dev) +{ +struct platform_device *pdev =to_platform_device (dev); +struct iproc_mdio_priv *priv =platform_get_drvdata (pdev); + +/* restore the mii clock configuration */ +iproc_mdio_config_clk (priv->base); + +return 0 ; +} + +static const struct dev_pm_ops iproc_mdio_pm_ops = { + .resume = iproc_mdio_resume +}; +#endif /* CONFIG_PM_SLEEP */ +static const struct of_device_id iproc_mdio_of_match[] = { { .compatible ="brcm,iproc-mdio" , }, {/* sentinel */ },
@@ -198,6 +215,9 @@ static struct platform_driver iproc_mdio_driver = { .driver = { .name = "iproc-mdio", .of_match_table = iproc_mdio_of_match, +#ifdef CONFIG_PM_SLEEP + .pm = &iproc_mdio_pm_ops, +#endif }, .probe = iproc_mdio_probe, .remove = iproc_mdio_remove,
drivers/net/tun.c +15 -4
@@ -1134,6 +1134,13 @@ static void tun_net_init(struct net_device *dev) dev->max_mtu =MAX_MTU - dev->hard_header_len; } +static bool tun_sock_writeable (struct tun_struct *tun,struct tun_file *tfile) +{ +struct sock *sk = tfile->socket.sk; + +return (tun->dev->flags &IFF_UP ) &&sock_writeable (sk); +} +/* Character device part */ /* Poll */
@@ -1156,10 +1163,14 @@ static unsigned int tun_chr_poll(struct file *file, poll_table *wait)if (!skb_array_empty (&tfile->tx_array)) mask |=POLLIN |POLLRDNORM ; -if (tun->dev->flags &IFF_UP && - (sock_writeable (sk) || - (!test_and_set_bit (SOCKWQ_ASYNC_NOSPACE , &sk->sk_socket->flags) && -sock_writeable (sk)))) +/* Make sure SOCKWQ_ASYNC_NOSPACE is set if not writable to +* guarantee EPOLLOUT to be raised by either here or +* tun_sock_write_space(). Then process could get notification +* after it writes to a down device and meets -EIO. +*/ +if (tun_sock_writeable (tun, tfile) || + (!test_and_set_bit (SOCKWQ_ASYNC_NOSPACE , &sk->sk_socket->flags) && +tun_sock_writeable (tun, tfile))) mask |=POLLOUT |POLLWRNORM ;if (tun->dev->reg_state !=NETREG_REGISTERED )
drivers/net/usb/qmi_wwan.c +16 -27
88 lines not on this page · raw message
drivers/net/wireless/intel/iwlwifi/pcie/trans.c +11 -4
@@ -3023,6 +3023,15 @@ struct iwl_trans *iwl_trans_pcie_alloc(struct pci_dev *pdev,spin_lock_init (&trans_pcie->reg_lock);mutex_init (&trans_pcie->mutex);init_waitqueue_head (&trans_pcie->ucode_write_waitq); + + trans_pcie->rba.alloc_wq =alloc_workqueue ("rb_allocator" , +WQ_HIGHPRI |WQ_UNBOUND ,1 ); +if (!trans_pcie->rba.alloc_wq) { + ret = -ENOMEM ; + goto out_free_trans; + } +INIT_WORK (&trans_pcie->rba.rx_alloc, iwl_pcie_rx_allocator_work); + trans_pcie->tso_hdr_page = alloc_percpu(struct iwl_tso_hdr_page);if (!trans_pcie->tso_hdr_page) { ret = -ENOMEM ;
@@ -3195,10 +3204,6 @@ struct iwl_trans *iwl_trans_pcie_alloc(struct pci_dev *pdev, trans_pcie->inta_mask =CSR_INI_SET_MASK ; } - trans_pcie->rba.alloc_wq =alloc_workqueue ("rb_allocator" , -WQ_HIGHPRI |WQ_UNBOUND ,1 ); -INIT_WORK (&trans_pcie->rba.rx_alloc, iwl_pcie_rx_allocator_work); -#ifdef CONFIG_IWLWIFI_PCIE_RTPM trans->runtime_pm_mode =IWL_PLAT_PM_MODE_D0I3 ;#else
@@ -3211,6 +3216,8 @@ struct iwl_trans *iwl_trans_pcie_alloc(struct pci_dev *pdev,iwl_pcie_free_ict (trans); out_no_pci:free_percpu (trans_pcie->tso_hdr_page); +destroy_workqueue (trans_pcie->rba.alloc_wq); +out_free_trans:iwl_trans_free (trans);return ERR_PTR (ret); }
drivers/net/wireless/marvell/mwifiex/tdls.c +28 -47
167 lines not on this page · raw message
drivers/nfc/pn544/i2c.c +1 -0
@@ -236,6 +236,7 @@ static void pn544_hci_i2c_platform_init(struct pn544_i2c_phy *phy) out:gpiod_set_value_cansleep (phy->gpiod_en, !phy->en_polarity); +usleep_range (10000 ,15000 ); }static void pn544_hci_i2c_enable_mode (struct pn544_i2c_phy *phy,int run_mode)
drivers/nvme/host/core.c +1 -1
@@ -889,8 +889,8 @@ static struct nvme_id_ns *nvme_identify_ns(struct nvme_ctrl *ctrl,static int nvme_set_features (struct nvme_ctrl *dev,unsigned fid,unsigned dword11,void *buffer,size_t buflen,u32 *result) { +union nvme_result res = {0 };struct nvme_command c; -union nvme_result res;int ret;memset (&c,0 ,sizeof (c));
drivers/s390/cio/blacklist.c +3 -2
@@ -303,8 +303,10 @@ static void * cio_ignore_proc_seq_next(struct seq_file *s, void *it, loff_t *offset) { struct ccwdev_iter *iter; +loff_t p = *offset; -if (*offset >= (__MAX_SUBCHANNEL +1 ) * (__MAX_SSID +1 )) + (*offset)++; +if (p >= (__MAX_SUBCHANNEL +1 ) * (__MAX_SSID +1 ))return NULL ; iter = it;if (iter->devno == __MAX_SUBCHANNEL) {
@@ -314,7 +316,6 @@ cio_ignore_proc_seq_next(struct seq_file *s, void *it, loff_t *offset)return NULL ; }else iter->devno++; - (*offset)++;return iter; }
drivers/tty/serial/8250/8250_exar.c +33 -0
@@ -27,6 +27,14 @@#include "8250.h" +#define PCI_DEVICE_ID_ACCES_COM_2S 0x1052 +#define PCI_DEVICE_ID_ACCES_COM_4S 0x105d +#define PCI_DEVICE_ID_ACCES_COM_8S 0x106c +#define PCI_DEVICE_ID_ACCES_COM232_8 0x10a8 +#define PCI_DEVICE_ID_ACCES_COM_2SM 0x10d2 +#define PCI_DEVICE_ID_ACCES_COM_4SM 0x10db +#define PCI_DEVICE_ID_ACCES_COM_8SM 0x10ea +#define PCI_DEVICE_ID_COMMTECH_4224PCI335 0x0002#define PCI_DEVICE_ID_COMMTECH_4222PCI335 0x0004#define PCI_DEVICE_ID_COMMTECH_2324PCI335 0x000a
@@ -562,6 +570,22 @@ static int __maybe_unused exar_resume(struct device *dev) static SIMPLE_DEV_PM_OPS(exar_pci_pm, exar_suspend, exar_resume); +static const struct exar8250_board acces_com_2x = { + .num_ports =2 , + .setup = pci_xr17c154_setup, +}; + +static const struct exar8250_board acces_com_4x = { + .num_ports =4 , + .setup = pci_xr17c154_setup, +}; + +static const struct exar8250_board acces_com_8x = { + .num_ports =8 , + .setup = pci_xr17c154_setup, +}; + +static const struct exar8250_board pbn_fastcom335_2 = { .num_ports =2 , .setup = pci_fastcom335_setup,
@@ -632,6 +656,15 @@ static const struct exar8250_board pbn_exar_XR17V8358 = { }static const struct pci_device_id exar_pci_tbl[] = { +EXAR_DEVICE (ACCESSIO ,ACCES_COM_2S , acces_com_2x), +EXAR_DEVICE (ACCESSIO ,ACCES_COM_4S , acces_com_4x), +EXAR_DEVICE (ACCESSIO ,ACCES_COM_8S , acces_com_8x), +EXAR_DEVICE (ACCESSIO ,ACCES_COM232_8 , acces_com_8x), +EXAR_DEVICE (ACCESSIO ,ACCES_COM_2SM , acces_com_2x), +EXAR_DEVICE (ACCESSIO ,ACCES_COM_4SM , acces_com_4x), +EXAR_DEVICE (ACCESSIO ,ACCES_COM_8SM , acces_com_8x), + +CONNECT_DEVICE (XR17C152 ,UART_2_232 , pbn_connect),CONNECT_DEVICE (XR17C154 ,UART_4_232 , pbn_connect),CONNECT_DEVICE (XR17C158 ,UART_8_232 , pbn_connect),
drivers/tty/serial/ar933x_uart.c +8 -0
@@ -289,6 +289,10 @@ static void ar933x_uart_set_termios(struct uart_port *port,ar933x_uart_rmw_set (up,AR933X_UART_CS_REG ,AR933X_UART_CS_HOST_INT_EN ); +/* enable RX and TX ready overide */ +ar933x_uart_rmw_set (up,AR933X_UART_CS_REG , +AR933X_UART_CS_TX_READY_ORIDE |AR933X_UART_CS_RX_READY_ORIDE ); +/* reenable the UART */ ar933x_uart_rmw(up, AR933X_UART_CS_REG, AR933X_UART_CS_IF_MODE_M << AR933X_UART_CS_IF_MODE_S,
@@ -421,6 +425,10 @@ static int ar933x_uart_startup(struct uart_port *port)ar933x_uart_rmw_set (up,AR933X_UART_CS_REG ,AR933X_UART_CS_HOST_INT_EN ); +/* enable RX and TX ready overide */ +ar933x_uart_rmw_set (up,AR933X_UART_CS_REG , +AR933X_UART_CS_TX_READY_ORIDE |AR933X_UART_CS_RX_READY_ORIDE ); +/* Enable RX interrupts */ up->ier =AR933X_UART_INT_RX_VALID ;ar933x_uart_write (up,AR933X_UART_INT_EN_REG , up->ier);
drivers/tty/serial/mvebu-uart.c +1 -1
@@ -581,7 +581,7 @@ static int mvebu_uart_probe(struct platform_device *pdev) port->membase =devm_ioremap_resource (&pdev->dev, reg);if (IS_ERR (port->membase)) -return -PTR_ERR (port->membase); +return PTR_ERR (port->membase); data =devm_kzalloc (&pdev->dev,sizeof (struct mvebu_uart_data ),GFP_KERNEL );
drivers/tty/sysrq.c +4 -4
@@ -546,7 +546,6 @@ void __handle_sysrq(int key, bool check_mask)*/ orig_log_level = console_loglevel; console_loglevel =CONSOLE_LOGLEVEL_DEFAULT ; -pr_info ("SysRq : " ); op_p =__sysrq_get_key_op (key);if (op_p) {
@@ -555,14 +554,15 @@ void __handle_sysrq(int key, bool check_mask)* should not) and is the invoked operation enabled? */ if (!check_mask ||sysrq_on_mask (op_p->enable_mask)) { -pr_cont ("%s\n" , op_p->action_msg); +pr_info ("%s\n" , op_p->action_msg); console_loglevel = orig_log_level; op_p->handler (key); }else { -pr_cont ("This sysrq operation is disabled.\n" ); +pr_info ("This sysrq operation is disabled.\n" ); + console_loglevel = orig_log_level; } }else { -pr_cont ("HELP : " ); +pr_info ("HELP : " );/* Only print the help msg once per handler */ for (i =0 ; i <ARRAY_SIZE (sysrq_key_table); i++) {if (sysrq_key_table[i]) {
drivers/tty/vt/selection.c +23 -3
@@ -14,6 +14,7 @@#include <linux/tty.h> #include <linux/sched.h> #include <linux/mm.h> +#include <linux/mutex.h> #include <linux/slab.h> #include <linux/types.h>
@@ -43,6 +44,7 @@ static volatile int sel_start = -1; /* cleared by clear_selection */static int sel_end;static int sel_buffer_lth;static char *sel_buffer; +static DEFINE_MUTEX (sel_lock);/* clear_selection, highlight and highlight_pointer can be called from interrupt (via scrollback/front) */
@@ -155,14 +157,14 @@ static int store_utf8(u16 c, char *p)* The entire selection process is managed under the console_lock. It's * a lot under the lock but its hardly a performance path */ -int set_selection (const struct tiocl_selection __user *sel,struct tty_struct *tty) +static int __set_selection (const struct tiocl_selection __user *sel,struct tty_struct *tty) {struct vc_data *vc = vc_cons[fg_console].d;int sel_mode, new_sel_start, new_sel_end, spc;char *bp, *obp;int i, ps, pe, multiplier;u16 c; -int mode; +int mode, ret =0 ;poke_blanked_console ();
@@ -323,7 +325,21 @@ int set_selection(const struct tiocl_selection __user *sel, struct tty_struct *t } } sel_buffer_lth = bp - sel_buffer; -return 0 ; + +return ret; +} + +int set_selection (const struct tiocl_selection __user *v,struct tty_struct *tty) +{ +int ret; + +mutex_lock (&sel_lock); +console_lock (); + ret =__set_selection (v, tty); +console_unlock (); +mutex_unlock (&sel_lock); + +return ret; }/* Insert the contents of the selection buffer into the
@@ -352,6 +368,7 @@ int paste_selection(struct tty_struct *tty)tty_buffer_lock_exclusive (&vc->port);add_wait_queue (&vc->paste_wait, &wait); +mutex_lock (&sel_lock);while (sel_buffer && sel_buffer_lth > pasted) {set_current_state (TASK_INTERRUPTIBLE );if (signal_pending (current)) {
@@ -359,7 +376,9 @@ int paste_selection(struct tty_struct *tty)break ; }if (tty_throttled (tty)) { +mutex_unlock (&sel_lock);schedule (); +mutex_lock (&sel_lock);continue ; }__set_current_state (TASK_RUNNING );
@@ -368,6 +387,7 @@ int paste_selection(struct tty_struct *tty) count); pasted += count; } +mutex_unlock (&sel_lock);remove_wait_queue (&vc->paste_wait, &wait);__set_current_state (TASK_RUNNING );
drivers/tty/vt/vt.c +0 -2
@@ -2688,9 +2688,7 @@ int tioclinux(struct tty_struct *tty, unsigned long arg)switch (type) {case TIOCL_SETSEL : -console_lock (); ret =set_selection ((struct tiocl_selection __user *)(p+1 ), tty); -console_unlock ();break ;case TIOCL_PASTESEL : ret =paste_selection (tty);
drivers/usb/core/hub.c +6 -2
@@ -958,13 +958,17 @@ int usb_remove_device(struct usb_device *udev) {struct usb_hub *hub;struct usb_interface *intf; +int ret;if (!udev->parent)/* Can't remove a root hub */ return -EINVAL ; hub =usb_hub_to_struct_hub (udev->parent); intf =to_usb_interface (hub->intfdev); -usb_autopm_get_interface (intf); + ret =usb_autopm_get_interface (intf); +if (ret <0 ) +return ret; +set_bit (udev->portnum, hub->removed_bits);hub_port_logical_disconnect (hub, udev->portnum);usb_autopm_put_interface (intf);
@@ -1818,7 +1822,7 @@ static int hub_probe(struct usb_interface *intf, const struct usb_device_id *id)if (id->driver_info &HUB_QUIRK_DISABLE_AUTOSUSPEND ) { hub->quirk_disable_autosuspend =1 ; -usb_autopm_get_interface (intf); +usb_autopm_get_interface_no_resume (intf); }if (hub_configure (hub, &desc->endpoint[0 ].desc) >=0 )
drivers/usb/core/port.c +8 -2
@@ -179,7 +179,10 @@ static int usb_port_runtime_resume(struct device *dev)if (!port_dev->is_superspeed && peer)pm_runtime_get_sync (&peer->dev); -usb_autopm_get_interface (intf); + retval =usb_autopm_get_interface (intf); +if (retval <0 ) +return retval; + retval =usb_hub_set_port_power (hdev, hub, port1, true);msleep (hub_power_on_good_delay (hub));if (udev && !retval) {
@@ -232,7 +235,10 @@ static int usb_port_runtime_suspend(struct device *dev)if (usb_port_block_power_off)return -EBUSY ; -usb_autopm_get_interface (intf); + retval =usb_autopm_get_interface (intf); +if (retval <0 ) +return retval; + retval =usb_hub_set_port_power (hdev, hub, port1, false);usb_clear_port_feature (hdev, port1,USB_PORT_FEAT_C_CONNECTION );if (!port_dev->is_superspeed)
drivers/usb/core/quirks.c +3 -0
@@ -86,6 +86,9 @@ static const struct usb_device_id usb_quirk_list[] = {/* Logitech PTZ Pro Camera */ { USB_DEVICE(0x046d, 0x0853), .driver_info = USB_QUIRK_DELAY_INIT }, + /* Logitech Screen Share */ + { USB_DEVICE(0x046d, 0x086c), .driver_info = USB_QUIRK_NO_LPM }, + /* Logitech Quickcam Fusion */ { USB_DEVICE(0x046d, 0x08c1), .driver_info = USB_QUIRK_RESET_RESUME },
drivers/usb/gadget/composite.c +18 -6
@@ -441,9 +441,13 @@ static u8 encode_bMaxPower(enum usb_device_speed speed,if (!val)return 0 ;if (speed <USB_SPEED_SUPER ) -return DIV_ROUND_UP (val,2 ); +return min (val,500U ) /2 ;else -return DIV_ROUND_UP (val,8 ); +/* +* USB 3.x supports up to 900mA, but since 900 isn't divisible +* by 8 the integral division will effectively cap to 896mA. +*/ +return min (val,900U ) /8 ; } static int config_buf(struct usb_configuration *config,
@@ -841,6 +845,10 @@ static int set_config(struct usb_composite_dev *cdev,/* when we return, be sure our power usage is valid */ power = c->MaxPower ? c->MaxPower :CONFIG_USB_GADGET_VBUS_DRAW ; +if (gadget->speed <USB_SPEED_SUPER ) + power =min (power,500U ); +else + power =min (power,900U ); done:usb_gadget_vbus_draw (gadget, power);if (result >=0 && cdev->delayed_status)
@@ -2280,7 +2288,7 @@ void composite_resume(struct usb_gadget *gadget) {struct usb_composite_dev *cdev =get_gadget_data (gadget);struct usb_function *f; -u16 maxpower; +unsigned maxpower;/* REVISIT: should we have config level * suspend/resume callbacks?
@@ -2294,10 +2302,14 @@ void composite_resume(struct usb_gadget *gadget) f->resume (f); } - maxpower = cdev->config->MaxPower; + maxpower = cdev->config->MaxPower ? + cdev->config->MaxPower :CONFIG_USB_GADGET_VBUS_DRAW ; +if (gadget->speed <USB_SPEED_SUPER ) + maxpower =min (maxpower,500U ); +else + maxpower =min (maxpower,900U ); -usb_gadget_vbus_draw (gadget, maxpower ? - maxpower :CONFIG_USB_GADGET_VBUS_DRAW ); +usb_gadget_vbus_draw (gadget, maxpower); } cdev->suspended =0 ;
drivers/usb/gadget/function/f_fs.c +3 -2
@@ -1078,18 +1078,19 @@ static int ffs_aio_cancel(struct kiocb *kiocb) {struct ffs_io_data *io_data = kiocb->private;struct ffs_epfile *epfile = kiocb->ki_filp->private_data; +unsigned long flags;int value;ENTER (); -spin_lock_irq (&epfile->ffs->eps_lock); +spin_lock_irqsave (&epfile->ffs->eps_lock, flags);if (likely (io_data && io_data->ep && io_data->req)) value =usb_ep_dequeue (io_data->ep, io_data->req);else value = -EINVAL ; -spin_unlock_irq (&epfile->ffs->eps_lock); +spin_unlock_irqrestore (&epfile->ffs->eps_lock, flags);return value; }
drivers/usb/gadget/function/u_serial.c +3 -1
@@ -715,8 +715,10 @@ static int gs_start_io(struct gs_port *port) port->n_read =0 ; started =gs_start_rx (port); -/* unblock any pending writes into our circular buffer */ if (started) { +gs_start_tx (port); +/* Unblock any pending writes into our circular buffer, in case +* we didn't in gs_start_tx() */ tty_wakeup (port->port.tty); }else {gs_free_requests (ep, head, &port->read_allocated);
drivers/usb/host/xhci-ring.c +6 -0
@@ -1640,6 +1640,12 @@ static void handle_port_status(struct xhci_hcd *xhci,if ((major_revision ==0x03 ) != (hcd->speed >=HCD_USB3 )) hcd = xhci->shared_hcd; +if (!hcd) { +xhci_dbg (xhci,"No hcd found for port %u event\n" , port_id); + bogus_port_status = true; + goto cleanup; + } +if (major_revision ==0 ) { xhci_warn(xhci, "Event for port %u not in " "Extended Capabilities, ignoring.\n",
drivers/usb/storage/unusual_devs.h +6 -0
@@ -1277,6 +1277,12 @@ UNUSUAL_DEV( 0x090a, 0x1200, 0x0000, 0x9999, USB_SC_RBC, USB_PR_BULK, NULL, 0 ), +UNUSUAL_DEV (0x090c ,0x1000 ,0x1100 ,0x1100 , +"Samsung" , +"Flash Drive FIT" , +USB_SC_DEVICE ,USB_PR_DEVICE ,NULL , +US_FL_MAX_SECTORS_64 ), +/* aeb */ UNUSUAL_DEV( 0x090c, 0x1132, 0x0000, 0xffff, "Feiya",
drivers/vhost/net.c +2 -11
@@ -1025,11 +1025,7 @@ static int vhost_net_release(struct inode *inode, struct file *f)static struct socket *get_raw_socket (int fd) { -struct { -struct sockaddr_ll sa; -char buf[MAX_ADDR_LEN ]; - } uaddr; -int uaddr_len =sizeof uaddr, r; +int r;struct socket *sock =sockfd_lookup (fd, &r);if (!sock)
@@ -1041,12 +1037,7 @@ static struct socket *get_raw_socket(int fd) goto err; } - r = sock->ops->getname (sock, (struct sockaddr *)&uaddr.sa, - &uaddr_len,0 ); -if (r) - goto err; - -if (uaddr.sa.sll_family !=AF_PACKET ) { +if (sock->sk->sk_family !=AF_PACKET ) { r = -EPFNOSUPPORT ; goto err; }
drivers/video/console/vgacon.c +3 -0
@@ -1309,6 +1309,9 @@ static int vgacon_font_get(struct vc_data *c, struct console_font *font)static int vgacon_resize (struct vc_data *c,unsigned int width,unsigned int height,unsigned int user) { +if ((width <<1 ) * height > vga_vram_size) +return -EINVAL ; +if (width %2 || width > screen_info.orig_video_cols || height > (screen_info.orig_video_lines * vga_default_font_height)/ c->vc_font.height)
drivers/watchdog/da9062_wdt.c +0 -7
@@ -126,13 +126,6 @@ static int da9062_wdt_stop(struct watchdog_device *wdd)struct da9062_watchdog *wdt =watchdog_get_drvdata (wdd);int ret; - ret =da9062_reset_watchdog_timer (wdt); -if (ret) { -dev_err (wdt->hw->dev,"Failed to ping the watchdog (err = %d)\n" , - ret); -return ret; - } - ret = regmap_update_bits(wdt->hw->regmap, DA9062AA_CONTROL_D, DA9062AA_TWDSCALE_MASK,
drivers/watchdog/wdat_wdt.c +1 -1
@@ -392,7 +392,7 @@ static int wdat_wdt_probe(struct platform_device *pdev)memset (&r,0 ,sizeof (r)); r.start = gas->address; - r.end = r.start + gas->access_width -1 ; + r.end = r.start +ACPI_ACCESS_BYTE_WIDTH (gas->access_width) -1 ;if (gas->space_id ==ACPI_ADR_SPACE_SYSTEM_MEMORY ) { r.flags =IORESOURCE_MEM ; }else if (gas->space_id ==ACPI_ADR_SPACE_SYSTEM_IO ) {
fs/cifs/cifsacl.c +2 -2
@@ -603,7 +603,7 @@ static void access_flags_to_mode(__le32 ace_flags, int type, umode_t *pmode, ((flags & FILE_EXEC_RIGHTS) == FILE_EXEC_RIGHTS)) *pmode |= (S_IXUGO & (*pbits_to_set)); -cifs_dbg (NOISY ,"access flags 0x%x mode now 0x%x\n" , flags, *pmode); +cifs_dbg (NOISY ,"access flags 0x%x mode now %04o\n" , flags, *pmode);return ; }
@@ -632,7 +632,7 @@ static void mode_to_access_flags(umode_t mode, umode_t bits_to_use,if (mode &S_IXUGO ) *pace_flags |=SET_FILE_EXEC_RIGHTS ; -cifs_dbg (NOISY ,"mode: 0x%x, access flags now 0x%x\n" , +cifs_dbg (NOISY ,"mode: %04o, access flags now 0x%x\n" , mode, *pace_flags);return ; }
fs/cifs/connect.c +1 -1
@@ -3521,7 +3521,7 @@ int cifs_setup_cifs_sb(struct smb_vol *pvolume_info, cifs_sb->mnt_gid = pvolume_info->linux_gid; cifs_sb->mnt_file_mode = pvolume_info->file_mode; cifs_sb->mnt_dir_mode = pvolume_info->dir_mode; -cifs_dbg (FYI ,"file mode: 0x%hx dir mode: 0x%hx\n" , +cifs_dbg (FYI ,"file mode: %04ho dir mode: %04ho\n" , cifs_sb->mnt_file_mode, cifs_sb->mnt_dir_mode); cifs_sb->actimeo = pvolume_info->actimeo;
fs/cifs/inode.c +6 -2
@@ -1581,7 +1581,7 @@ int cifs_mkdir(struct inode *inode, struct dentry *direntry, umode_t mode)struct TCP_Server_Info *server;char *full_path; -cifs_dbg (FYI ,"In cifs_mkdir, mode = 0x%hx inode = 0x%p\n" , +cifs_dbg (FYI ,"In cifs_mkdir, mode = %04ho inode = 0x%p\n" , mode, inode); cifs_sb =CIFS_SB (inode->i_sb);
@@ -1998,6 +1998,7 @@ int cifs_revalidate_dentry_attr(struct dentry *dentry)struct inode *inode =d_inode (dentry);struct super_block *sb = dentry->d_sb;char *full_path =NULL ; +int count =0 ;if (inode ==NULL )return -ENOENT ;
@@ -2019,15 +2020,18 @@ int cifs_revalidate_dentry_attr(struct dentry *dentry) full_path, inode, inode->i_count.counter, dentry, cifs_get_time(dentry), jiffies); +again:if (cifs_sb_master_tcon (CIFS_SB (sb))->unix_ext) rc =cifs_get_inode_info_unix (&inode, full_path, sb, xid);else rc =cifs_get_inode_info (&inode, full_path,NULL , sb, xid,NULL ); - +if (rc == -EAGAIN && count++ <10 ) + goto again; out:kfree (full_path);free_xid (xid); +return rc; }
fs/dax.c +3 -0
@@ -1057,6 +1057,9 @@ dax_iomap_rw(struct kiocb *iocb, struct iov_iter *iter,lockdep_assert_held (&inode->i_rwsem); } +if (iocb->ki_flags &IOCB_NOWAIT ) + flags |=IOMAP_NOWAIT ; +while (iov_iter_count (iter)) { ret =iomap_apply (inode, pos,iov_iter_count (iter), flags, ops, iter, dax_iomap_actor);
fs/ecryptfs/keystore.c +2 -2
@@ -1285,7 +1285,7 @@ parse_tag_1_packet(struct ecryptfs_crypt_stat *crypt_stat,printk (KERN_ERR "Enter w/ first byte != 0x%.2x\n" ,ECRYPTFS_TAG_1_PACKET_TYPE ); rc = -EINVAL ; - goto out_free; + goto out; }/* Released: wipe_auth_tok_list called in ecryptfs_parse_packet_set or * at end of function upon failure */
@@ -1335,7 +1335,7 @@ parse_tag_1_packet(struct ecryptfs_crypt_stat *crypt_stat,printk (KERN_WARNING "Tag 1 packet contains key larger " "than ECRYPTFS_MAX_ENCRYPTED_KEY_BYTES" ); rc = -EINVAL ; - goto out; + goto out_free; }memcpy ((*new_auth_tok)->session_key.encrypted_key, &data[(*packet_size)], (body_size - (ECRYPTFS_SIG_SIZE +2 )));
fs/ext4/balloc.c +11 -3
@@ -280,6 +280,7 @@ struct ext4_group_desc * ext4_get_group_desc(struct super_block *sb,ext4_group_t ngroups =ext4_get_groups_count (sb);struct ext4_group_desc *desc;struct ext4_sb_info *sbi =EXT4_SB (sb); +struct buffer_head *bh_p;if (block_group >= ngroups) { ext4_error(sb, "block_group >= groups_count - block_group = %u,"
@@ -290,7 +291,14 @@ struct ext4_group_desc * ext4_get_group_desc(struct super_block *sb, group_desc = block_group >>EXT4_DESC_PER_BLOCK_BITS (sb); offset = block_group & (EXT4_DESC_PER_BLOCK (sb) -1 ); -if (!sbi->s_group_desc[group_desc]) { + bh_p =sbi_array_rcu_deref (sbi, s_group_desc, group_desc); +/* +* sbi_array_rcu_deref returns with rcu unlocked, this is ok since +* the pointer being dereferenced won't be dereferenced again. By +* looking at the usage in add_new_gdb() the value isn't modified, +* just the pointer, and so it remains valid. +*/ +if (!bh_p) {ext4_error (sb,"Group descriptor not loaded - " "block_group = %u, group_desc = %u, desc = %u" , block_group, group_desc, offset);
@@ -298,10 +306,10 @@ struct ext4_group_desc * ext4_get_group_desc(struct super_block *sb, } desc = (struct ext4_group_desc *)( - (__u8 *)sbi->s_group_desc[group_desc]->b_data + + (__u8 *)bh_p->b_data + offset *EXT4_DESC_SIZE (sb));if (bh) - *bh = sbi->s_group_desc[group_desc]; + *bh = bh_p;return desc; }
fs/ext4/ext4.h +24 -6
@@ -1382,7 +1382,7 @@ struct ext4_sb_info {loff_t s_bitmap_maxbytes;/* max bytes for bitmap files */ struct buffer_head * s_sbh;/* Buffer containing the super block */ struct ext4_super_block *s_es;/* Pointer to the super block in the buffer */ -struct buffer_head **s_group_desc; +struct buffer_head *__rcu *s_group_desc;unsigned int s_mount_opt;unsigned int s_mount_opt2;unsigned int s_mount_flags;
@@ -1442,7 +1442,7 @@ struct ext4_sb_info {#endif /* for buddy allocator */ -struct ext4_group_info ***s_group_info; +struct ext4_group_info **__rcu *s_group_info;struct inode *s_buddy_cache;spinlock_t s_md_lock;unsigned short *s_mb_offsets;
@@ -1492,7 +1492,7 @@ struct ext4_sb_info {unsigned int s_extent_max_zeroout_kb;unsigned int s_log_groups_per_flex; -struct flex_groups *s_flex_groups; +struct flex_groups *__rcu *s_flex_groups;ext4_group_t s_flex_groups_allocated;/* workqueue for reserved extent conversions (buffered io) */
@@ -1556,6 +1556,23 @@ static inline int ext4_valid_inum(struct super_block *sb, unsigned long ino) ino <= le32_to_cpu(EXT4_SB(sb)->s_es->s_inodes_count)); } +/* +* Returns: sbi->field[index] +* Used to access an array element from the following sbi fields which require +* rcu protection to avoid dereferencing an invalid pointer due to reassignment +* - s_group_desc +* - s_group_info +* - s_flex_group +*/ +#define sbi_array_rcu_deref (sbi, field, index) \ +({ \ + typeof(*((sbi)->field)) _v; \ + rcu_read_lock(); \ + _v = ((typeof(_v)*)rcu_dereference((sbi)->field))[index]; \ + rcu_read_unlock(); \ + _v; \ +}) +/* * Inode dynamic state flags */
@@ -2569,6 +2586,7 @@ extern int ext4_generic_delete_entry(handle_t *handle,extern bool ext4_empty_dir (struct inode *inode);/* resize.c */ +extern void ext4_kvfree_array_rcu (void *to_free);extern int ext4_group_add (struct super_block *sb,struct ext4_new_group_data *input); extern int ext4_group_extend(struct super_block *sb,
@@ -2814,13 +2832,13 @@ static inlinestruct ext4_group_info *ext4_get_group_info (struct super_block *sb,ext4_group_t group) { -struct ext4_group_info ***grp_info; +struct ext4_group_info **grp_info;long indexv, indexh;BUG_ON (group >=EXT4_SB (sb)->s_groups_count); - grp_info =EXT4_SB (sb)->s_group_info; indexv = group >> (EXT4_DESC_PER_BLOCK_BITS (sb)); indexh = group & ((EXT4_DESC_PER_BLOCK (sb)) -1 ); -return grp_info[indexv][indexh]; + grp_info =sbi_array_rcu_deref (EXT4_SB (sb), s_group_info, indexv); +return grp_info[indexh]; }/*
fs/ext4/ialloc.c +14 -9
@@ -333,11 +333,13 @@ void ext4_free_inode(handle_t *handle, struct inode *inode)percpu_counter_inc (&sbi->s_freeinodes_counter);if (sbi->s_log_groups_per_flex) { -ext4_group_t f =ext4_flex_group (sbi, block_group); +struct flex_groups *fg; -atomic_inc (&sbi->s_flex_groups[f].free_inodes); + fg =sbi_array_rcu_deref (sbi, s_flex_groups, +ext4_flex_group (sbi, block_group)); +atomic_inc (&fg->free_inodes);if (is_directory) -atomic_dec (&sbi->s_flex_groups[f].used_dirs); +atomic_dec (&fg->used_dirs); }BUFFER_TRACE (bh2,"call ext4_handle_dirty_metadata" ); fatal =ext4_handle_dirty_metadata (handle,NULL , bh2);
@@ -378,12 +380,13 @@ static void get_orlov_stats(struct super_block *sb, ext4_group_t g, int flex_size, struct orlov_stats *stats) { struct ext4_group_desc *desc; -struct flex_groups *flex_group =EXT4_SB (sb)->s_flex_groups;if (flex_size >1 ) { - stats->free_inodes =atomic_read (&flex_group[g].free_inodes); - stats->free_clusters =atomic64_read (&flex_group[g].free_clusters); - stats->used_dirs =atomic_read (&flex_group[g].used_dirs); +struct flex_groups *fg =sbi_array_rcu_deref (EXT4_SB (sb), + s_flex_groups, g); + stats->free_inodes =atomic_read (&fg->free_inodes); + stats->free_clusters =atomic64_read (&fg->free_clusters); + stats->used_dirs =atomic_read (&fg->used_dirs);return ; }
@@ -1062,7 +1065,8 @@ struct inode *__ext4_new_inode(handle_t *handle, struct inode *dir,if (sbi->s_log_groups_per_flex) {ext4_group_t f =ext4_flex_group (sbi, group); -atomic_inc (&sbi->s_flex_groups[f].used_dirs); +atomic_inc (&sbi_array_rcu_deref (sbi, s_flex_groups, + f)->used_dirs); } }if (ext4_has_group_desc_csum (sb)) {
@@ -1085,7 +1089,8 @@ struct inode *__ext4_new_inode(handle_t *handle, struct inode *dir,if (sbi->s_log_groups_per_flex) { flex_group =ext4_flex_group (sbi, group); -atomic_dec (&sbi->s_flex_groups[flex_group].free_inodes); +atomic_dec (&sbi_array_rcu_deref (sbi, s_flex_groups, + flex_group)->free_inodes); } inode->i_ino = ino + group *EXT4_INODES_PER_GROUP (sb);
fs/ext4/mballoc.c +41 -20
141 lines not on this page · raw message
fs/ext4/resize.c +49 -13
126 lines not on this page · raw message
fs/ext4/super.c +72 -31
185 lines not on this page · raw message
fs/fat/inode.c +7 -12
@@ -736,6 +736,13 @@ static struct inode *fat_alloc_inode(struct super_block *sb)return NULL ;init_rwsem (&ei->truncate_lock); +/* Zeroing to allow iput() even if partial initialized inode. */ + ei->mmu_private =0 ; + ei->i_start =0 ; + ei->i_logstart =0 ; + ei->i_attrs =0 ; + ei->i_pos =0 ; +return &ei->vfs_inode; }
@@ -1366,16 +1373,6 @@ static int parse_options(struct super_block *sb, char *options, int is_vfat,return 0 ; } -static void fat_dummy_inode_init (struct inode *inode) -{ -/* Initialize this dummy inode to work as no-op. */ -MSDOS_I (inode)->mmu_private =0 ; -MSDOS_I (inode)->i_start =0 ; -MSDOS_I (inode)->i_logstart =0 ; -MSDOS_I (inode)->i_attrs =0 ; -MSDOS_I (inode)->i_pos =0 ; -} -static int fat_read_root (struct inode *inode) {struct msdos_sb_info *sbi =MSDOS_SB (inode->i_sb);
@@ -1820,13 +1817,11 @@ int fat_fill_super(struct super_block *sb, void *data, int silent, int isvfat, fat_inode =new_inode (sb);if (!fat_inode) goto out_fail; -fat_dummy_inode_init (fat_inode); sbi->fat_inode = fat_inode; fsinfo_inode =new_inode (sb);if (!fsinfo_inode) goto out_fail; -fat_dummy_inode_init (fsinfo_inode); fsinfo_inode->i_ino =MSDOS_FSINFO_INO ; sbi->fsinfo_inode = fsinfo_inode;insert_inode_hash (fsinfo_inode);
fs/namei.c +1 -1
@@ -1382,7 +1382,7 @@ static int follow_dotdot_rcu(struct nameidata *nd) nd->path.dentry = parent; nd->seq = seq;if (unlikely (!path_connected (&nd->path))) -return -ENOENT ; +return -ECHILD ;break ; }else {struct mount *mnt =real_mount (nd->path.mnt);
include/acpi/actypes.h +2 -1
@@ -556,11 +556,12 @@ typedef u64 acpi_integer;#define ACPI_MAKE_RSDP_SIG (dest) (memcpy (ACPI_CAST_PTR (char, (dest)), ACPI_SIG_RSDP, 8))/* -* Algorithm to obtain access bit width. +* Algorithm to obtain access bit or byte width. * Can be used with access_width of struct acpi_generic_address and access_size of * struct acpi_resource_generic_register. */ #define ACPI_ACCESS_BIT_WIDTH (size) (1 << ((size) + 2)) +#define ACPI_ACCESS_BYTE_WIDTH (size) (1 << ((size) - 1))/******************************************************************************* *
include/linux/bitops.h +2 -1
@@ -4,7 +4,8 @@#include <asm/types.h> #include <linux/bits.h> -#define BITS_TO_LONGS (nr) DIV_ROUND_UP(nr, BITS_PER_BYTE * sizeof(long)) +#define BITS_PER_TYPE (type) (sizeof(type) * BITS_PER_BYTE) +#define BITS_TO_LONGS (nr) DIV_ROUND_UP(nr, BITS_PER_TYPE(long))extern unsigned int __sw_hweight8 (unsigned int w);extern unsigned int __sw_hweight16 (unsigned int w);
include/linux/hid.h +1 -1
@@ -477,7 +477,7 @@ struct hid_report_enum { };#define HID_MIN_BUFFER_SIZE 64/* make sure there is at least a packet size of space */ -#define HID_MAX_BUFFER_SIZE 4096/* 4kb */ +#define HID_MAX_BUFFER_SIZE 8192/* 8kb */ #define HID_CONTROL_FIFO_SIZE 256/* to init devices with >100 reports */ #define HID_OUTPUT_FIFO_SIZE 64
include/net/flow_dissector.h +9 -0
@@ -5,6 +5,7 @@#include <linux/types.h> #include <linux/in6.h> #include <linux/siphash.h> +#include <linux/string.h> #include <uapi/linux/if_ether.h> /**
@@ -282,4 +283,12 @@ static inline void *skb_flow_dissector_target(struct flow_dissector *flow_dissec return ((char *)target_container) + flow_dissector->offset[key_id]; } +static inline void +flow_dissector_init_keys (struct flow_dissector_key_control *key_control, +struct flow_dissector_key_basic *key_basic) +{ +memset (key_control,0 ,sizeof (*key_control)); +memset (key_basic,0 ,sizeof (*key_basic)); +} +#endif
include/uapi/linux/usb/charger.h +8 -8
@@ -14,18 +14,18 @@* ACA (Accessory Charger Adapters) */ enum usb_charger_type { -UNKNOWN_TYPE , -SDP_TYPE , -DCP_TYPE , -CDP_TYPE , -ACA_TYPE , +UNKNOWN_TYPE =0 , +SDP_TYPE =1 , +DCP_TYPE =2 , +CDP_TYPE =3 , +ACA_TYPE =4 , };/* USB charger state */ enum usb_charger_state { -USB_CHARGER_DEFAULT , -USB_CHARGER_PRESENT , -USB_CHARGER_ABSENT , +USB_CHARGER_DEFAULT =0 , +USB_CHARGER_PRESENT =1 , +USB_CHARGER_ABSENT =2 , };#endif /* _UAPI__LINUX_USB_CHARGER_H */
kernel/audit.c +21 -19
@@ -1067,13 +1067,11 @@ static void audit_log_feature_change(int which, u32 old_feature, u32 new_featureaudit_log_end (ab); } -static int audit_set_feature (struct sk_buff *skb) +static int audit_set_feature (struct audit_features *uaf) { -struct audit_features *uaf;int i;BUILD_BUG_ON (AUDIT_LAST_FEATURE +1 >ARRAY_SIZE (audit_feature_names)); - uaf =nlmsg_data (nlmsg_hdr (skb));/* if there is ever a version 2 we should handle that here */
@@ -1141,6 +1139,7 @@ static int audit_receive_msg(struct sk_buff *skb, struct nlmsghdr *nlh) {u32 seq;void *data; +int data_len;int err;struct audit_buffer *ab;u16 msg_type = nlh->nlmsg_type;
@@ -1154,6 +1153,7 @@ static int audit_receive_msg(struct sk_buff *skb, struct nlmsghdr *nlh) seq = nlh->nlmsg_seq; data =nlmsg_data (nlh); + data_len =nlmsg_len (nlh);switch (msg_type) {case AUDIT_GET : {
@@ -1177,7 +1177,7 @@ static int audit_receive_msg(struct sk_buff *skb, struct nlmsghdr *nlh)struct audit_status s;memset (&s,0 ,sizeof (s));/* guard against past and future API changes */ -memcpy (&s, data,min_t (size_t,sizeof (s),nlmsg_len (nlh))); +memcpy (&s, data,min_t (size_t,sizeof (s), data_len));if (s.mask &AUDIT_STATUS_ENABLED ) { err =audit_set_enabled (s.enabled);if (err <0 )
@@ -1281,7 +1281,9 @@ static int audit_receive_msg(struct sk_buff *skb, struct nlmsghdr *nlh)return err;break ;case AUDIT_SET_FEATURE : - err =audit_set_feature (skb); +if (data_len <sizeof (struct audit_features )) +return -EINVAL ; + err =audit_set_feature (data);if (err)return err;break ;
@@ -1293,6 +1295,8 @@ static int audit_receive_msg(struct sk_buff *skb, struct nlmsghdr *nlh) err =audit_filter (msg_type,AUDIT_FILTER_USER );if (err ==1 ) {/* match or error */ +char *str = data; + err =0 ;if (msg_type ==AUDIT_USER_TTY ) { err =tty_audit_push ();
@@ -1300,26 +1304,24 @@ static int audit_receive_msg(struct sk_buff *skb, struct nlmsghdr *nlh)break ; }audit_log_common_recv_msg (&ab, msg_type); -if (msg_type !=AUDIT_USER_TTY ) +if (msg_type !=AUDIT_USER_TTY ) { +/* ensure NULL termination */ + str[data_len -1 ] ='\0' ;audit_log_format (ab," msg='%.*s'" ,AUDIT_MESSAGE_TEXT_MAX , - (char *)data); -else { -int size; - + str); + }else {audit_log_format (ab," data=" ); - size =nlmsg_len (nlh); -if (size >0 && - ((unsigned char *)data)[size -1 ] =='\0' ) - size--; -audit_log_n_untrustedstring (ab, data, size); +if (data_len >0 && str[data_len -1 ] =='\0' ) + data_len--; +audit_log_n_untrustedstring (ab, str, data_len); }audit_log_end (ab); }break ;case AUDIT_ADD_RULE :case AUDIT_DEL_RULE : -if (nlmsg_len (nlh) <sizeof (struct audit_rule_data )) +if (data_len <sizeof (struct audit_rule_data ))return -EINVAL ;if (audit_enabled ==AUDIT_LOCKED ) {audit_log_common_recv_msg (&ab,AUDIT_CONFIG_CHANGE );
@@ -1327,7 +1329,7 @@ static int audit_receive_msg(struct sk_buff *skb, struct nlmsghdr *nlh)audit_log_end (ab);return -EPERM ; } - err =audit_rule_change (msg_type, seq, data,nlmsg_len (nlh)); + err =audit_rule_change (msg_type, seq, data, data_len);break ;case AUDIT_LIST_RULES : err =audit_list_rules_send (skb, seq);
@@ -1341,7 +1343,7 @@ static int audit_receive_msg(struct sk_buff *skb, struct nlmsghdr *nlh)case AUDIT_MAKE_EQUIV : {void *bufp = data;u32 sizes[2 ]; -size_t msglen =nlmsg_len (nlh); +size_t msglen = data_len;char *old, *new; err = -EINVAL ;
@@ -1417,7 +1419,7 @@ static int audit_receive_msg(struct sk_buff *skb, struct nlmsghdr *nlh)memset (&s,0 ,sizeof (s));/* guard against past and future API changes */ -memcpy (&s, data,min_t (size_t,sizeof (s),nlmsg_len (nlh))); +memcpy (&s, data,min_t (size_t,sizeof (s), data_len));/* check if new data is valid */ if ((s.enabled !=0 && s.enabled !=1 ) || (s.log_passwd !=0 && s.log_passwd !=1 ))
kernel/auditfilter.c +39 -32
33 lines not on this page · raw message
kernel/kprobes.c +46 -25
71 lines not on this page · 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.