Linux 4.9.125
Greg KH
maintainerI'm announcing the release of the 4.9.125 kernel.
All users of the 4.9 kernel series must upgrade.
The updated 4.9.y git tree can be found at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git linux-4.9.y
and can be browsed at the normal kernel.org git web browser:
http://git.kernel.org/?p=linux/kernel/git/stable/linux-stable.git;a=summary
thanks,
greg k-h
------------
Makefile | 2 arch/arc/include/asm/delay.h | 3 arch/arc/mm/cache.c | 7 - arch/arc/plat-eznps/include/plat/ctop.h | 1 arch/arm/kvm/mmu.c | 42 +++++-- arch/arm64/kernel/probes/kprobes.c | 2 arch/arm64/mm/init.c | 6 - arch/mips/bcm47xx/setup.c | 6 - arch/mips/include/asm/mipsregs.h | 3 arch/mips/include/asm/processor.h | 2 arch/mips/kernel/ptrace.c | 2 arch/mips/kernel/ptrace32.c | 2 arch/mips/lib/multi3.c | 6 - arch/powerpc/net/bpf_jit_comp64.c | 29 ----- arch/s390/include/asm/qdio.h | 1 arch/s390/mm/fault.c | 2 arch/s390/net/bpf_jit_comp.c | 2 arch/s390/numa/numa.c | 16 -- arch/s390/pci/pci.c | 2 arch/sparc/kernel/pcic.c | 2 arch/x86/boot/compressed/Makefile | 8 + arch/x86/events/amd/ibs.c | 6 - arch/x86/include/asm/irqflags.h | 3 arch/x86/include/asm/processor.h | 6 - arch/x86/kernel/cpu/bugs.c | 50 ++++++++ arch/x86/kernel/cpu/common.c | 1 arch/x86/kernel/cpu/intel.c | 3 arch/x86/kernel/dumpstack.c | 4 arch/x86/kernel/process_64.c | 1 arch/x86/kvm/svm.c | 8 - arch/x86/kvm/vmx.c | 3 arch/x86/mm/init.c | 4 arch/x86/mm/mmap.c | 2 drivers/base/power/clock_ops.c | 2 drivers/cdrom/cdrom.c | 2 drivers/clk/rockchip/clk-rk3399.c | 2 drivers/gpu/drm/bridge/adv7511/adv7511_drv.c | 12 ++ drivers/gpu/drm/imx/imx-ldb.c | 9 + drivers/gpu/drm/udl/udl_fb.c | 2 drivers/gpu/drm/udl/udl_main.c | 35 +++--- drivers/i2c/busses/i2c-davinci.c | 8 + drivers/misc/mei/main.c | 1 drivers/net/can/mscan/mpc5xxx_can.c | 5 drivers/net/ethernet/3com/Kconfig | 2 drivers/net/ethernet/amd/Kconfig | 4 drivers/net/ethernet/atheros/atl1c/atl1c_main.c | 1 drivers/net/ethernet/broadcom/bnx2x/bnx2x_ethtool.c | 13 +- drivers/net/ethernet/cirrus/Kconfig | 1 drivers/net/ethernet/cisco/enic/enic_main.c | 78 ++++---------- drivers/net/ethernet/qlogic/qed/qed_l2.c | 15 +- drivers/net/ethernet/qlogic/qed/qed_l2.h | 2 drivers/net/ethernet/qlogic/qed/qed_mcp.c | 1 drivers/net/ethernet/qlogic/qed/qed_sriov.c | 2 drivers/net/ethernet/qlogic/qed/qed_vf.c | 4 drivers/net/ethernet/qlogic/qed/qed_vf.h | 7 + drivers/net/ethernet/xilinx/xilinx_axienet_mdio.c | 1 drivers/net/usb/qmi_wwan.c | 2 drivers/net/wan/lmc/lmc_main.c | 2 drivers/net/wireless/broadcom/b43/leds.c | 2 drivers/net/wireless/broadcom/b43legacy/leds.c | 2 drivers/pinctrl/freescale/pinctrl-imx1-core.c | 2 drivers/power/supply/generic-adc-battery.c | 25 ++-- drivers/s390/cio/qdio_main.c | 5 drivers/scsi/fcoe/fcoe_ctlr.c | 4 drivers/scsi/libfc/fc_rport.c | 1 drivers/scsi/libiscsi.c | 12 +- drivers/scsi/scsi_sysfs.c | 20 +++ drivers/scsi/vmw_pvscsi.c | 11 + drivers/staging/android/ion/ion-ioctl.c | 12 +- drivers/staging/android/ion/ion.c | 65 +++++++---- drivers/staging/android/ion/ion_priv.h | 6 - drivers/staging/media/omap4iss/iss_video.c | 3 drivers/target/iscsi/iscsi_target_login.c | 35 +++--- drivers/usb/gadget/function/f_uac2.c | 20 +-- drivers/usb/gadget/udc/r8a66597-udc.c | 6 - drivers/usb/phy/phy-fsl-usb.c | 4 fs/cachefiles/namei.c | 1 fs/cachefiles/rdwr.c | 17 ++- fs/cifs/cifs_debug.c | 30 ++++- fs/cifs/inode.c | 2 fs/cifs/link.c | 4 fs/cifs/sess.c | 6 + fs/cifs/smb2inode.c | 2 fs/cifs/smb2ops.c | 34 ++++-- fs/ext4/namei.c | 1 fs/ext4/sysfs.c | 13 +- fs/ext4/xattr.c | 2 fs/fscache/operation.c | 6 - fs/fuse/dev.c | 39 +++++-- fs/fuse/dir.c | 10 + fs/fuse/file.c | 1 fs/fuse/fuse_i.h | 5 fs/fuse/inode.c | 37 +++--- fs/squashfs/file.c | 50 +++++--- fs/squashfs/file_cache.c | 4 fs/squashfs/file_direct.c | 24 ++-- fs/squashfs/squashfs.h | 3 fs/sysfs/file.c | 44 +++++++ include/linux/sysfs.h | 14 ++ kernel/kprobes.c | 4 kernel/sysctl.c | 3 mm/memcontrol.c | 15 +- mm/memory.c | 3 mm/zswap.c | 9 + net/caif/caif_dev.c | 4 net/ipv4/cipso_ipv4.c | 12 +- net/ipv6/ip6_vti.c | 11 + net/mac80211/util.c | 3 net/wireless/nl80211.c | 1 net/xfrm/xfrm_policy.c | 3 net/xfrm/xfrm_user.c | 10 + sound/soc/sirf/sirf-usp.c | 7 - sound/soc/soc-pcm.c | 8 + tools/power/x86/turbostat/turbostat.c | 8 - tools/testing/selftests/ftrace/test.d/00basic/snapshot.tc | 28 +++++ tools/usb/ffs-test.c | 19 ++- 116 files changed, 777 insertions(+), 405 deletions(-)
Alberto Panizzo (1):
clk: rockchip: fix clk_i2sout parent selection bits on rk3399
Aleksander Morgado (1):
qmi_wwan: fix interface number for DW5821e production firmware
Alexander Sverdlin (1):
i2c: davinci: Avoid zero value of CLKH
Alexander Usyskin (1):
mei: don't update offset in write
Andi Kleen (2):
x86/spectre: Add missing family 6 check to microcode check x86/speculation/l1tf: Increase l1tf memory limit for Nehalem+
Andrey Ryabinin (1):
fuse: Don't access pipe->buffers without pipe_lock()
Arnd Bergmann (1):
ext4: sysfs: print ext4_super_block fields as little-endian
Bart Van Assche (2):
scsi: sysfs: Introduce sysfs_{un,}break_active_protection()
scsi: core: Avoid that SCSI device removal through sysfs triggers a deadlock
Bernd Edlinger (1):
nl80211: Add a missing break in parse_station_flags
Calvin Walton (1):
tools/power turbostat: Read extended processor family from CPUID
Claudio Imbrenda (1):
s390/kvm: fix deadlock when killed by oom
Colin Ian King (1):
drivers: net: lmc: fix case value for target abort error
Dan Carpenter (2):
pinctrl: freescale: off by one in imx1_pinconf_group_dbg_show() PM / clk: signedness bug in of_pm_clk_add_clks()
Daniel Borkmann (1):
bpf, ppc64: fix unexpected r0=0 exit path inside bpf_xadd
Daniel Rosenberg (1):
staging: android: ion: check for kref overflow
Eric Sandeen (1):
ext4: reset error code in ext4_find_entry in fallback
Ethan Zhao (1):
sched/sysctl: Check user input value of sysctl_sched_time_avg
Eugeniu Rosca (1):
usb: gadget: f_uac2: fix endianness of 'struct cntrl_*_lay3'
Eyal Birger (1):
vti6: fix PMTU caching and reporting on xmit
Florian Westphal (2):
xfrm: free skb if nlsk pointer is NULL
atl1c: reserve min skb headroom
Govindarajulu Varadarajan (1):
enic: handle mtu change for vf properly
Greg Hackmann (2):
arm64: mm: check for upper PAGE_SHIFT bits in pfn_valid()
staging: android: ion: fix ION_IOC_{MAP,SHARE} use-after-free
Greg Kroah-Hartman (1):
Linux 4.9.125
Guenter Roeck (1):
media: staging: omap4iss: Include asm/cacheflush.h after generic includes
Gustavo A. R. Silva (1):
ASoC: sirf: Fix potential NULL pointer dereference
H. Nikolaus Schaller (2):
power: generic-adc-battery: fix out-of-bounds write when copying channel properties
power: generic-adc-battery: check for duplicate properties copied from iio channels
Jann Horn (1):
x86/entry/64: Wipe KASAN stack shadow before rewind_stack_do_exit()
Jerome Brunet (1):
ASoC: dpcm: don't merge format from invalid codec dai
Jia-Ju Bai (2):
usb: gadget: r8a66597: Fix two possible sleep-in-atomic-context bugs in init_controller()
usb: gadget: r8a66597: Fix a possible sleep-in-atomic-context bugs in r8a66597_queue()
Jim Gill (1):
scsi: vmw_pvscsi: Return DID_RESET for status SAM_STAT_COMMAND_TERMINATED
Johannes Thumshirn (2):
scsi: fcoe: drop frames in ELS LOGO error path
scsi: fcoe: clear FC_RP_STARTED flags when receiving a LOGO
Josh Poimboeuf (1):
x86/kvm/vmx: Remove duplicate l1d flush definitions
Julian Wiedmann (1):
s390/qdio: reset old sbal_state flags
Kees Cook (1):
x86/boot: Fix if_changed build flip/flop bug
Kiran Kumar Modukuri (3):
fscache: Allow cancelled operations to be enqueued
cachefiles: Fix refcounting bug in backing-file read monitoring
cachefiles: Wait rather than BUG'ing on "Unexpected object collision"
Kirill Tkhai (2):
memcg: remove memcg_cgroup::id from IDR on mem_cgroup_css_alloc() failure
fuse: Add missed unlock_page() to fuse_readpages_fill()
Len Brown (1):
tools/power turbostat: fix -S on UP systems
Li Wang (1):
zswap: re-check zswap_is_full() after do zswap_shrink()
Linus Torvalds (1):
squashfs metadata 2: electric boogaloo
Lucas Stach (2):
drm/imx: imx-ldb: disable LDB on driver bind
drm/imx: imx-ldb: check if channel is enabled before printing warning
Maciej W. Rozycki (1):
MIPS: Correct the 64-bit DSP accumulator register size
Martin Schwidefsky (2):
s390: fix br_r1_trampoline for machines without exrl s390/numa: move initial setup of node_to_cpumask_map
Masami Hiramatsu (3):
selftests/ftrace: Add snapshot and tracing_on test case kprobes/arm64: Fix %p uses in error messages
kprobes: Make list and blacklist root user read only
Michael Buesch (2):
b43legacy/leds: Ensure NUL-termination of LED name string b43/leds: Ensure NUL-termination of LED name string
Mike Christie (1):
iscsi target: fix session creation failure handling
Miklos Szeredi (5):
fuse: fix initial parallel dirops
fuse: fix double request_end()
fuse: fix unlocked access to processing queue
fuse: umount should wait for all requests
fuse: Fix oops at process_init_reply()
Mikulas Patocka (3):
udl-kms: change down_interruptible to down
udl-kms: handle allocation failure
udl-kms: fix crash due to uninitialized memory
Nicholas Mc Guire (2):
can: mpc5xxx_can: check of_iomap return before use
cifs: check kmalloc before use
Nick Desaulniers (1):
x86/irqflags: Mark native_restore_fl extern inline
Paul Burton (1):
MIPS: lib: Provide MIPS64r6 __multi3() for GCC < 7
Peter Senna Tschudin (1):
tools: usb: ffs-test: Fix build on big endian systems
Phillip Lougher (1):
Squashfs: Compute expected length from inode size rather than block length
Punit Agrawal (2):
KVM: arm/arm64: Skip updating PTE entry if no change
KVM: arm/arm64: Skip updating PMD entry if no change
Rafał Miłecki (1):
Revert "MIPS: BCM47XX: Enable 74K Core ExternalSync for PCIe erratum"
Randy Dunlap (5):
usb/phy: fix PPC64 build errors in phy-fsl-usb.c
net: prevent ISA drivers from building on PPC32
arc: [plat-eznps] fix data type errors in platform headers
arc: fix build errors in arc/include/asm/delay.h
arc: fix type warnings in arc/mm/cache.c
Rian Hunter (1):
x86/process: Re-export start_thread()
Scott Bauer (1):
cdrom: Fix info leak/OOB read in cdrom_ioctl_drive_status
Sean Paul (1):
drm/bridge: adv7511: Reset registers on hotplug
Sebastian Ott (1):
s390/pci: fix out of bounds access during irq setup
Shubhrajyoti Datta (1):
net: axienet: Fix double deregister of mdio
Steve French (4):
cifs: add missing debug entries for kconfig options
smb3: enumerating snapshots was leaving part of the data off end
smb3: Do not send SMB3 SET_INFO if nothing changed
smb3: don't request leases in symlink creation and query
Sudarsana Reddy Kalluru (3):
qed: Fix possible race for the link state value.
qed: Correct Multicast API to reflect existence of 256 approximate buckets.
bnx2x: Fix invalid memory access in rss hash config path.
Theodore Ts'o (1):
ext4: check for NUL characters in extended attribute's name
Thomas Gleixner (2):
perf/x86/amd/ibs: Don't access non-started event
KVM: x86: SVM: Call x86_spec_ctrl_set_guest/host() with interrupts disabled
Thomas Petazzoni (1):
sparc: kernel/pcic: silence gcc 7.x warning in pcibios_fixup_bus()
Tommi Rantala (1):
xfrm: fix missing dst_release() after policy blocking lbcast and multicast
Varun Prakash (1):
scsi: libiscsi: fix possible NULL pointer dereference in case of TMF
Vlastimil Babka (3):
x86/speculation/l1tf: Fix overflow in l1tf_pfn_limit() on 32bit x86/speculation/l1tf: Fix off-by-one error when warning that system has too much RAM x86/speculation/l1tf: Suggest what to do on systems with too much RAM
YueHaibing (1):
net: caif: Add a missing rcu_read_unlock() in caif_flow_cb
jie@[email protected] (1):
mm/memory.c: check return value of ioremap_prot
[email protected] (1):
mac80211: add stations tied to AP_VLANs during hw reconfig
yujuan.qi (1):
Cipso: cipso_v4_optptr enter infinite loop
Greg KH
maintainerMakefile +1 -1
@@ -1,6 +1,6 @@ VERSION = 4 PATCHLEVEL = 9 -SUBLEVEL = 124 +SUBLEVEL = 125 EXTRAVERSION = NAME = Roaring Lionus
arch/arc/include/asm/delay.h +3 -0
@@ -17,8 +17,11 @@#ifndef __ASM_ARC_UDELAY_H#define __ASM_ARC_UDELAY_H +#include <asm-generic/types.h> #include <asm/param.h> /* HZ */ +extern unsigned long loops_per_jiffy; +static inline void __delay (unsigned long loops) { __asm__ __volatile__(
arch/arc/mm/cache.c +4 -3
@@ -840,7 +840,7 @@ void flush_cache_mm(struct mm_struct *mm)void flush_cache_page (struct vm_area_struct *vma,unsigned long u_vaddr,unsigned long pfn) { -unsigned int paddr = pfn <<PAGE_SHIFT ; +phys_addr_t paddr = pfn <<PAGE_SHIFT ; u_vaddr &=PAGE_MASK ;
@@ -860,8 +860,9 @@ void flush_anon_page(struct vm_area_struct *vma, struct page *page, unsigned long u_vaddr) {/* TBD: do we really need to clear the kernel mapping */ -__flush_dcache_page (page_address (page), u_vaddr); -__flush_dcache_page (page_address (page),page_address (page)); +__flush_dcache_page ((phys_addr_t )page_address (page), u_vaddr); +__flush_dcache_page ((phys_addr_t )page_address (page), + (phys_addr_t )page_address (page)); }
arch/arc/plat-eznps/include/plat/ctop.h +1 -0
@@ -21,6 +21,7 @@#error "Incorrect ctop.h include"#endif +#include <linux/types.h> #include <soc/nps/common.h> /* core auxiliary registers */
arch/arm/kvm/mmu.c +31 -11
56 lines not on this page · raw message
arch/arm64/kernel/probes/kprobes.c +1 -1
@@ -274,7 +274,7 @@ static int __kprobes reenter_kprobe(struct kprobe *p,break ;case KPROBE_HIT_SS :case KPROBE_REENTER : -pr_warn ("Unrecoverable kprobe detected at %p.\n" , p->addr); +pr_warn ("Unrecoverable kprobe detected.\n" );dump_kprobe (p);BUG ();break ;
arch/arm64/mm/init.c +5 -1
@@ -147,7 +147,11 @@ static void __init zone_sizes_init(unsigned long min, unsigned long max)#ifdef CONFIG_HAVE_ARCH_PFN_VALID int pfn_valid (unsigned long pfn) { -return memblock_is_map_memory (pfn <<PAGE_SHIFT ); +phys_addr_t addr = pfn <<PAGE_SHIFT ; + +if ((addr >>PAGE_SHIFT ) != pfn) +return 0 ; +return memblock_is_map_memory (addr); }EXPORT_SYMBOL (pfn_valid);#endif
arch/mips/bcm47xx/setup.c +0 -6
@@ -212,12 +212,6 @@ static int __init bcm47xx_cpu_fixes(void)*/ if (bcm47xx_bus.bcma.bus.chipinfo.id ==BCMA_CHIP_ID_BCM4706 ) cpu_wait =NULL ; - -/* -* BCM47XX Erratum "R10: PCIe Transactions Periodically Fail" -* Enable ExternalSync for sync instruction to take effect -*/ -set_c0_config7 (MIPS_CONF7_ES );break ;#endif }
arch/mips/include/asm/mipsregs.h +0 -3
@@ -663,8 +663,6 @@#define MIPS_CONF7_WII (_ULCAST_(1) << 31)#define MIPS_CONF7_RPS (_ULCAST_(1) << 2) -/* ExternalSync */ -#define MIPS_CONF7_ES (_ULCAST_(1) << 8)#define MIPS_CONF7_IAR (_ULCAST_(1) << 10)#define MIPS_CONF7_AR (_ULCAST_(1) << 16)
@@ -2643,7 +2641,6 @@ __BUILD_SET_C0(status) __BUILD_SET_C0(cause) __BUILD_SET_C0(config) __BUILD_SET_C0(config5) -__BUILD_SET_C0(config7) __BUILD_SET_C0(intcontrol) __BUILD_SET_C0(intctl) __BUILD_SET_C0(srsmap)
arch/mips/include/asm/processor.h +1 -1
@@ -141,7 +141,7 @@ struct mips_fpu_struct {#define NUM_DSP_REGS 6 -typedef __u32 dspreg_t ; +typedef unsigned long dspreg_t ;struct mips_dsp_state {dspreg_t dspr[NUM_DSP_REGS ];
arch/mips/kernel/ptrace.c +1 -1
@@ -876,7 +876,7 @@ long arch_ptrace(struct task_struct *child, long request, goto out; } dregs =__get_dsp_regs (child); - tmp = (unsigned long ) (dregs[addr -DSP_BASE ]); + tmp = dregs[addr -DSP_BASE ];break ; }case DSP_CONTROL :
arch/mips/kernel/ptrace32.c +1 -1
@@ -140,7 +140,7 @@ long compat_arch_ptrace(struct task_struct *child, compat_long_t request, goto out; } dregs =__get_dsp_regs (child); - tmp = (unsigned long ) (dregs[addr -DSP_BASE ]); + tmp = dregs[addr -DSP_BASE ];break ; }case DSP_CONTROL :
arch/mips/lib/multi3.c +3 -3
@@ -4,12 +4,12 @@#include "libgcc.h" /* -* GCC 7 suboptimally generates __multi3 calls for mips64r6, so for that -* specific case only we'll implement it here. +* GCC 7 & older can suboptimally generate __multi3 calls for mips64r6, so for +* that specific case only we implement that intrinsic here. * * See https://gcc.gnu.org/bugzilla/show_bug.cgi?id=82981 */ -#if defined(CONFIG_64BIT ) && defined(CONFIG_CPU_MIPSR6 ) && (__GNUC__ ==7 ) +#if defined(CONFIG_64BIT ) && defined(CONFIG_CPU_MIPSR6 ) && (__GNUC__ <8 )/* multiply 64-bit values, low 64-bits returned */ static inline long long notrace dmulu (long long a,long long b)
arch/powerpc/net/bpf_jit_comp64.c +5 -24
@@ -326,6 +326,7 @@ static int bpf_jit_build_body(struct bpf_prog *fp, u32 *image,u64 imm64;u8 *func;u32 true_cond; +u32 tmp_idx;/* * addrs[] maps a BPF bytecode address into a real offset from
@@ -685,11 +686,7 @@ static int bpf_jit_build_body(struct bpf_prog *fp, u32 *image,case BPF_STX |BPF_XADD |BPF_W :/* Get EA into TMP_REG_1 */ PPC_ADDI (b2p[TMP_REG_1 ], dst_reg, off); -/* error if EA is not word-aligned */ -PPC_ANDI (b2p[TMP_REG_2 ], b2p[TMP_REG_1 ],0x03 ); -PPC_BCC_SHORT (COND_EQ , (ctx->idx *4 ) +12 ); -PPC_LI (b2p[BPF_REG_0 ],0 ); -PPC_JMP (exit_addr); + tmp_idx = ctx->idx *4 ;/* load value from memory into TMP_REG_2 */ PPC_BPF_LWARX (b2p[TMP_REG_2 ],0 , b2p[TMP_REG_1 ],0 );/* add value from src_reg into this */
@@ -697,32 +694,16 @@ static int bpf_jit_build_body(struct bpf_prog *fp, u32 *image,/* store result back */ PPC_BPF_STWCX (b2p[TMP_REG_2 ],0 , b2p[TMP_REG_1 ]);/* we're done if this succeeded */ -PPC_BCC_SHORT (COND_EQ , (ctx->idx *4 ) + (7 *4 )); -/* otherwise, let's try once more */ -PPC_BPF_LWARX (b2p[TMP_REG_2 ],0 , b2p[TMP_REG_1 ],0 ); -PPC_ADD (b2p[TMP_REG_2 ], b2p[TMP_REG_2 ], src_reg); -PPC_BPF_STWCX (b2p[TMP_REG_2 ],0 , b2p[TMP_REG_1 ]); -/* exit if the store was not successful */ -PPC_LI (b2p[BPF_REG_0 ],0 ); -PPC_BCC (COND_NE , exit_addr); +PPC_BCC_SHORT (COND_NE , tmp_idx);break ;/* *(u64 *)(dst + off) += src */ case BPF_STX |BPF_XADD |BPF_DW :PPC_ADDI (b2p[TMP_REG_1 ], dst_reg, off); -/* error if EA is not doubleword-aligned */ -PPC_ANDI (b2p[TMP_REG_2 ], b2p[TMP_REG_1 ],0x07 ); -PPC_BCC_SHORT (COND_EQ , (ctx->idx *4 ) + (3 *4 )); -PPC_LI (b2p[BPF_REG_0 ],0 ); -PPC_JMP (exit_addr); -PPC_BPF_LDARX (b2p[TMP_REG_2 ],0 , b2p[TMP_REG_1 ],0 ); -PPC_ADD (b2p[TMP_REG_2 ], b2p[TMP_REG_2 ], src_reg); -PPC_BPF_STDCX (b2p[TMP_REG_2 ],0 , b2p[TMP_REG_1 ]); -PPC_BCC_SHORT (COND_EQ , (ctx->idx *4 ) + (7 *4 )); + tmp_idx = ctx->idx *4 ;PPC_BPF_LDARX (b2p[TMP_REG_2 ],0 , b2p[TMP_REG_1 ],0 );PPC_ADD (b2p[TMP_REG_2 ], b2p[TMP_REG_2 ], src_reg);PPC_BPF_STDCX (b2p[TMP_REG_2 ],0 , b2p[TMP_REG_1 ]); -PPC_LI (b2p[BPF_REG_0 ],0 ); -PPC_BCC (COND_NE , exit_addr); +PPC_BCC_SHORT (COND_NE , tmp_idx);break ;/*
arch/s390/include/asm/qdio.h +0 -1
@@ -261,7 +261,6 @@ struct qdio_outbuf_state {void *user; }; -#define QDIO_OUTBUF_STATE_FLAG_NONE 0x00#define QDIO_OUTBUF_STATE_FLAG_PENDING 0x01#define CHSC_AC1_INITIATE_INPUTQ 0x80
arch/s390/mm/fault.c +2 -0
@@ -462,6 +462,8 @@ static inline int do_exception(struct pt_regs *regs, int access)/* No reason to continue if interrupted by SIGKILL. */ if ((fault &VM_FAULT_RETRY ) &&fatal_signal_pending (current)) { fault =VM_FAULT_SIGNAL ; +if (flags &FAULT_FLAG_RETRY_NOWAIT ) + goto out_up; goto out; }if (unlikely (fault &VM_FAULT_ERROR ))
arch/s390/net/bpf_jit_comp.c +0 -2
@@ -517,8 +517,6 @@ static void bpf_jit_epilogue(struct bpf_jit *jit)/* br %r1 */ _EMIT2 (0x07f1 ); }else { -/* larl %r1,.+14 */ -EMIT6_PCREL_RILB (0xc0000000 ,REG_1 , jit->prg +14 );/* ex 0,S390_lowcore.br_r1_tampoline */ EMIT4_DISP (0x44000000 ,REG_0 ,REG_0 , offsetof(struct lowcore , br_r1_trampoline));
arch/s390/numa/numa.c +2 -14
@@ -133,26 +133,14 @@ void __init numa_setup(void) {pr_info ("NUMA mode: %s\n" , mode->name);nodes_clear (node_possible_map); +/* Initially attach all possible CPUs to node 0. */ +cpumask_copy (&node_to_cpumask_map[0 ], cpu_possible_mask);if (mode->setup) mode->setup ();numa_setup_memory ();memblock_dump_all (); } -/* -* numa_init_early() - Initialization initcall -* -* This runs when only one CPU is online and before the first -* topology update is called for by the scheduler. -*/ -static int __init numa_init_early (void ) -{ -/* Attach all possible CPUs to node 0 for now. */ -cpumask_copy (&node_to_cpumask_map[0 ], cpu_possible_mask); -return 0 ; -} -early_initcall (numa_init_early); -/* * numa_init_late() - Initialization initcall *
arch/s390/pci/pci.c +2 -0
@@ -407,6 +407,8 @@ int arch_setup_msi_irqs(struct pci_dev *pdev, int nvec, int type) hwirq =0 ;for_each_pci_msi_entry (msi, pdev) { rc = -EIO ; +if (hwirq >= msi_vecs) +break ; irq =irq_alloc_desc (0 );/* Alloc irq on node 0 */ if (irq <0 ) goto out_msi;
arch/sparc/kernel/pcic.c +1 -1
@@ -602,7 +602,7 @@ void pcibios_fixup_bus(struct pci_bus *bus) {struct pci_dev *dev;int i, has_io, has_mem; -unsigned int cmd; +unsigned int cmd =0 ;struct linux_pcic *pcic;/* struct linux_pbm_info* pbm = &pcic->pbm; */ int node;
arch/x86/boot/compressed/Makefile +6 -2
@@ -101,9 +101,13 @@ define cmd_check_data_rel done endef +# We need to run two commands under "if_changed", so merge them into a +# single invocation. +quiet_cmd_check-and-link-vmlinux = LD $@ + cmd_check-and-link-vmlinux = $(cmd_check_data_rel); $(cmd_ld) + $(obj)/vmlinux: $(vmlinux-objs-y) FORCE - $(call if_changed,check_data_rel) - $(call if_changed,ld) + $(call if_changed,check-and-link-vmlinux) OBJCOPYFLAGS_vmlinux.bin := -R .comment -S $(obj)/vmlinux.bin: vmlinux FORCE
arch/x86/events/amd/ibs.c +5 -1
@@ -578,7 +578,7 @@ static int perf_ibs_handle_irq(struct perf_ibs *perf_ibs, struct pt_regs *iregs) {struct cpu_perf_ibs *pcpu =this_cpu_ptr (perf_ibs->pcpu);struct perf_event *event = pcpu->event; -struct hw_perf_event *hwc = &event->hw; +struct hw_perf_event *hwc;struct perf_sample_data data;struct perf_raw_record raw;struct pt_regs regs;
@@ -601,6 +601,10 @@ static int perf_ibs_handle_irq(struct perf_ibs *perf_ibs, struct pt_regs *iregs)return 0 ; } +if (WARN_ON_ONCE (!event)) + goto fail; + + hwc = &event->hw; msr = hwc->config_base; buf = ibs_data.regs;rdmsrl (msr, *buf);
arch/x86/include/asm/irqflags.h +2 -1
@@ -32,7 +32,8 @@ extern inline unsigned long native_save_fl(void)return flags; } -static inline void native_restore_fl (unsigned long flags) +extern inline void native_restore_fl (unsigned long flags); +extern inline void native_restore_fl (unsigned long flags) { asmvolatile ("push %0 ; popf" : /* no output */
arch/x86/include/asm/processor.h +4 -2
@@ -136,6 +136,8 @@ struct cpuinfo_x86 {/* Index into per_cpu list: */ u16 cpu_index;u32 microcode; +/* Address space bits used by the cache internally */ +u8 x86_cache_bits; };#define X86_VENDOR_INTEL 0
@@ -173,9 +175,9 @@ extern const struct seq_operations cpuinfo_op;extern void cpu_detect (struct cpuinfo_x86 *c); -static inline unsigned long l1tf_pfn_limit (void ) +static inline unsigned long long l1tf_pfn_limit (void ) { -return BIT (boot_cpu_data.x86_phys_bits -1 -PAGE_SHIFT ) -1 ; +return BIT_ULL (boot_cpu_data.x86_cache_bits -1 -PAGE_SHIFT ); }extern void early_cpu_init (void );
arch/x86/kernel/cpu/bugs.c +45 -5
71 lines not on this page · raw message
arch/x86/kernel/cpu/common.c +1 -0
@@ -882,6 +882,7 @@ static void identify_cpu_without_cpuid(struct cpuinfo_x86 *c) } }#endif + c->x86_cache_bits = c->x86_phys_bits; }static const __initconst struct x86_cpu_id cpu_no_speculation[] = {
arch/x86/kernel/cpu/intel.c +3 -0
@@ -109,6 +109,9 @@ static bool bad_spectre_microcode(struct cpuinfo_x86 *c)if (cpu_has (c,X86_FEATURE_HYPERVISOR ))return false; +if (c->x86 !=6 ) +return false; +for (i =0 ; i <ARRAY_SIZE (spectre_bad_microcodes); i++) {if (c->x86_model == spectre_bad_microcodes[i].model && c->x86_stepping == spectre_bad_microcodes[i].stepping)
arch/x86/kernel/dumpstack.c +4 -0
@@ -15,6 +15,7 @@#include <linux/bug.h> #include <linux/nmi.h> #include <linux/sysfs.h> +#include <linux/kasan.h> #include <asm/stacktrace.h> #include <asm/unwind.h>
@@ -229,7 +230,10 @@ void oops_end(unsigned long flags, struct pt_regs *regs, int signr)* We're not going to return, but we might be on an IST stack or * have very little stack space left. Rewind the stack and kill * the task. +* Before we rewind the stack, we have to tell KASAN that we're going to +* reuse the task stack and that existing poisons are invalid. */ +kasan_unpoison_task_stack (current);rewind_stack_do_exit (signr); }NOKPROBE_SYMBOL (oops_end);
arch/x86/kernel/process_64.c +1 -0
@@ -360,6 +360,7 @@ start_thread(struct pt_regs *regs, unsigned long new_ip, unsigned long new_sp)start_thread_common (regs, new_ip, new_sp, __USER_CS, __USER_DS,0 ); } +EXPORT_SYMBOL_GPL (start_thread);#ifdef CONFIG_COMPAT void compat_start_thread (struct pt_regs *regs,u32 new_ip,u32 new_sp)
arch/x86/kvm/svm.c +4 -4
@@ -4973,8 +4973,6 @@ static void svm_vcpu_run(struct kvm_vcpu *vcpu)clgi (); -local_irq_enable (); -/* * If this vCPU has touched SPEC_CTRL, restore the guest's value if * it's non-zero. Since vmentry is serialising on affected CPUs, there
@@ -4983,6 +4981,8 @@ static void svm_vcpu_run(struct kvm_vcpu *vcpu)*/ x86_spec_ctrl_set_guest (svm->spec_ctrl, svm->virt_spec_ctrl); +local_irq_enable (); + asmvolatile ("push %%" _ASM_BP"; \n\t" "mov %c[rbx](%[svm]), %%" _ASM_BX " \n\t"
@@ -5105,12 +5105,12 @@ static void svm_vcpu_run(struct kvm_vcpu *vcpu)if (unlikely (!msr_write_intercepted (vcpu,MSR_IA32_SPEC_CTRL ))) svm->spec_ctrl =native_read_msr (MSR_IA32_SPEC_CTRL ); -x86_spec_ctrl_restore_host (svm->spec_ctrl, svm->virt_spec_ctrl); -reload_tss (vcpu);local_irq_disable (); +x86_spec_ctrl_restore_host (svm->spec_ctrl, svm->virt_spec_ctrl); + vcpu->arch.cr2 = svm->vmcb->save.cr2; vcpu->arch.regs[VCPU_REGS_RAX ] = svm->vmcb->save.rax; vcpu->arch.regs[VCPU_REGS_RSP ] = svm->vmcb->save.rsp;
arch/x86/kvm/vmx.c +0 -3
@@ -8670,9 +8670,6 @@ static int vmx_handle_exit(struct kvm_vcpu *vcpu)* information but as all relevant affected CPUs have 32KiB L1D cache size * there is no point in doing so. */ -#define L1D_CACHE_ORDER 4 -static void *vmx_l1d_flush_pages; -static void vmx_l1d_flush (struct kvm_vcpu *vcpu) {int size =PAGE_SIZE <<L1D_CACHE_ORDER ;
arch/x86/mm/init.c +2 -2
@@ -792,7 +792,7 @@ unsigned long max_swapfile_size(void)if (boot_cpu_has_bug (X86_BUG_L1TF )) {/* Limit the swap file size to MAX_PA/2 for L1TF workaround */ -unsigned long l1tf_limit =l1tf_pfn_limit () +1 ; +unsigned long long l1tf_limit =l1tf_pfn_limit ();/* * We encode swap offsets also with 3 bits below those for pfn * which makes the usable limit higher.
@@ -800,7 +800,7 @@ unsigned long max_swapfile_size(void)#if CONFIG_PGTABLE_LEVELS >2 l1tf_limit <<=PAGE_SHIFT -SWP_OFFSET_FIRST_BIT ;#endif - pages = min_t(unsigned long, l1tf_limit, pages); + pages = min_t(unsigned long long, l1tf_limit, pages); }return pages; }
arch/x86/mm/mmap.c +1 -1
@@ -138,7 +138,7 @@ bool pfn_modify_allowed(unsigned long pfn, pgprot_t prot)/* If it's real memory always allow */ if (pfn_valid (pfn))return true; -if (pfn >l1tf_pfn_limit () && !capable (CAP_SYS_ADMIN )) +if (pfn >=l1tf_pfn_limit () && !capable (CAP_SYS_ADMIN ))return false;return true; }
drivers/base/power/clock_ops.c +1 -1
@@ -185,7 +185,7 @@ EXPORT_SYMBOL_GPL(of_pm_clk_add_clk);int of_pm_clk_add_clks (struct device *dev) {struct clk **clks; -unsigned int i, count; +int i, count;int ret;if (!dev || !dev->of_node)
drivers/cdrom/cdrom.c +1 -1
@@ -2536,7 +2536,7 @@ static int cdrom_ioctl_drive_status(struct cdrom_device_info *cdi,if (!CDROM_CAN (CDC_SELECT_DISC ) || (arg ==CDSL_CURRENT || arg ==CDSL_NONE ))return cdi->ops->drive_status (cdi,CDSL_CURRENT ); -if (((int )arg >= cdi->capacity)) +if (arg >= cdi->capacity)return -EINVAL ;return cdrom_slot_status (cdi, arg); }
drivers/clk/rockchip/clk-rk3399.c +1 -1
@@ -629,7 +629,7 @@ static struct rockchip_clk_branch rk3399_clk_branches[] __initdata = {MUX (0 ,"clk_i2sout_src" , mux_i2sch_p,CLK_SET_RATE_PARENT ,RK3399_CLKSEL_CON (31 ),0 ,2 ,MFLAGS ),COMPOSITE_NODIV (SCLK_I2S_8CH_OUT ,"clk_i2sout" , mux_i2sout_p,CLK_SET_RATE_PARENT , -RK3399_CLKSEL_CON (30 ),8 ,2 ,MFLAGS , +RK3399_CLKSEL_CON (31 ),2 ,1 ,MFLAGS , RK3399_CLKGATE_CON(8), 12, GFLAGS),/* uart */
drivers/gpu/drm/bridge/adv7511/adv7511_drv.c +12 -0
@@ -424,6 +424,18 @@ static void adv7511_hpd_work(struct work_struct *work)else status = connector_status_disconnected; +/* +* The bridge resets its registers on unplug. So when we get a plug +* event and we're already supposed to be powered, cycle the bridge to +* restore its state. +*/ +if (status == connector_status_connected && + adv7511->connector.status == connector_status_disconnected && + adv7511->powered) { +regcache_mark_dirty (adv7511->regmap); +adv7511_power_on (adv7511); + } +if (adv7511->connector.status != status) { adv7511->connector.status = status;drm_kms_helper_hotplug_event (adv7511->connector.dev);
drivers/gpu/drm/imx/imx-ldb.c +6 -3
@@ -634,6 +634,9 @@ static int imx_ldb_bind(struct device *dev, struct device *master, void *data)return PTR_ERR (imx_ldb->regmap); } +/* disable LDB by resetting the control register to POR default */ +regmap_write (imx_ldb->regmap,IOMUXC_GPR2 ,0 ); + imx_ldb->dev = dev;if (of_id)
@@ -675,14 +678,14 @@ static int imx_ldb_bind(struct device *dev, struct device *master, void *data)if (ret || i <0 || i >1 )return -EINVAL ; +if (!of_device_is_available (child)) +continue ; +if (dual && i >0 ) {dev_warn (dev,"dual-channel mode, ignoring second output\n" );continue ; } -if (!of_device_is_available (child)) -continue ; - channel = &imx_ldb->channel[i]; channel->ldb = imx_ldb; channel->chno = i;
drivers/gpu/drm/udl/udl_fb.c +1 -1
@@ -217,7 +217,7 @@ static int udl_fb_open(struct fb_info *info, int user)struct fb_deferred_io *fbdefio; - fbdefio =kmalloc (sizeof (struct fb_deferred_io ),GFP_KERNEL ); + fbdefio =kzalloc (sizeof (struct fb_deferred_io ),GFP_KERNEL );if (fbdefio) { fbdefio->delay =DL_DEFIO_WRITE_DELAY ;
drivers/gpu/drm/udl/udl_main.c +19 -16
@@ -169,18 +169,13 @@ static void udl_free_urb_list(struct drm_device *dev)struct list_head *node;struct urb_node *unode;struct urb *urb; -int ret;unsigned long flags;DRM_DEBUG ("Waiting for completes and freeing all render urbs\n" );/* keep waiting and freeing, until we've got 'em all */ while (count--) { - -/* Getting interrupted means a leak, but ok at shutdown*/ - ret =down_interruptible (&udl->urbs.limit_sem); -if (ret) -break ; +down (&udl->urbs.limit_sem);spin_lock_irqsave (&udl->urbs.lock, flags);
@@ -204,17 +199,22 @@ static void udl_free_urb_list(struct drm_device *dev)static int udl_alloc_urb_list (struct drm_device *dev,int count,size_t size) {struct udl_device *udl = dev->dev_private; -int i =0 ;struct urb *urb;struct urb_node *unode;char *buf; +size_t wanted_size = count * size;spin_lock_init (&udl->urbs.lock); +retry: udl->urbs.size = size;INIT_LIST_HEAD (&udl->urbs.list); -while (i < count) { +sema_init (&udl->urbs.limit_sem,0 ); + udl->urbs.count =0 ; + udl->urbs.available =0 ; + +while (udl->urbs.count * size < wanted_size) { unode =kzalloc (sizeof (struct urb_node ),GFP_KERNEL );if (!unode)break ;
@@ -230,11 +230,16 @@ static int udl_alloc_urb_list(struct drm_device *dev, int count, size_t size) } unode->urb = urb; - buf =usb_alloc_coherent (udl->udev,MAX_TRANSFER ,GFP_KERNEL , + buf =usb_alloc_coherent (udl->udev, size,GFP_KERNEL , &urb->transfer_dma);if (!buf) {kfree (unode);usb_free_urb (urb); +if (size >PAGE_SIZE ) { + size /=2 ; +udl_free_urb_list (dev); + goto retry; + }break ; }
@@ -245,16 +250,14 @@ static int udl_alloc_urb_list(struct drm_device *dev, int count, size_t size)list_add_tail (&unode->entry, &udl->urbs.list); - i++; +up (&udl->urbs.limit_sem); + udl->urbs.count++; + udl->urbs.available++; } -sema_init (&udl->urbs.limit_sem, i); - udl->urbs.count = i; - udl->urbs.available = i; - -DRM_DEBUG ("allocated %d %d byte urbs\n" , i, (int ) size); +DRM_DEBUG ("allocated %d %d byte urbs\n" , udl->urbs.count, (int ) size); -return i; +return udl->urbs.count; }struct urb *udl_get_urb (struct drm_device *dev)
drivers/i2c/busses/i2c-davinci.c +6 -2
@@ -234,12 +234,16 @@ static void i2c_davinci_calc_clk_dividers(struct davinci_i2c_dev *dev)/* * It's not always possible to have 1 to 2 ratio when d=7, so fall back * to minimal possible clkh in this case. +* +* Note: +* CLKH is not allowed to be 0, in this case I2C clock is not generated +* at all */ -if (clk >= clkl + d) { +if (clk > clkl + d) { clkh = clk - clkl - d; clkl -= d; }else { - clkh =0 ; + clkh =1 ; clkl = clk - (d <<1 ); }
drivers/misc/mei/main.c +0 -1
@@ -304,7 +304,6 @@ static ssize_t mei_write(struct file *file, const char __user *ubuf, goto out; } - *offset =0 ; cb =mei_cl_alloc_cb (cl, length,MEI_FOP_WRITE , file);if (!cb) { rets = -ENOMEM ;
drivers/net/can/mscan/mpc5xxx_can.c +5 -0
@@ -86,6 +86,11 @@ static u32 mpc52xx_can_get_clock(struct platform_device *ofdev,return 0 ; } cdm =of_iomap (np_cdm,0 ); +if (!cdm) { +of_node_put (np_cdm); +dev_err (&ofdev->dev,"can't map clock node!\n" ); +return 0 ; + }if (in_8 (&cdm->ipb_clk_sel) &0x1 ) freq *=2 ;
drivers/net/ethernet/3com/Kconfig +1 -1
@@ -32,7 +32,7 @@ config EL3 config 3C515 tristate "3c515 ISA \"Fast EtherLink\"" - depends on ISA && ISA_DMA_API + depends on ISA && ISA_DMA_API && !PPC32 ---help--- If you have a 3Com ISA EtherLink XL "Corkscrew" 3c515 Fast Ethernet network card, say Y here.
drivers/net/ethernet/amd/Kconfig +2 -2
@@ -44,7 +44,7 @@ config AMD8111_ETH config LANCE tristate "AMD LANCE and PCnet (AT1500 and NE2100) support" - depends on ISA && ISA_DMA_API && !ARM + depends on ISA && ISA_DMA_API && !ARM && !PPC32 ---help--- If you have a network (Ethernet) card of this type, say Y here. Some LinkSys cards are of this type.
@@ -138,7 +138,7 @@ config PCMCIA_NMCLAN config NI65 tristate "NI6510 support" - depends on ISA && ISA_DMA_API && !ARM + depends on ISA && ISA_DMA_API && !ARM && !PPC32 ---help--- If you have a network (Ethernet) card of this type, say Y here.
drivers/net/ethernet/atheros/atl1c/atl1c_main.c +1 -0
@@ -1678,6 +1678,7 @@ static struct sk_buff *atl1c_alloc_skb(struct atl1c_adapter *adapter) skb =build_skb (page_address (page) + adapter->rx_page_offset, adapter->rx_frag_size);if (likely (skb)) { +skb_reserve (skb,NET_SKB_PAD ); adapter->rx_page_offset += adapter->rx_frag_size;if (adapter->rx_page_offset >=PAGE_SIZE ) adapter->rx_page =NULL ;
drivers/net/ethernet/broadcom/bnx2x/bnx2x_ethtool.c +10 -3
@@ -3367,14 +3367,18 @@ static int bnx2x_set_rss_flags(struct bnx2x *bp, struct ethtool_rxnfc *info)DP (BNX2X_MSG_ETHTOOL ,"rss re-configured, UDP 4-tupple %s\n" , udp_rss_requested ?"enabled" :"disabled" ); -return bnx2x_rss (bp, &bp->rss_conf_obj, false, true); +if (bp->state ==BNX2X_STATE_OPEN ) +return bnx2x_rss (bp, &bp->rss_conf_obj, false, + true); }else if ((info->flow_type ==UDP_V6_FLOW ) && (bp->rss_conf_obj.udp_rss_v6 != udp_rss_requested)) { bp->rss_conf_obj.udp_rss_v6 = udp_rss_requested;DP (BNX2X_MSG_ETHTOOL ,"rss re-configured, UDP 4-tupple %s\n" , udp_rss_requested ?"enabled" :"disabled" ); -return bnx2x_rss (bp, &bp->rss_conf_obj, false, true); +if (bp->state ==BNX2X_STATE_OPEN ) +return bnx2x_rss (bp, &bp->rss_conf_obj, false, + true); }return 0 ;
@@ -3488,7 +3492,10 @@ static int bnx2x_set_rxfh(struct net_device *dev, const u32 *indir, bp->rss_conf_obj.ind_table[i] = indir[i] + bp->fp->cl_id; } -return bnx2x_config_rss_eth (bp, false); +if (bp->state ==BNX2X_STATE_OPEN ) +return bnx2x_config_rss_eth (bp, false); + +return 0 ; }/**
drivers/net/ethernet/cirrus/Kconfig +1 -0
@@ -19,6 +19,7 @@ if NET_VENDOR_CIRRUS config CS89x0 tristate "CS89x0 support" depends on ISA || EISA || ARM + depends on !PPC32 ---help--- Support for CS89x0 chipset based Ethernet cards. If you have a network (Ethernet) card of this type, say Y and read the file
drivers/net/ethernet/cisco/enic/enic_main.c +27 -51
104 lines not on this page · raw message
drivers/net/ethernet/qlogic/qed/qed_l2.c +7 -8
@@ -313,7 +313,7 @@ qed_sp_update_mcast_bin(struct qed_hwfn *p_hwfn, p_ramrod->common.update_approx_mcast_flg =1 ;for (i =0 ; i <ETH_MULTICAST_MAC_BINS_IN_REGS ; i++) { -u32 *p_bins = (u32 *)p_params->bins; +u32 *p_bins = p_params->bins; p_ramrod->approx_mcast.bins[i] =cpu_to_le32 (p_bins[i]); }
@@ -1182,8 +1182,8 @@ qed_sp_eth_filter_mcast(struct qed_hwfn *p_hwfn,enum spq_mode comp_mode, struct qed_spq_comp_cb *p_comp_data) { - unsigned long bins[ETH_MULTICAST_MAC_BINS_IN_REGS]; struct vport_update_ramrod_data *p_ramrod = NULL; +u32 bins[ETH_MULTICAST_MAC_BINS_IN_REGS ];struct qed_spq_entry *p_ent =NULL ;struct qed_sp_init_data init_data;u8 abs_vport_id =0 ;
@@ -1219,26 +1219,25 @@ qed_sp_eth_filter_mcast(struct qed_hwfn *p_hwfn,/* explicitly clear out the entire vector */ memset (&p_ramrod->approx_mcast.bins,0 ,sizeof (p_ramrod->approx_mcast.bins)); -memset (bins,0 ,sizeof (unsigned long ) * -ETH_MULTICAST_MAC_BINS_IN_REGS ); +memset (bins,0 ,sizeof (bins));/* filter ADD op is explicit set op and it removes * any existing filters for the vport */ if (p_filter_cmd->opcode ==QED_FILTER_ADD ) {for (i =0 ; i < p_filter_cmd->num_mc_addrs; i++) { -u32 bit; +u32 bit, nbits; bit =qed_mcast_bin_from_mac (p_filter_cmd->mac[i]); -__set_bit (bit, bins); + nbits =sizeof (u32) *BITS_PER_BYTE ; + bins[bit / nbits] |=1 << (bit % nbits); }/* Convert to correct endianity */ for (i =0 ; i <ETH_MULTICAST_MAC_BINS_IN_REGS ; i++) {struct vport_update_ramrod_mcast *p_ramrod_bins; -u32 *p_bins = (u32 *)bins; p_ramrod_bins = &p_ramrod->approx_mcast; - p_ramrod_bins->bins[i] =cpu_to_le32 (p_bins[i]); + p_ramrod_bins->bins[i] =cpu_to_le32 (bins[i]); } }
drivers/net/ethernet/qlogic/qed/qed_l2.h +1 -1
@@ -156,7 +156,7 @@ struct qed_sp_vport_update_params {u8 anti_spoofing_en;u8 update_accept_any_vlan_flg;u8 accept_any_vlan; -unsigned long bins[8 ]; +u32 bins[8 ];struct qed_rss_params *rss_params;struct qed_filter_accept_flags accept_flags;struct qed_sge_tpa_params *sge_tpa_params;
drivers/net/ethernet/qlogic/qed/qed_mcp.c +1 -0
@@ -613,6 +613,7 @@ static void qed_mcp_handle_link_change(struct qed_hwfn *p_hwfn,break ;default : p_link->speed =0 ; + p_link->link_up =0 ; }if (p_link->link_up && p_link->speed)
drivers/net/ethernet/qlogic/qed/qed_sriov.c +1 -1
@@ -2157,7 +2157,7 @@ qed_iov_vp_update_mcast_bin_param(struct qed_hwfn *p_hwfn, p_data->update_approx_mcast_flg =1 ;memcpy (p_data->bins, p_mcast_tlv->bins, -sizeof (unsigned long ) *ETH_MULTICAST_MAC_BINS_IN_REGS ); +sizeof (u32) *ETH_MULTICAST_MAC_BINS_IN_REGS ); *tlvs_mask |=1 <<QED_IOV_VP_UPDATE_MCAST ; }
drivers/net/ethernet/qlogic/qed/qed_vf.c +2 -2
@@ -786,7 +786,7 @@ int qed_vf_pf_vport_update(struct qed_hwfn *p_hwfn, resp_size +=sizeof (struct pfvf_def_resp_tlv );memcpy (p_mcast_tlv->bins, p_params->bins, -sizeof (unsigned long ) *ETH_MULTICAST_MAC_BINS_IN_REGS ); +sizeof (u32) *ETH_MULTICAST_MAC_BINS_IN_REGS ); } update_rx = p_params->accept_flags.update_rx_mode_config;
@@ -972,7 +972,7 @@ void qed_vf_pf_filter_mcast(struct qed_hwfn *p_hwfn,u32 bit; bit =qed_mcast_bin_from_mac (p_filter_cmd->mac[i]); -__set_bit (bit, sp_params.bins); + sp_params.bins[bit /32 ] |=1 << (bit %32 ); } }
drivers/net/ethernet/qlogic/qed/qed_vf.h +6 -1
@@ -336,7 +336,12 @@ struct vfpf_vport_update_mcast_bin_tlv {struct channel_tlv tl;u8 padding[4 ]; -u64 bins[8 ]; +/* There are only 256 approx bins, and in HSI they're divided into +* 32-bit values. As old VFs used to set-bit to the values on its side, +* the upper half of the array is never expected to contain any data. +*/ +u64 bins[4 ]; +u64 obsolete_bins[4 ]; };struct vfpf_vport_update_accept_param_tlv {
drivers/net/ethernet/xilinx/xilinx_axienet_mdio.c +1 -0
@@ -217,6 +217,7 @@ int axienet_mdio_setup(struct axienet_local *lp, struct device_node *np) ret =of_mdiobus_register (bus, np1);if (ret) {mdiobus_free (bus); + lp->mii_bus =NULL ;return ret; }return 0 ;
drivers/net/usb/qmi_wwan.c +1 -1
@@ -946,7 +946,7 @@ static const struct usb_device_id products[] = { {QMI_FIXED_INTF(0x413c, 0x81b3, 8)}, /* Dell Wireless 5809e Gobi(TM) 4G LTE Mobile Broadband Card (rev3) */ {QMI_FIXED_INTF(0x413c, 0x81b6, 8)}, /* Dell Wireless 5811e */ {QMI_FIXED_INTF(0x413c, 0x81b6, 10)}, /* Dell Wireless 5811e */ - {QMI_FIXED_INTF(0x413c, 0x81d7, 1)}, /* Dell Wireless 5821e */ + {QMI_FIXED_INTF(0x413c, 0x81d7, 0)}, /* Dell Wireless 5821e */ {QMI_FIXED_INTF(0x03f0, 0x4e1d, 8)}, /* HP lt4111 LTE/EV-DO/HSPA+ Gobi 4G Module */ {QMI_FIXED_INTF(0x03f0, 0x9d1d, 1)}, /* HP lt4120 Snapdragon X5 LTE */ {QMI_FIXED_INTF(0x22de, 0x9061, 3)}, /* WeTelecom WPD-600N */
drivers/net/wan/lmc/lmc_main.c +1 -1
@@ -1372,7 +1372,7 @@ static irqreturn_t lmc_interrupt (int irq, void *dev_instance) /*fold00*/case 0x001 :printk (KERN_WARNING "%s: Master Abort (naughty)\n" , dev->name);break ; -case 0x010 : +case 0x002 :printk (KERN_WARNING "%s: Target Abort (not so naughty)\n" , dev->name);break ;default :
drivers/net/wireless/broadcom/b43/leds.c +1 -1
@@ -131,7 +131,7 @@ static int b43_register_led(struct b43_wldev *dev, struct b43_led *led, led->wl = dev->wl; led->index = led_index; led->activelow = activelow; -strncpy (led->name, name,sizeof (led->name)); +strlcpy (led->name, name,sizeof (led->name));atomic_set (&led->state,0 ); led->led_dev.name = led->name;
drivers/net/wireless/broadcom/b43legacy/leds.c +1 -1
@@ -101,7 +101,7 @@ static int b43legacy_register_led(struct b43legacy_wldev *dev, led->dev = dev; led->index = led_index; led->activelow = activelow; -strncpy (led->name, name,sizeof (led->name)); +strlcpy (led->name, name,sizeof (led->name)); led->led_dev.name = led->name; led->led_dev.default_trigger = default_trigger;
drivers/pinctrl/freescale/pinctrl-imx1-core.c +1 -1
@@ -433,7 +433,7 @@ static void imx1_pinconf_group_dbg_show(struct pinctrl_dev *pctldev,const char *name;int i, ret; -if (group > info->ngroups) +if (group >= info->ngroups)return ;seq_puts (s,"\n" );
drivers/power/supply/generic-adc-battery.c +15 -10
@@ -243,10 +243,10 @@ static int gab_probe(struct platform_device *pdev)struct power_supply_desc *psy_desc;struct power_supply_config psy_cfg = {};struct gab_platform_data *pdata = pdev->dev.platform_data; -enum power_supply_property *properties;int ret =0 ;int chan; -int index =0 ; +int index =ARRAY_SIZE (gab_props); +bool any = false; adc_bat =devm_kzalloc (&pdev->dev,sizeof (*adc_bat),GFP_KERNEL );if (!adc_bat) {
@@ -280,8 +280,6 @@ static int gab_probe(struct platform_device *pdev) }memcpy (psy_desc->properties, gab_props,sizeof (gab_props)); - properties = (enum power_supply_property *) - ((char *)psy_desc->properties +sizeof (gab_props));/* * getting channel from iio and copying the battery properties
@@ -295,15 +293,22 @@ static int gab_probe(struct platform_device *pdev) adc_bat->channel[chan] =NULL ; }else {/* copying properties for supported channels only */ -memcpy (properties +sizeof (*(psy_desc->properties)) * index, - &gab_dyn_props[chan], -sizeof (gab_dyn_props[chan])); - index++; +int index2; + +for (index2 =0 ; index2 < index; index2++) { +if (psy_desc->properties[index2] == + gab_dyn_props[chan]) +break ;/* already known */ + } +if (index2 == index)/* really new */ + psy_desc->properties[index++] = + gab_dyn_props[chan]; + any = true; } }/* none of the channels are supported so let's bail out */ -if (index ==0 ) { +if (!any) { ret = -ENODEV ; goto second_mem_fail; }
@@ -314,7 +319,7 @@ static int gab_probe(struct platform_device *pdev)* as come channels may be not be supported by the device.So * we need to take care of that. */ - psy_desc->num_properties =ARRAY_SIZE (gab_props) + index; + psy_desc->num_properties = index; adc_bat->psy =power_supply_register (&pdev->dev, psy_desc, &psy_cfg);if (IS_ERR (adc_bat->psy)) {
drivers/s390/cio/qdio_main.c +2 -3
@@ -640,21 +640,20 @@ static inline unsigned long qdio_aob_for_buffer(struct qdio_output_q *q,unsigned long phys_aob =0 ;if (!q->use_cq) - goto out; +return 0 ;if (!q->aobs[bufnr]) {struct qaob *aob =qdio_allocate_aob (); q->aobs[bufnr] = aob; }if (q->aobs[bufnr]) { - q->sbal_state[bufnr].flags =QDIO_OUTBUF_STATE_FLAG_NONE ; q->sbal_state[bufnr].aob = q->aobs[bufnr]; q->aobs[bufnr]->user1 = (u64 ) q->sbal_state[bufnr].user; phys_aob =virt_to_phys (q->aobs[bufnr]);WARN_ON_ONCE (phys_aob &0xFF ); } -out: + q->sbal_state[bufnr].flags =0 ;return phys_aob; }
drivers/scsi/fcoe/fcoe_ctlr.c +2 -2
@@ -755,9 +755,9 @@ int fcoe_ctlr_els_send(struct fcoe_ctlr *fip, struct fc_lport *lport,case ELS_LOGO :if (fip->mode ==FIP_MODE_VN2VN ) {if (fip->state !=FIP_ST_VNMP_UP ) -return -EINVAL ; + goto drop;if (ntoh24 (fh->fh_d_id) ==FC_FID_FLOGI ) -return -EINVAL ; + goto drop; }else {if (fip->state !=FIP_ST_ENABLED )return 0 ;
drivers/scsi/libfc/fc_rport.c +1 -0
@@ -1935,6 +1935,7 @@ static void fc_rport_recv_logo_req(struct fc_lport *lport, struct fc_frame *fp)FC_RPORT_DBG (rdata,"Received LOGO request while in state %s\n" ,fc_rport_state (rdata)); + rdata->flags &= ~FC_RP_STARTED ;fc_rport_enter_delete (rdata,RPORT_EV_STOP );mutex_unlock (&rdata->rp_mutex);kref_put (&rdata->kref, rdata->local_port->tt.rport_destroy);
drivers/scsi/libiscsi.c +6 -6
@@ -283,11 +283,11 @@ static int iscsi_check_tmf_restrictions(struct iscsi_task *task, int opcode)*/ if (opcode !=ISCSI_OP_SCSI_DATA_OUT ) {iscsi_conn_printk (KERN_INFO , conn, -"task [op %x/%x itt " +"task [op %x itt " "0x%x/0x%x] " "rejected.\n" , - task->hdr->opcode, opcode, - task->itt, task->hdr_itt); + opcode, task->itt, + task->hdr_itt);return -EACCES ; }/*
@@ -296,10 +296,10 @@ static int iscsi_check_tmf_restrictions(struct iscsi_task *task, int opcode)*/ if (conn->session->fast_abort) {iscsi_conn_printk (KERN_INFO , conn, -"task [op %x/%x itt " +"task [op %x itt " "0x%x/0x%x] fast abort.\n" , - task->hdr->opcode, opcode, - task->itt, task->hdr_itt); + opcode, task->itt, + task->hdr_itt);return -EACCES ; }break ;
drivers/scsi/scsi_sysfs.c +18 -2
@@ -709,8 +709,24 @@ static ssize_t sdev_store_delete(struct device *dev, struct device_attribute *attr, const char *buf, size_t count) { - if (device_remove_file_self(dev, attr)) - scsi_remove_device(to_scsi_device(dev)); + struct kernfs_node *kn; + + kn =sysfs_break_active_protection (&dev->kobj, &attr->attr); +WARN_ON_ONCE (!kn); +/* +* Concurrent writes into the "delete" sysfs attribute may trigger +* concurrent calls to device_remove_file() and scsi_remove_device(). +* device_remove_file() handles concurrent removal calls by +* serializing these and by ignoring the second and later removal +* attempts. Concurrent calls of scsi_remove_device() are +* serialized. The second and later calls of scsi_remove_device() are +* ignored because the first call of that function changes the device +* state into SDEV_DEL. +*/ +device_remove_file (dev, attr); +scsi_remove_device (to_scsi_device (dev)); +if (kn) +sysfs_unbreak_active_protection (kn);return count; }; static DEVICE_ATTR(delete, S_IWUSR, NULL, sdev_store_delete);
drivers/scsi/vmw_pvscsi.c +8 -3
@@ -564,9 +564,14 @@ static void pvscsi_complete_request(struct pvscsi_adapter *adapter, (btstat == BTSTAT_SUCCESS || btstat == BTSTAT_LINKED_COMMAND_COMPLETED || btstat == BTSTAT_LINKED_COMMAND_COMPLETED_WITH_FLAG)) { - cmd->result = (DID_OK << 16) | sdstat; -if (sdstat ==SAM_STAT_CHECK_CONDITION && cmd->sense_buffer) - cmd->result |= (DRIVER_SENSE <<24 ); +if (sdstat ==SAM_STAT_COMMAND_TERMINATED ) { + cmd->result = (DID_RESET <<16 ); + }else { + cmd->result = (DID_OK <<16 ) | sdstat; +if (sdstat ==SAM_STAT_CHECK_CONDITION && + cmd->sense_buffer) + cmd->result |= (DRIVER_SENSE <<24 ); + } } else switch (btstat) {case BTSTAT_SUCCESS :
drivers/staging/android/ion/ion-ioctl.c +8 -4
@@ -128,11 +128,15 @@ long ion_ioctl(struct file *filp, unsigned int cmd, unsigned long arg) {struct ion_handle *handle; - handle =ion_handle_get_by_id (client, data.handle.handle); -if (IS_ERR (handle)) +mutex_lock (&client->lock); + handle =ion_handle_get_by_id_nolock (client, data.handle.handle); +if (IS_ERR (handle)) { +mutex_unlock (&client->lock);return PTR_ERR (handle); - data.fd.fd =ion_share_dma_buf_fd (client, handle); -ion_handle_put (handle); + } + data.fd.fd =ion_share_dma_buf_fd_nolock (client, handle); +ion_handle_put_nolock (handle); +mutex_unlock (&client->lock);if (data.fd.fd <0 ) ret = data.fd.fd;break ;
drivers/staging/android/ion/ion.c +43 -22
129 lines not on this page · raw message
drivers/staging/android/ion/ion_priv.h +3 -3
@@ -463,11 +463,11 @@ void ion_free_nolock(struct ion_client *client, struct ion_handle *handle);int ion_handle_put_nolock (struct ion_handle *handle); -struct ion_handle *ion_handle_get_by_id (struct ion_client *client, -int id); -int ion_handle_put (struct ion_handle *handle);int ion_query_heaps (struct ion_client *client,struct ion_heap_query *query); +int ion_share_dma_buf_fd_nolock (struct ion_client *client, +struct ion_handle *handle); +#endif /* _ION_PRIV_H */
drivers/staging/media/omap4iss/iss_video.c +2 -1
@@ -11,7 +11,6 @@* (at your option) any later version. */ -#include <asm/cacheflush.h> #include <linux/clk.h> #include <linux/mm.h> #include <linux/pagemap.h>
@@ -24,6 +23,8 @@#include <media/v4l2-ioctl.h> #include <media/v4l2-mc.h> +#include <asm/cacheflush.h> +#include "iss_video.h" #include "iss.h"
drivers/target/iscsi/iscsi_target_login.c +21 -14
@@ -333,8 +333,7 @@ static int iscsi_login_zero_tsih_s1(pr_err ("idr_alloc() for sess_idr failed\n" );iscsit_tx_login_rsp (conn,ISCSI_STATUS_CLS_TARGET_ERR ,ISCSI_LOGIN_STATUS_NO_RESOURCES ); -kfree (sess); -return -ENOMEM ; + goto free_sess; } sess->creation_time =get_jiffies_64 ();
@@ -350,20 +349,28 @@ static int iscsi_login_zero_tsih_s1( ISCSI_LOGIN_STATUS_NO_RESOURCES);pr_err ("Unable to allocate memory for" " struct iscsi_sess_ops.\n" ); -kfree (sess); -return -ENOMEM ; + goto remove_idr; } sess->se_sess =transport_init_session (TARGET_PROT_NORMAL );if (IS_ERR (sess->se_sess)) {iscsit_tx_login_rsp (conn,ISCSI_STATUS_CLS_TARGET_ERR ,ISCSI_LOGIN_STATUS_NO_RESOURCES ); -kfree (sess->sess_ops); -kfree (sess); -return -ENOMEM ; + goto free_ops; }return 0 ; + +free_ops: +kfree (sess->sess_ops); +remove_idr: +spin_lock_bh (&sess_idr_lock); +idr_remove (&sess_idr, sess->session_index); +spin_unlock_bh (&sess_idr_lock); +free_sess: +kfree (sess); + conn->sess =NULL ; +return -ENOMEM ; } static int iscsi_login_zero_tsih_s2(
@@ -1152,13 +1159,13 @@ void iscsi_target_login_sess_out(struct iscsi_conn *conn, ISCSI_LOGIN_STATUS_INIT_ERR);if (!zero_tsih || !conn->sess) goto old_sess_out; -if (conn->sess->se_sess) -transport_free_session (conn->sess->se_sess); -if (conn->sess->session_index !=0 ) { -spin_lock_bh (&sess_idr_lock); -idr_remove (&sess_idr, conn->sess->session_index); -spin_unlock_bh (&sess_idr_lock); - } + +transport_free_session (conn->sess->se_sess); + +spin_lock_bh (&sess_idr_lock); +idr_remove (&sess_idr, conn->sess->session_index); +spin_unlock_bh (&sess_idr_lock); +kfree (conn->sess->sess_ops);kfree (conn->sess); conn->sess =NULL ;
drivers/usb/gadget/function/f_uac2.c +10 -10
@@ -929,14 +929,14 @@ static struct usb_descriptor_header *hs_audio_desc[] = { };struct cntrl_cur_lay3 { -__u32 dCUR; +__le32 dCUR; };struct cntrl_range_lay3 { -__u16 wNumSubRanges; -__u32 dMIN; -__u32 dMAX; -__u32 dRES; +__le16 wNumSubRanges; +__le32 dMIN; +__le32 dMAX; +__le32 dRES; } __packed; static inline void
@@ -1285,9 +1285,9 @@ in_rq_cur(struct usb_function *fn, const struct usb_ctrlrequest *cr)memset (&c,0 ,sizeof (struct cntrl_cur_lay3 ));if (entity_id ==USB_IN_CLK_ID ) - c.dCUR = p_srate; + c.dCUR =cpu_to_le32 (p_srate);else if (entity_id ==USB_OUT_CLK_ID ) - c.dCUR = c_srate; + c.dCUR =cpu_to_le32 (c_srate); value =min_t (unsigned, w_length,sizeof c);memcpy (req->buf, &c, value);
@@ -1325,15 +1325,15 @@ in_rq_range(struct usb_function *fn, const struct usb_ctrlrequest *cr)if (control_selector ==UAC2_CS_CONTROL_SAM_FREQ ) {if (entity_id ==USB_IN_CLK_ID ) - r.dMIN = p_srate; + r.dMIN =cpu_to_le32 (p_srate);else if (entity_id ==USB_OUT_CLK_ID ) - r.dMIN = c_srate; + r.dMIN =cpu_to_le32 (c_srate);else return -EOPNOTSUPP ; r.dMAX = r.dMIN; r.dRES =0 ; - r.wNumSubRanges =1 ; + r.wNumSubRanges =cpu_to_le16 (1 ); value =min_t (unsigned, w_length,sizeof r);memcpy (req->buf, &r, value);
drivers/usb/gadget/udc/r8a66597-udc.c +3 -3
@@ -835,11 +835,11 @@ static void init_controller(struct r8a66597 *r8a66597)r8a66597_bset (r8a66597,XCKE ,SYSCFG0 ); -msleep (3 ); +mdelay (3 );r8a66597_bset (r8a66597,PLLC ,SYSCFG0 ); -msleep (1 ); +mdelay (1 );r8a66597_bset (r8a66597,SCKE ,SYSCFG0 );
@@ -1193,7 +1193,7 @@ __acquires(r8a66597->lock) r8a66597->ep0_req->length =2 ;/* AV: what happens if we get called again before that gets through? */ spin_unlock (&r8a66597->lock); -r8a66597_queue (r8a66597->gadget.ep0, r8a66597->ep0_req,GFP_KERNEL ); +r8a66597_queue (r8a66597->gadget.ep0, r8a66597->ep0_req,GFP_ATOMIC );spin_lock (&r8a66597->lock); }
drivers/usb/phy/phy-fsl-usb.c +3 -1
@@ -879,6 +879,7 @@ int usb_otg_start(struct platform_device *pdev)if (pdata->init && pdata->init (pdev) !=0 )return -EINVAL ; +#ifdef CONFIG_PPC32 if (pdata->big_endian_mmio) { _fsl_readl = _fsl_readl_be; _fsl_writel = _fsl_writel_be;
@@ -886,6 +887,7 @@ int usb_otg_start(struct platform_device *pdev) _fsl_readl = _fsl_readl_le; _fsl_writel = _fsl_writel_le; } +#endif /* request irq */ p_otg->irq =platform_get_irq (pdev,0 );
@@ -976,7 +978,7 @@ int usb_otg_start(struct platform_device *pdev)/* * state file in sysfs */ -static int show_fsl_usb2_otg_state (struct device *dev, +static ssize_t show_fsl_usb2_otg_state (struct device *dev,struct device_attribute *attr,char *buf) {struct otg_fsm *fsm = &fsl_otg_dev->fsm;
fs/cachefiles/namei.c +0 -1
@@ -195,7 +195,6 @@ static int cachefiles_mark_object_active(struct cachefiles_cache *cache,pr_err ("\n" );pr_err ("Error: Unexpected object collision\n" );cachefiles_printk_object (object, xobject); -BUG (); }atomic_inc (&xobject->usage);write_unlock (&cache->active_lock);
fs/cachefiles/rdwr.c +12 -5
@@ -27,6 +27,7 @@ static int cachefiles_read_waiter(wait_queue_t *wait, unsigned mode,struct cachefiles_one_read *monitor = container_of(wait, struct cachefiles_one_read, monitor);struct cachefiles_object *object; +struct fscache_retrieval *op = monitor->op;struct wait_bit_key *key = _key;struct page *page = wait->private;
@@ -51,16 +52,22 @@ static int cachefiles_read_waiter(wait_queue_t *wait, unsigned mode,list_del (&wait->task_list);/* move onto the action list and queue for FS-Cache thread pool */ -ASSERT (monitor->op); +ASSERT (op); - object =container_of (monitor->op->op.object, - struct cachefiles_object, fscache); +/* We need to temporarily bump the usage count as we don't own a ref +* here otherwise cachefiles_read_copier() may free the op between the +* monitor being enqueued on the op->to_do list and the op getting +* enqueued on the work queue. +*/ +fscache_get_retrieval (op); + object = container_of(op->op.object, struct cachefiles_object, fscache);spin_lock (&object->work_lock); -list_add_tail (&monitor->op_link, &monitor->op->to_do); +list_add_tail (&monitor->op_link, &op->to_do);spin_unlock (&object->work_lock); -fscache_enqueue_retrieval (monitor->op); +fscache_enqueue_retrieval (op); +fscache_put_retrieval (op);return 0 ; }
fs/cifs/cifs_debug.c +23 -7
@@ -123,25 +123,41 @@ static int cifs_debug_data_proc_show(struct seq_file *m, void *v)seq_printf (m,"CIFS Version %s\n" ,CIFS_VERSION );seq_printf (m,"Features:" );#ifdef CONFIG_CIFS_DFS_UPCALL -seq_printf (m," dfs" ); +seq_printf (m," DFS" );#endif #ifdef CONFIG_CIFS_FSCACHE -seq_printf (m," fscache" ); +seq_printf (m,",FSCACHE" ); +#endif +#ifdef CONFIG_CIFS_SMB_DIRECT +seq_printf (m,",SMB_DIRECT" ); +#endif +#ifdef CONFIG_CIFS_STATS2 +seq_printf (m,",STATS2" ); +#elif defined(CONFIG_CIFS_STATS ) +seq_printf (m,",STATS" ); +#endif +#ifdef CONFIG_CIFS_DEBUG2 +seq_printf (m,",DEBUG2" ); +#elif defined(CONFIG_CIFS_DEBUG ) +seq_printf (m,",DEBUG" ); +#endif +#ifdef CONFIG_CIFS_ALLOW_INSECURE_LEGACY +seq_printf (m,",ALLOW_INSECURE_LEGACY" );#endif #ifdef CONFIG_CIFS_WEAK_PW_HASH -seq_printf (m," lanman" ); +seq_printf (m,",WEAK_PW_HASH" );#endif #ifdef CONFIG_CIFS_POSIX -seq_printf (m," posix" ); +seq_printf (m,",CIFS_POSIX" );#endif #ifdef CONFIG_CIFS_UPCALL -seq_printf (m," spnego" ); +seq_printf (m,",UPCALL(SPNEGO)" );#endif #ifdef CONFIG_CIFS_XATTR -seq_printf (m," xattr" ); +seq_printf (m,",XATTR" );#endif #ifdef CONFIG_CIFS_ACL -seq_printf (m," acl" ); +seq_printf (m,",ACL" );#endif seq_putc (m,'\n' );seq_printf (m,"Active VFS Requests: %d\n" , GlobalTotalActiveXid);
fs/cifs/inode.c +2 -0
@@ -1116,6 +1116,8 @@ cifs_set_file_info(struct inode *inode, struct iattr *attrs, unsigned int xid,if (!server->ops->set_file_info)return -ENOSYS ; + info_buf.Pad =0 ; +if (attrs->ia_valid &ATTR_ATIME ) { set_time = true; info_buf.LastAccessTime =
fs/cifs/link.c +2 -2
@@ -419,7 +419,7 @@ smb3_query_mf_symlink(unsigned int xid, struct cifs_tcon *tcon,struct cifs_io_parms io_parms;int buf_type =CIFS_NO_BUFFER ;__le16 *utf16_path; -__u8 oplock =SMB2_OPLOCK_LEVEL_II ; +__u8 oplock =SMB2_OPLOCK_LEVEL_NONE ;struct smb2_file_all_info *pfile_info =NULL ; oparms.tcon = tcon;
@@ -481,7 +481,7 @@ smb3_create_mf_symlink(unsigned int xid, struct cifs_tcon *tcon,struct cifs_io_parms io_parms;int create_options =CREATE_NOT_DIR ;__le16 *utf16_path; -__u8 oplock =SMB2_OPLOCK_LEVEL_EXCLUSIVE ; +__u8 oplock =SMB2_OPLOCK_LEVEL_NONE ;struct kvec iov[2 ];if (backup_cred (cifs_sb))
fs/cifs/sess.c +6 -0
@@ -398,6 +398,12 @@ int build_ntlmssp_auth_blob(unsigned char **pbuffer, goto setup_ntlmv2_ret; } *pbuffer =kmalloc (size_of_ntlmssp_blob (ses),GFP_KERNEL ); +if (!*pbuffer) { + rc = -ENOMEM ; +cifs_dbg (VFS ,"Error %d during NTLMSSP allocation\n" , rc); + *buflen =0 ; + goto setup_ntlmv2_ret; + } sec_blob = (AUTHENTICATE_MESSAGE *)*pbuffer;memcpy (sec_blob->Signature,NTLMSSP_SIGNATURE ,8 );
fs/cifs/smb2inode.c +1 -1
@@ -267,7 +267,7 @@ smb2_set_file_info(struct inode *inode, const char *full_path,int rc;if ((buf->CreationTime ==0 ) && (buf->LastAccessTime ==0 ) && - (buf->LastWriteTime ==0 ) && (buf->ChangeTime) && + (buf->LastWriteTime ==0 ) && (buf->ChangeTime ==0 ) && (buf->Attributes ==0 ))return 0 ;/* would be a no op, no sense sending this */
fs/cifs/smb2ops.c +27 -7
@@ -894,6 +894,13 @@ smb3_set_integrity(const unsigned int xid, struct cifs_tcon *tcon, } +/* GMT Token is @GMT-YYYY.MM.DD-HH.MM.SS Unicode which is 48 bytes + null */ +#define GMT_TOKEN_SIZE 50 + +/* +* Input buffer contains (empty) struct smb_snapshot array with size filled in +* For output see struct SRV_SNAPSHOT_ARRAY in MS-SMB2 section 2.2.32.2 +*/ static int smb3_enum_snapshots (const unsigned int xid,struct cifs_tcon *tcon,struct cifsFileInfo *cfile,void __user *ioc_buf)
@@ -922,14 +929,27 @@ smb3_enum_snapshots(const unsigned int xid, struct cifs_tcon *tcon,kfree (retbuf);return rc; } -if (snapshot_in.snapshot_array_size <sizeof (struct smb_snapshot_array )) { - rc = -ERANGE ; -kfree (retbuf); -return rc; - } -if (ret_data_len > snapshot_in.snapshot_array_size) - ret_data_len = snapshot_in.snapshot_array_size; +/* +* Check for min size, ie not large enough to fit even one GMT +* token (snapshot). On the first ioctl some users may pass in +* smaller size (or zero) to simply get the size of the array +* so the user space caller can allocate sufficient memory +* and retry the ioctl again with larger array size sufficient +* to hold all of the snapshot GMT tokens on the second try. +*/ +if (snapshot_in.snapshot_array_size <GMT_TOKEN_SIZE ) + ret_data_len =sizeof (struct smb_snapshot_array ); + +/* +* We return struct SRV_SNAPSHOT_ARRAY, followed by +* the snapshot array (of 50 byte GMT tokens) each +* representing an available previous version of the data +*/ +if (ret_data_len > (snapshot_in.snapshot_array_size + +sizeof (struct smb_snapshot_array ))) + ret_data_len = snapshot_in.snapshot_array_size + +sizeof (struct smb_snapshot_array );if (copy_to_user (ioc_buf, retbuf, ret_data_len)) rc = -EFAULT ;
fs/ext4/namei.c +1 -0
@@ -1415,6 +1415,7 @@ static struct buffer_head * ext4_find_entry (struct inode *dir, goto cleanup_and_exit;dxtrace (printk (KERN_DEBUG "ext4_find_entry: dx failed, " "falling back\n" )); + ret =NULL ; } nblocks = dir->i_size >>EXT4_BLOCK_SIZE_BITS (sb);if (!nblocks) {
fs/ext4/sysfs.c +10 -3
@@ -277,8 +277,12 @@ static ssize_t ext4_attr_show(struct kobject *kobj,case attr_pointer_ui:if (!ptr)return 0 ; -return snprintf (buf,PAGE_SIZE ,"%u\n" , - *((unsigned int *) ptr)); +if (a->attr_ptr == ptr_ext4_super_block_offset) +return snprintf (buf,PAGE_SIZE ,"%u\n" , +le32_to_cpup (ptr)); +else +return snprintf (buf,PAGE_SIZE ,"%u\n" , + *((unsigned int *) ptr));case attr_pointer_atomic:if (!ptr)return 0 ;
@@ -311,7 +315,10 @@ static ssize_t ext4_attr_store(struct kobject *kobj, ret =kstrtoul (skip_spaces (buf),0 , &t);if (ret)return ret; - *((unsigned int *) ptr) = t; +if (a->attr_ptr == ptr_ext4_super_block_offset) + *((__le32 *) ptr) =cpu_to_le32 (t); +else + *((unsigned int *) ptr) = t;return len;case attr_inode_readahead:return inode_readahead_blks_store (a, sbi, buf, len);
fs/ext4/xattr.c +2 -0
@@ -184,6 +184,8 @@ ext4_xattr_check_names(struct ext4_xattr_entry *entry, void *end,struct ext4_xattr_entry *next =EXT4_XATTR_NEXT (e);if ((void *)next >= end)return -EFSCORRUPTED ; +if (strnlen (e->e_name, e->e_name_len) != e->e_name_len) +return -EFSCORRUPTED ; e = next; }
fs/fscache/operation.c +4 -2
@@ -66,7 +66,8 @@ void fscache_enqueue_operation(struct fscache_operation *op)ASSERT (op->processor !=NULL );ASSERT (fscache_object_is_available (op->object)); ASSERTCMP(atomic_read(&op->usage), >, 0); - ASSERTCMP(op->state, ==, FSCACHE_OP_ST_IN_PROGRESS); +ASSERTIFCMP (op->state !=FSCACHE_OP_ST_IN_PROGRESS , + op->state, ==, FSCACHE_OP_ST_CANCELLED);fscache_stat (&fscache_n_op_enqueue);switch (op->flags &FSCACHE_OP_TYPE ) {
@@ -481,7 +482,8 @@ void fscache_put_operation(struct fscache_operation *op)struct fscache_cache *cache;_enter ("{OBJ%x OP%x,%d}" , - op->object->debug_id, op->debug_id,atomic_read (&op->usage)); + op->object ? op->object->debug_id :0 , + op->debug_id,atomic_read (&op->usage)); ASSERTCMP(atomic_read(&op->usage), >, 0);
fs/fuse/dev.c +32 -7
@@ -130,6 +130,16 @@ static bool fuse_block_alloc(struct fuse_conn *fc, bool for_background)return !fc->initialized || (for_background && fc->blocked); } +static void fuse_drop_waiting (struct fuse_conn *fc) +{ +if (fc->connected) { +atomic_dec (&fc->num_waiting); + }else if (atomic_dec_and_test (&fc->num_waiting)) { +/* wake up aborters */ +wake_up_all (&fc->blocked_waitq); + } +} +static struct fuse_req *__fuse_get_req (struct fuse_conn *fc,unsigned npages,bool for_background) {
@@ -170,7 +180,7 @@ static struct fuse_req *__fuse_get_req(struct fuse_conn *fc, unsigned npages,return req; out: -atomic_dec (&fc->num_waiting); +fuse_drop_waiting (fc);return ERR_PTR (err); }
@@ -277,7 +287,7 @@ void fuse_put_request(struct fuse_conn *fc, struct fuse_req *req)if (test_bit (FR_WAITING , &req->flags)) {__clear_bit (FR_WAITING , &req->flags); -atomic_dec (&fc->num_waiting); +fuse_drop_waiting (fc); }if (req->stolen_file)
@@ -363,7 +373,7 @@ static void request_end(struct fuse_conn *fc, struct fuse_req *req)struct fuse_iqueue *fiq = &fc->iq;if (test_and_set_bit (FR_FINISHED , &req->flags)) -return ; + goto put_request;spin_lock (&fiq->waitq.lock);list_del_init (&req->intr_entry);
@@ -393,6 +403,7 @@ static void request_end(struct fuse_conn *fc, struct fuse_req *req)wake_up (&req->waitq);if (req->end) req->end (fc, req); +put_request:fuse_put_request (fc, req); }
@@ -1935,11 +1946,14 @@ static ssize_t fuse_dev_splice_write(struct pipe_inode_info *pipe,if (!fud)return -EPERM ; +pipe_lock (pipe); + bufs =kmalloc (pipe->buffers *sizeof (struct pipe_buffer ),GFP_KERNEL ); -if (!bufs) +if (!bufs) { +pipe_unlock (pipe);return -ENOMEM ; + } -pipe_lock (pipe); nbuf =0 ; rem =0 ;for (idx =0 ; idx < pipe->nrbufs && rem < len; idx++)
@@ -2094,6 +2108,7 @@ void fuse_abort_conn(struct fuse_conn *fc)set_bit (FR_ABORTED , &req->flags);if (!test_bit (FR_LOCKED , &req->flags)) {set_bit (FR_PRIVATE , &req->flags); +__fuse_get_request (req);list_move (&req->list, &to_end1); }spin_unlock (&req->waitq.lock);
@@ -2120,7 +2135,6 @@ void fuse_abort_conn(struct fuse_conn *fc)while (!list_empty (&to_end1)) { req = list_first_entry(&to_end1, struct fuse_req, list); -__fuse_get_request (req);list_del_init (&req->list);request_end (fc, req); }
@@ -2131,6 +2145,11 @@ void fuse_abort_conn(struct fuse_conn *fc) }EXPORT_SYMBOL_GPL (fuse_abort_conn); +void fuse_wait_aborted (struct fuse_conn *fc) +{ +wait_event (fc->blocked_waitq,atomic_read (&fc->num_waiting) ==0 ); +} +int fuse_dev_release (struct inode *inode,struct file *file) {struct fuse_dev *fud =fuse_get_dev (file);
@@ -2138,9 +2157,15 @@ int fuse_dev_release(struct inode *inode, struct file *file)if (fud) {struct fuse_conn *fc = fud->fc;struct fuse_pqueue *fpq = &fud->pq; +LIST_HEAD (to_end); +spin_lock (&fpq->lock);WARN_ON (!list_empty (&fpq->io)); -end_requests (fc, &fpq->processing); +list_splice_init (&fpq->processing, &to_end); +spin_unlock (&fpq->lock); + +end_requests (fc, &to_end); +/* Are we the last open device? */ if (atomic_dec_and_test (&fc->dev_count)) {WARN_ON (fc->iq.fasync !=NULL );
fs/fuse/dir.c +6 -4
@@ -355,11 +355,12 @@ static struct dentry *fuse_lookup(struct inode *dir, struct dentry *entry,struct inode *inode;struct dentry *newent;bool outarg_valid = true; +bool locked; -fuse_lock_inode (dir); + locked =fuse_lock_inode (dir); err =fuse_lookup_name (dir->i_sb,get_node_id (dir), &entry->d_name, &outarg, &inode); -fuse_unlock_inode (dir); +fuse_unlock_inode (dir, locked);if (err == -ENOENT ) { outarg_valid = false; err =0 ;
@@ -1336,6 +1337,7 @@ static int fuse_readdir(struct file *file, struct dir_context *ctx)struct fuse_conn *fc =get_fuse_conn (inode);struct fuse_req *req;u64 attr_version =0 ; +bool locked;if (is_bad_inode (inode))return -EIO ;
@@ -1363,9 +1365,9 @@ static int fuse_readdir(struct file *file, struct dir_context *ctx)fuse_read_fill (req, file, ctx->pos,PAGE_SIZE ,FUSE_READDIR ); } -fuse_lock_inode (inode); + locked =fuse_lock_inode (inode);fuse_request_send (fc, req); -fuse_unlock_inode (inode); +fuse_unlock_inode (inode, locked); nbytes = req->out.args[0 ].size; err = req->out.h.error;fuse_put_request (fc, req);
fs/fuse/file.c +1 -0
@@ -868,6 +868,7 @@ static int fuse_readpages_fill(void *_data, struct page *page) }if (WARN_ON (req->num_pages >= req->max_pages)) { +unlock_page (page);fuse_put_request (fc, req);return -EIO ; }
fs/fuse/fuse_i.h +3 -2
@@ -854,6 +854,7 @@ void fuse_request_send_background_locked(struct fuse_conn *fc,/* Abort all requests */ void fuse_abort_conn (struct fuse_conn *fc); +void fuse_wait_aborted (struct fuse_conn *fc);/** * Invalidate inode attributes
@@ -967,8 +968,8 @@ int fuse_do_setattr(struct dentry *dentry, struct iattr *attr,void fuse_set_initialized (struct fuse_conn *fc); -void fuse_unlock_inode (struct inode *inode); -void fuse_lock_inode (struct inode *inode); +void fuse_unlock_inode (struct inode *inode,bool locked); +bool fuse_lock_inode (struct inode *inode);int fuse_setxattr (struct inode *inode,const char *name,const void *value,size_t size,int flags);
fs/fuse/inode.c +21 -16
@@ -356,15 +356,21 @@ int fuse_reverse_inval_inode(struct super_block *sb, u64 nodeid,return 0 ; } -void fuse_lock_inode (struct inode *inode) +bool fuse_lock_inode (struct inode *inode) { -if (!get_fuse_conn (inode)->parallel_dirops) +bool locked = false; + +if (!get_fuse_conn (inode)->parallel_dirops) {mutex_lock (&get_fuse_inode (inode)->mutex); + locked = true; + } + +return locked; } -void fuse_unlock_inode (struct inode *inode) +void fuse_unlock_inode (struct inode *inode,bool locked) { -if (!get_fuse_conn (inode)->parallel_dirops) +if (locked)mutex_unlock (&get_fuse_inode (inode)->mutex); }
@@ -396,9 +402,6 @@ static void fuse_put_super(struct super_block *sb) {struct fuse_conn *fc =get_fuse_conn_super (sb); -fuse_send_destroy (fc); - -fuse_abort_conn (fc);mutex_lock (&fuse_mutex);list_del (&fc->entry);fuse_ctl_remove_conn (fc);
@@ -1198,16 +1201,25 @@ static struct dentry *fuse_mount(struct file_system_type *fs_type,return mount_nodev (fs_type, flags, raw_data, fuse_fill_super); } -static void fuse_kill_sb_anon (struct super_block *sb) +static void fuse_sb_destroy (struct super_block *sb) {struct fuse_conn *fc =get_fuse_conn_super (sb);if (fc) { +fuse_send_destroy (fc); + +fuse_abort_conn (fc); +fuse_wait_aborted (fc); +down_write (&fc->killsb); fc->sb =NULL ;up_write (&fc->killsb); } +} +static void fuse_kill_sb_anon (struct super_block *sb) +{ +fuse_sb_destroy (sb);kill_anon_super (sb); }
@@ -1230,14 +1242,7 @@ static struct dentry *fuse_mount_blk(struct file_system_type *fs_type,static void fuse_kill_sb_blk (struct super_block *sb) { -struct fuse_conn *fc =get_fuse_conn_super (sb); - -if (fc) { -down_write (&fc->killsb); - fc->sb =NULL ; -up_write (&fc->killsb); - } - +fuse_sb_destroy (sb);kill_block_super (sb); }
fs/squashfs/file.c +28 -22
103 lines not on this page · raw message
fs/squashfs/file_cache.c +2 -2
@@ -20,7 +20,7 @@#include "squashfs.h" /* Read separately compressed datablock and memcopy into page cache */ -int squashfs_readpage_block (struct page *page,u64 block,int bsize) +int squashfs_readpage_block (struct page *page,u64 block,int bsize,int expected) {struct inode *i = page->mapping->host; struct squashfs_cache_entry *buffer = squashfs_get_datablock(i->i_sb,
@@ -31,7 +31,7 @@ int squashfs_readpage_block(struct page *page, u64 block, int bsize)ERROR ("Unable to read page, block %llx, size %x\n" , block, bsize); else - squashfs_copy_cache(page, buffer, buffer->length, 0); + squashfs_copy_cache(page, buffer, expected, 0); squashfs_cache_put(buffer);return res;
fs/squashfs/file_direct.c +12 -12
@@ -21,10 +21,11 @@#include "page_actor.h" static int squashfs_read_cache (struct page *target_page,u64 block,int bsize, -int pages,struct page **page); +int pages,struct page **page,int bytes);/* Read separately compressed datablock directly into page cache */ -int squashfs_readpage_block (struct page *target_page,u64 block,int bsize) +int squashfs_readpage_block (struct page *target_page,u64 block,int bsize, +int expected) {struct inode *inode = target_page->mapping->host;
@@ -83,7 +84,7 @@ int squashfs_readpage_block(struct page *target_page, u64 block, int bsize)* using an intermediate buffer. */ res =squashfs_read_cache (target_page, block, bsize, pages, - page); + page, expected);if (res <0 ) goto mark_errored;
@@ -95,6 +96,11 @@ int squashfs_readpage_block(struct page *target_page, u64 block, int bsize)if (res <0 ) goto mark_errored; +if (res != expected) { + res = -EIO ; + goto mark_errored; + } +/* Last page may have trailing bytes not filled */ bytes = res %PAGE_SIZE ;if (bytes) {
@@ -138,13 +144,12 @@ int squashfs_readpage_block(struct page *target_page, u64 block, int bsize)static int squashfs_read_cache (struct page *target_page,u64 block,int bsize, -int pages,struct page **page) +int pages,struct page **page,int bytes) {struct inode *i = target_page->mapping->host;struct squashfs_cache_entry *buffer =squashfs_get_datablock (i->i_sb, block, bsize); -int bytes = buffer->length, res = buffer->error, n, offset =0 ; -void *pageaddr; +int res = buffer->error, n, offset =0 ;if (res) { ERROR("Unable to read page, block %llx, size %x\n", block,
@@ -159,12 +164,7 @@ static int squashfs_read_cache(struct page *target_page, u64 block, int bsize,if (page[n] ==NULL )continue ; - pageaddr =kmap_atomic (page[n]); -squashfs_copy_data (pageaddr, buffer, offset, avail); -memset (pageaddr + avail,0 ,PAGE_SIZE - avail); -kunmap_atomic (pageaddr); -flush_dcache_page (page[n]); -SetPageUptodate (page[n]); +squashfs_fill_page (page[n], buffer, offset, avail);unlock_page (page[n]);if (page[n] != target_page)put_page (page[n]);
fs/squashfs/squashfs.h +2 -1
@@ -67,11 +67,12 @@ extern __le64 *squashfs_read_fragment_index_table(struct super_block *, u64, u64, unsigned int);/* file.c */ +void squashfs_fill_page (struct page *,struct squashfs_cache_entry *,int ,int );void squashfs_copy_cache (struct page *,struct squashfs_cache_entry *,int ,int );/* file_xxx.c */ -extern int squashfs_readpage_block (struct page *,u64 ,int ); +extern int squashfs_readpage_block (struct page *,u64 ,int ,int );/* id.c */ extern int squashfs_get_id (struct super_block *,unsigned int ,unsigned int *);
fs/sysfs/file.c +44 -0
50 lines not on this page · raw message
include/linux/sysfs.h +14 -0
@@ -238,6 +238,9 @@ int __must_check sysfs_create_files(struct kobject *kobj, const struct attribute **attr);int __must_check sysfs_chmod_file (struct kobject *kobj,const struct attribute *attr,umode_t mode); +struct kernfs_node *sysfs_break_active_protection (struct kobject *kobj, +const struct attribute *attr); +void sysfs_unbreak_active_protection (struct kernfs_node *kn);void sysfs_remove_file_ns (struct kobject *kobj,const struct attribute *attr,const void *ns);bool sysfs_remove_file_self (struct kobject *kobj,const struct attribute *attr);
@@ -351,6 +354,17 @@ static inline int sysfs_chmod_file(struct kobject *kobj,return 0 ; } +static inline struct kernfs_node * +sysfs_break_active_protection (struct kobject *kobj, +const struct attribute *attr) +{ +return NULL ; +} + +static inline void sysfs_unbreak_active_protection (struct kernfs_node *kn) +{ +} +static inline void sysfs_remove_file_ns (struct kobject *kobj,const struct attribute *attr,const void *ns)
kernel/kprobes.c +2 -2
@@ -2441,7 +2441,7 @@ static int __init debugfs_kprobe_init(void)if (!dir)return -ENOMEM ; - file =debugfs_create_file ("list" ,0444 , dir,NULL , + file =debugfs_create_file ("list" ,0400 , dir,NULL , &debugfs_kprobes_operations);if (!file) goto error;
@@ -2451,7 +2451,7 @@ static int __init debugfs_kprobe_init(void)if (!file) goto error; - file =debugfs_create_file ("blacklist" ,0444 , dir,NULL , + file =debugfs_create_file ("blacklist" ,0400 , dir,NULL , &debugfs_kprobe_blacklist_ops);if (!file) goto error;
kernel/sysctl.c +2 -1
@@ -345,7 +345,8 @@ static struct ctl_table kern_table[] = { .data = &sysctl_sched_time_avg, .maxlen = sizeof(unsigned int), .mode = 0644, - .proc_handler = proc_dointvec, + .proc_handler = proc_dointvec_minmax, + .extra1 = &one, }, { .procname = "sched_shares_window_ns",
mm/memcontrol.c +11 -4
@@ -4072,6 +4072,14 @@ static struct cftype mem_cgroup_legacy_files[] = {static DEFINE_IDR (mem_cgroup_idr); +static void mem_cgroup_id_remove (struct mem_cgroup *memcg) +{ +if (memcg->id.id >0 ) { +idr_remove (&mem_cgroup_idr, memcg->id.id); + memcg->id.id =0 ; + } +} +static void mem_cgroup_id_get_many (struct mem_cgroup *memcg,unsigned int n) {VM_BUG_ON (atomic_read (&memcg->id.ref) <=0 );
@@ -4082,8 +4090,7 @@ static void mem_cgroup_id_put_many(struct mem_cgroup *memcg, unsigned int n) {VM_BUG_ON (atomic_read (&memcg->id.ref) < n);if (atomic_sub_and_test (n, &memcg->id.ref)) { -idr_remove (&mem_cgroup_idr, memcg->id.id); - memcg->id.id =0 ; +mem_cgroup_id_remove (memcg);/* Memcg ID pins CSS */ css_put (&memcg->css);
@@ -4208,8 +4215,7 @@ static struct mem_cgroup *mem_cgroup_alloc(void)idr_replace (&mem_cgroup_idr, memcg, memcg->id.id);return memcg; fail: -if (memcg->id.id >0 ) -idr_remove (&mem_cgroup_idr, memcg->id.id); +mem_cgroup_id_remove (memcg);__mem_cgroup_free (memcg);return NULL ; }
@@ -4268,6 +4274,7 @@ mem_cgroup_css_alloc(struct cgroup_subsys_state *parent_css)return &memcg->css; fail: +mem_cgroup_id_remove (memcg);mem_cgroup_free (memcg);return ERR_PTR (-ENOMEM ); }
mm/memory.c +3 -0
@@ -3861,6 +3861,9 @@ int generic_access_phys(struct vm_area_struct *vma, unsigned long addr,return -EINVAL ; maddr =ioremap_prot (phys_addr,PAGE_ALIGN (len + offset), prot); +if (!maddr) +return -ENOMEM ; +if (write)memcpy_toio (maddr + offset, buf, len);else
mm/zswap.c +9 -0
@@ -1018,6 +1018,15 @@ static int zswap_frontswap_store(unsigned type, pgoff_t offset, ret = -ENOMEM ; goto reject; } + +/* A second zswap_is_full() check after +* zswap_shrink() to make sure it's now +* under the max_pool_percent +*/ +if (zswap_is_full ()) { + ret = -ENOMEM ; + goto reject; + } }/* allocate entry */
net/caif/caif_dev.c +3 -1
@@ -131,8 +131,10 @@ static void caif_flow_cb(struct sk_buff *skb) caifd =caif_get (skb->dev);WARN_ON (caifd ==NULL ); -if (caifd ==NULL ) +if (!caifd) { +rcu_read_unlock ();return ; + }caifd_hold (caifd);rcu_read_unlock ();
net/ipv4/cipso_ipv4.c +10 -2
@@ -1523,9 +1523,17 @@ unsigned char *cipso_v4_optptr(const struct sk_buff *skb)int taglen;for (optlen = iph->ihl*4 -sizeof (struct iphdr ); optlen >0 ; ) { -if (optptr[0 ] ==IPOPT_CIPSO ) +switch (optptr[0 ]) { +case IPOPT_CIPSO :return optptr; - taglen = optptr[1 ]; +case IPOPT_END : +return NULL ; +case IPOPT_NOOP : + taglen =1 ; +break ; +default : + taglen = optptr[1 ]; + } optlen -= taglen; optptr += taglen; }
net/ipv6/ip6_vti.c +6 -5
@@ -480,10 +480,6 @@ vti6_xmit(struct sk_buff *skb, struct net_device *dev, struct flowi *fl) goto tx_err_dst_release; } -skb_scrub_packet (skb, !net_eq (t->net,dev_net (dev))); -skb_dst_set (skb, dst); - skb->dev =skb_dst (skb)->dev; - mtu =dst_mtu (dst);if (!skb->ignore_df && skb->len > mtu) {skb_dst (skb)->ops->update_pmtu (dst,NULL , skb, mtu);
@@ -498,9 +494,14 @@ vti6_xmit(struct sk_buff *skb, struct net_device *dev, struct flowi *fl) htonl(mtu)); } -return -EMSGSIZE ; + err = -EMSGSIZE ; + goto tx_err_dst_release; } +skb_scrub_packet (skb, !net_eq (t->net,dev_net (dev))); +skb_dst_set (skb, dst); + skb->dev =skb_dst (skb)->dev; + err =dst_output (t->net, skb->sk, skb);if (net_xmit_eval (err) ==0 ) {struct pcpu_sw_netstats *tstats =this_cpu_ptr (dev->tstats);
net/mac80211/util.c +2 -1
@@ -2061,7 +2061,8 @@ int ieee80211_reconfig(struct ieee80211_local *local)if (!sta->uploaded)continue ; -if (sta->sdata->vif.type !=NL80211_IFTYPE_AP ) +if (sta->sdata->vif.type !=NL80211_IFTYPE_AP && + sta->sdata->vif.type !=NL80211_IFTYPE_AP_VLAN )continue ; for (state = IEEE80211_STA_NOTEXIST;
net/wireless/nl80211.c +1 -0
@@ -4058,6 +4058,7 @@ static int parse_station_flags(struct genl_info *info, params->sta_flags_mask =BIT (NL80211_STA_FLAG_AUTHENTICATED ) |BIT (NL80211_STA_FLAG_MFP ) |BIT (NL80211_STA_FLAG_AUTHORIZED ); +break ;default :return -EINVAL ; }
net/xfrm/xfrm_policy.c +3 -0
@@ -2354,6 +2354,9 @@ struct dst_entry *xfrm_lookup_route(struct net *net, struct dst_entry *dst_orig,if (IS_ERR (dst) &&PTR_ERR (dst) == -EREMOTE )return make_blackhole (net, dst_orig->ops->family, dst_orig); +if (IS_ERR (dst)) +dst_release (dst_orig); +return dst; }EXPORT_SYMBOL (xfrm_lookup_route);
net/xfrm/xfrm_user.c +6 -4
@@ -984,10 +984,12 @@ static inline int xfrm_nlmsg_multicast(struct net *net, struct sk_buff *skb, {struct sock *nlsk =rcu_dereference (net->xfrm.nlsk); -if (nlsk) -return nlmsg_multicast (nlsk, skb, pid, group,GFP_ATOMIC ); -else -return -1 ; +if (!nlsk) { +kfree_skb (skb); +return -EPIPE ; + } + +return nlmsg_multicast (nlsk, skb, pid, group,GFP_ATOMIC ); }static inline size_t xfrm_spdinfo_msgsize (void )
sound/soc/sirf/sirf-usp.c +3 -4
@@ -367,10 +367,9 @@ static int sirf_usp_pcm_probe(struct platform_device *pdev)platform_set_drvdata (pdev, usp); mem_res =platform_get_resource (pdev,IORESOURCE_MEM ,0 ); - base =devm_ioremap (&pdev->dev, mem_res->start, -resource_size (mem_res)); -if (base ==NULL ) -return -ENOMEM ; + base =devm_ioremap_resource (&pdev->dev, mem_res); +if (IS_ERR (base)) +return PTR_ERR (base); usp->regmap =devm_regmap_init_mmio (&pdev->dev, base, &sirf_usp_regmap_config);if (IS_ERR (usp->regmap))
sound/soc/soc-pcm.c +8 -0
@@ -1621,6 +1621,14 @@ static u64 dpcm_runtime_base_format(struct snd_pcm_substream *substream)int i;for (i =0 ; i < be->num_codecs; i++) { +/* +* Skip CODECs which don't support the current stream +* type. See soc_pcm_init_runtime_hw() for more details +*/ +if (!snd_soc_dai_stream_valid (be->codec_dais[i], + stream)) +continue ; + codec_dai_drv = be->codec_dais[i]->driver;if (stream ==SNDRV_PCM_STREAM_PLAYBACK ) codec_stream = &codec_dai_drv->playback;
tools/power/x86/turbostat/turbostat.c +4 -4
@@ -733,9 +733,7 @@ void format_all_counters(struct thread_data *t, struct core_data *c, struct pkg_if (!printed || !summary_only)print_header (); -if (topo.num_cpus >1 ) -format_counters (&average.threads, &average.cores, - &average.packages); +format_counters (&average.threads, &average.cores, &average.packages); printed =1 ;
@@ -3202,7 +3200,9 @@ void process_cpuid() family = (fms >>8 ) &0xf ; model = (fms >>4 ) &0xf ; stepping = fms &0xf ; -if (family ==6 || family ==0xf ) +if (family ==0xf ) + family += (fms >>20 ) &0xff ; +if (family >=6 ) model += ((fms >>16 ) &0xf ) <<4 ;if (debug) {
tools/testing/selftests/ftrace/test.d/00basic/snapshot.tc new file +28 -0
@@ -0,0 +1,28 @@ +#!/bin/sh +# description: Snapshot and tracing setting +# flags: instance + +[ ! -f snapshot ] && exit_unsupported + +echo "Set tracing off" +echo 0 > tracing_on + +echo "Allocate and take a snapshot" +echo 1 > snapshot + +# Since trace buffer is empty, snapshot is also empty, but allocated +grep -q "Snapshot is allocated" snapshot + +echo "Ensure keep tracing off" +test `cat tracing_on` -eq 0 + +echo "Set tracing on" +echo 1 > tracing_on + +echo "Take a snapshot again" +echo 1 > snapshot + +echo "Ensure keep tracing on" +test `cat tracing_on` -eq 1 + +exit 0
tools/usb/ffs-test.c +16 -3
@@ -44,12 +44,25 @@/******************** Little Endian Handling ********************************/ -#define cpu_to_le16 (x) htole16(x) -#define cpu_to_le32 (x) htole32(x) +/* +* cpu_to_le16/32 are used when initializing structures, a context where a +* function call is not allowed. To solve this, we code cpu_to_le16/32 in a way +* that allows them to be used when initializing structures. +*/ + +#if __BYTE_ORDER == __LITTLE_ENDIAN +#define cpu_to_le16 (x) (x) +#define cpu_to_le32 (x) (x) +#else +#define cpu_to_le16 (x) ((((x) >> 8) & 0xffu) | (((x) & 0xffu) << 8)) +#define cpu_to_le32 (x) \ + ((((x) & 0xff000000u) >> 24) | (((x) & 0x00ff0000u) >> 8) | \ + (((x) & 0x0000ff00u) << 8) | (((x) & 0x000000ffu) << 24)) +#endif +#define le32_to_cpu (x) le32toh(x)#define le16_to_cpu (x) le16toh(x) -/******************** Messages and Errors ***********************************/ static const char argv0[] ="ffs-test" ;