Linux 4.13.5
Greg KH
maintainerI'm announcing the release of the 4.13.5 kernel.
All users of the 4.13 kernel series must upgrade.
The updated 4.13.y git tree can be found at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git linux-4.13.y
and can be browsed at the normal kernel.org git web browser:
http://git.kernel.org/?p=linux/kernel/git/stable/linux-stable.git;a=summary
thanks,
greg k-h
------------
Makefile | 2 arch/arm64/include/asm/pgtable.h | 2 arch/arm64/kernel/head.S | 1 arch/arm64/mm/fault.c | 2 arch/mips/kernel/perf_event_mipsxx.c | 3 arch/powerpc/kernel/eeh.c | 4 arch/powerpc/kernel/eeh_dev.c | 18 - arch/powerpc/kernel/ptrace.c | 2 arch/powerpc/kvm/book3s_hv.c | 2 arch/powerpc/kvm/book3s_hv_rm_xive.c | 1 arch/powerpc/kvm/book3s_hv_rmhandlers.S | 17 + arch/powerpc/kvm/book3s_xive.c | 1 arch/powerpc/kvm/book3s_xive_template.c | 7 arch/powerpc/platforms/pseries/mobility.c | 4 arch/s390/include/asm/pgtable.h | 4 arch/s390/kernel/perf_cpum_sf.c | 9 arch/s390/mm/gup.c | 7 arch/x86/kernel/fpu/regset.c | 9 arch/x86/kernel/fpu/signal.c | 4 arch/x86/kernel/kvm.c | 3 arch/x86/kvm/vmx.c | 256 +++++++++++++------------- arch/x86/mm/fault.c | 47 ++-- block/bsg-lib.c | 1 crypto/drbg.c | 8 drivers/base/power/main.c | 9 drivers/base/power/opp/core.c | 7 drivers/block/brd.c | 2 drivers/crypto/talitos.c | 9 drivers/dax/super.c | 21 +- drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c | 189 +++++++++++++++++++ drivers/gpu/drm/etnaviv/etnaviv_gem.c | 3 drivers/gpu/drm/etnaviv/etnaviv_gem_submit.c | 6 drivers/gpu/drm/exynos/exynos_drm_drv.c | 4 drivers/gpu/drm/i915/gvt/cfg_space.c | 113 ++++------- drivers/gpu/drm/i915/intel_dsi.c | 11 - drivers/gpu/drm/radeon/radeon_device.c | 2 drivers/infiniband/hw/cxgb4/cm.c | 9 drivers/infiniband/ulp/ipoib/ipoib_ib.c | 13 - drivers/md/dm-integrity.c | 6 drivers/md/dm-linear.c | 15 - drivers/md/dm-stripe.c | 20 -- drivers/md/dm.c | 19 - drivers/md/md.c | 72 ++++--- drivers/md/md.h | 1 drivers/md/raid5.c | 13 + drivers/mmc/core/queue.c | 7 drivers/mmc/host/sdhci-pci-core.c | 15 + drivers/mtd/mtdpart.c | 8 drivers/mtd/nand/atmel/pmecc.c | 2 drivers/net/wireless/mac80211_hwsim.c | 2 drivers/nvdimm/namespace_devs.c | 9 drivers/nvdimm/pmem.c | 7 drivers/nvme/host/pci.c | 66 ++++-- drivers/pci/pci-sysfs.c | 11 - drivers/platform/x86/fujitsu-laptop.c | 10 - drivers/scsi/aacraid/aachba.c | 12 - drivers/scsi/aacraid/aacraid.h | 5 drivers/scsi/aacraid/src.c | 2 drivers/scsi/scsi_transport_fc.c | 2 drivers/scsi/scsi_transport_iscsi.c | 2 drivers/video/fbdev/aty/atyfb_base.c | 2 fs/btrfs/inode.c | 20 ++ fs/btrfs/ioctl.c | 6 fs/btrfs/relocation.c | 2 fs/cifs/cifsfs.c | 2 fs/cifs/cifsglob.h | 6 fs/cifs/connect.c | 32 ++- fs/cifs/file.c | 7 fs/cifs/inode.c | 15 + fs/cifs/smb2ops.c | 40 ++++ fs/cifs/smb2pdu.c | 111 +++++++++-- fs/cifs/smb2pdu.h | 2 fs/dax.c | 4 fs/gfs2/glock.c | 14 - fs/proc/array.c | 9 fs/read_write.c | 4 fs/xfs/xfs_ioctl.c | 3 include/linux/dax.h | 5 include/linux/device-mapper.h | 3 include/linux/key.h | 2 include/net/mac80211.h | 15 - kernel/exit.c | 23 +- kernel/extable.c | 45 +++- kernel/futex.c | 33 ++- kernel/irq/chip.c | 2 kernel/irq/generic-chip.c | 1 kernel/irq/irqdesc.c | 24 -- kernel/irq/msi.c | 5 kernel/rcu/tree.c | 10 + kernel/seccomp.c | 23 +- kernel/sysctl.c | 3 kernel/trace/trace.c | 12 - kernel/trace/trace_stack.c | 15 - net/ceph/osdmap.c | 35 ++- net/mac80211/agg-rx.c | 32 ++- net/mac80211/ht.c | 6 net/mac80211/ieee80211_i.h | 4 net/mac80211/iface.c | 17 + net/mac80211/offchannel.c | 2 net/mac80211/tx.c | 36 ++- net/wireless/nl80211.c | 3 security/keys/Kconfig | 4 security/keys/big_key.c | 138 ++++++-------- security/keys/internal.h | 2 security/keys/key.c | 2 security/keys/keyctl.c | 5 security/keys/keyring.c | 37 +-- security/keys/process_keys.c | 6 tools/testing/selftests/seccomp/seccomp_bpf.c | 18 + 109 files changed, 1242 insertions(+), 723 deletions(-)
Adrian Hunter (2):
mmc: block: Fix incorrectly initialized requests
mmc: sdhci-pci: Fix voltage switch for some Intel host controllers
Akinobu Mita (1):
nvme-pci: use appropriate initial chunk size for HMB allocation
Al Viro (1):
fix infoleak in waitid(2)
Alex Deucher (1):
drm/radeon: disable hard reset in hibernate for APUs
Alex Estrin (1):
Revert "IB/ipoib: Update broadcast object if PKey value was changed in index 0"
Andreas Gruenbacher (2):
vfs: Return -ENXIO for negative SEEK_HOLE / SEEK_DATA offsets
gfs2: Fix debugfs glocks dump
Avraham Stern (1):
mac80211: flush hw_roc_start work before cancelling the ROC
Beni Lev (1):
mac80211_hwsim: Use proper TX power
Benjamin Herrenschmidt (2):
KVM: PPC: Book3S HV: Don't access XIVE PIPR register using byte accesses powerpc/eeh: Create PHB PEs after EEH is initialized
Bo Yan (1):
tracing: Erase irqsoff trace with empty write
Boqun Feng (1):
kvm/x86: Handle async PF in RCU read-side critical sections
Boris Brezillon (1):
mtd: Fix partition alignment check on multi-erasesize devices
Changbin Du (1):
drm/i915/gvt: Fix incorrect PCI BARs reporting
Christoph Hellwig (4):
nvme-pci: fix host memory buffer allocation fallback
nvme-pci: propagate (some) errors from host memory buffer setup
scsi: scsi_transport_fc: fix NULL pointer dereference in fc_bsg_job_timeout
bsg-lib: don't free job in bsg_prepare_job
Dan Williams (1):
libnvdimm, namespace: fix btt claim class crash
Dave Carroll (1):
scsi: aacraid: Fix 2T+ drives on SmartIOC-2000
Dennis Yang (1):
md/raid5: preserve STRIPE_ON_UNPLUG_LIST in break_stripe_batch_list
Eric Biggers (4):
KEYS: fix writing past end of user-supplied buffer in keyring_read()
KEYS: prevent creating a different user's keyrings
KEYS: prevent KEYCTL_READ on negative key
x86/fpu: Don't let userspace set bogus xcomp_bv
Ethan Zhao (1):
sched/sysctl: Check user input value of sysctl_sched_time_avg
Gerald Schaefer (2):
s390/mm: make pmdp_invalidate() do invalidation only s390/mm: fix write access check in gup_huge_pmd()
Greg Kroah-Hartman (1):
Linux 4.13.5
Guilherme G. Piccoli (1):
scsi: aacraid: Add a small delay after IOP reset
Gustavo Romero (1):
powerpc/tm: Flush TM only if CPU has TM feature
Haozhong Zhang (2):
KVM: VMX: do not change SN bit in vmx_update_pi_irte()
KVM: VMX: remove WARN_ON_ONCE in kvm_vcpu_trigger_posted_interrupt
Hyunchul Lee (1):
dm integrity: do not check integrity for failed read operations
Ilya Dryomov (1):
libceph: don't allow bidirectional swap of pg-upmap-items
Jan H. Schönherr (1):
KVM: VMX: Do not BUG() on out-of-bounds guest IRQ
Jason A. Donenfeld (2):
security/keys: properly zero out sensitive key material in big_key security/keys: rewrite all of big_key crypto
Jean Delvare (1):
drm/amdgpu: revert tile table update for oland
Jeffy Chen (1):
irq/generic-chip: Don't replace domain's name
Jim Mattson (1):
kvm: nVMX: Don't allow L2 to access the hardware CR8
Johannes Berg (2):
mac80211: fix VLAN handling with TXQs
mac80211: fix deadlock in driver-managed RX BA session start
John Keeping (1):
genirq/msi: Fix populating multiple interrupts
John Ogness (1):
fs/proc: Report eip/esp in /prod/PID/stat for coredumping
Kees Cook (1):
selftests/seccomp: Support glibc 2.26 siginfo_t.h
LEROY Christophe (3):
crypto: talitos - Don't provide setkey for non hmac hashing algs.
crypto: talitos - fix sha224
crypto: talitos - fix hashing
Ladi Prosek (1):
KVM: nVMX: fix HOST_CR3/HOST_CR4 cache
Laurent Dufour (1):
x86/mm: Fix fault error path using unsafe vma pointer
Lucas Stach (2):
etnaviv: fix submit error path
etnaviv: fix gem object list corruption
Marc Zyngier (1):
arm64: Make sure SPsel is always set
Marek Szyprowski (1):
drm/exynos: Fix locking in the suspend/resume paths
Mikulas Patocka (2):
dax: remove the pmem_dax_ops->flush abstraction
brd: fix overflow in __brd_direct_access
Naohiro Aota (4):
btrfs: fix NULL pointer dereference from free_reloc_roots()
btrfs: clear ordered flag on cleaning up ordered extents
btrfs: finish ordered extent cleaning if no progress is found
btrfs: propagate error to btrfs_cmp_data_prepare caller
Nicolai Stange (1):
PCI: Fix race condition with driver_override
Oleg Nesterov (1):
seccomp: fix the usage of get/put_seccomp_filter() in seccomp_get_filter()
Paolo Bonzini (4):
KVM: VMX: extract __pi_post_block
KVM: VMX: avoid double list add with VT-d posted interrupts
KVM: VMX: simplify and fix vmx_vcpu_pi_load
KVM: VMX: use cmpxchg64
Paul Burton (1):
MIPS: Fix perf event init
Paul E. McKenney (1):
rcu: Allow for page faults in NMI handlers
Paul Mackerras (2):
KVM: PPC: Book3S HV: Hold kvm->lock around call to kvmppc_update_lpcr
KVM: PPC: Book3S HV: Fix bug causing host SLB to be restored incorrectly
Peter Zijlstra (1):
futex: Fix pi_state->owner serialization
Pu Hou (1):
s390/perf: fix bug when creating per-thread event
Rafael J. Wysocki (1):
PM: core: Fix device_pm_check_callbacks()
Richard Genoud (1):
mtd: nand: atmel: fix buffer overflow in atmel_pmecc_user
Ronnie Sahlberg (1):
cifs: check rsp for NULL before dereferencing in SMB2_open
Ross Zwisler (1):
xfs: validate bdev support for DAX inode flag
Shaohua Li (3):
md/raid5: fix a race condition in stripe batch
md: fix a race condition for flush request handling
md: separate request handling
Shu Wang (2):
cifs: release cifs root_cred after exit_cifs
cifs: release auth_key.response for reconnect.
Stephan Mueller (1):
crypto: drbg - fix freeing of resources
Steve French (7):
SMB3: Add support for multidialect negotiate (SMB2.1 and later) Fix SMB3.1.1 guest authentication to Samba
SMB3: Fix endian warning
SMB3: Warn user if trying to sign connection that authenticated as guest
SMB: Validate negotiate (to protect against downgrade) even if signing off
SMB3: handle new statx fields
SMB3: Don't ignore O_SYNC/O_DSYNC and O_DIRECT flags
Steve Wise (3):
iw_cxgb4: drop listen destroy replies if no ep found
iw_cxgb4: remove the stid on listen create failure
iw_cxgb4: put ep reference in pass_accept_req()
Steven Rostedt (VMware) (3):
tracing: Remove RCU work arounds from stack tracer
extable: Consolidate *kernel_text_address() functions
extable: Enable RCU if it is not watching in kernel_text_address()
Tahsin Erdogan (1):
tracing: Fix trace_pipe behavior for instance traces
Thomas Gleixner (2):
genirq: Make sparse_irq_lock protect what it should protect
genirq: Fix cpumask check in __irq_startup_managed()
Tyrel Datwyler (1):
powerpc/pseries: Fix parent_dn reference leak in add_dt_node()
Uma Shankar (1):
Revert "drm/i915/bxt: Disable device ready before shutdown command"
Ville Syrjälä (1):
platform/x86: fujitsu-laptop: Don't oops when FUJ02E3 is not presnt
Viresh Kumar (1):
PM / OPP: Call notifier without holding opp_table->lock
Vladis Dronov (2):
nl80211: check for the required netlink attributes presence
video: fbdev: aty: do not leak uninitialized padding in clk to userspace
Will Deacon (2):
arm64: mm: Use READ_ONCE when dereferencing pointer to pte table
arm64: fault: Route pte translation faults via do_translation_fault
Xin Long (1):
scsi: scsi_transport_iscsi: fix the issue that iscsi_if_rx doesn't parse nlmsg properly
satoru takeuchi (1):
btrfs: prevent to set invalid default subvolid
Greg KH
maintainerMakefile +1 -1
@@ -1,6 +1,6 @@ VERSION = 4 PATCHLEVEL = 13 -SUBLEVEL = 4 +SUBLEVEL = 5 EXTRAVERSION = NAME = Fearless Coyote
arch/arm64/include/asm/pgtable.h +1 -1
@@ -412,7 +412,7 @@ static inline phys_addr_t pmd_page_paddr(pmd_t pmd)/* Find an entry in the third-level page table. */ #define pte_index (addr) (((addr) >> PAGE_SHIFT) & (PTRS_PER_PTE - 1)) -#define pte_offset_phys (dir,addr) (pmd_page_paddr(*(dir)) + pte_index(addr) * sizeof(pte_t)) +#define pte_offset_phys (dir,addr) (pmd_page_paddr(READ_ONCE(*(dir))) + pte_index(addr) * sizeof(pte_t))#define pte_offset_kernel (dir,addr) ((pte_t *)__va(pte_offset_phys((dir), (addr))))#define pte_offset_map (dir,addr) pte_offset_kernel((dir), (addr))
arch/arm64/kernel/head.S +1 -0
@@ -381,6 +381,7 @@ ENTRY(kimage_vaddr) * booted in EL1 or EL2 respectively. */ ENTRY(el2_setup) + msr SPsel, #1 // We want to use SP_EL{1,2} mrs x0, CurrentEL cmp x0, #CurrentEL_EL2 b.eq 1f
arch/arm64/mm/fault.c +1 -1
@@ -614,7 +614,7 @@ static const struct fault_info fault_info[] = { { do_translation_fault, SIGSEGV, SEGV_MAPERR, "level 0 translation fault" }, { do_translation_fault, SIGSEGV, SEGV_MAPERR, "level 1 translation fault" }, { do_translation_fault, SIGSEGV, SEGV_MAPERR, "level 2 translation fault" }, - { do_page_fault, SIGSEGV, SEGV_MAPERR, "level 3 translation fault" }, + { do_translation_fault, SIGSEGV, SEGV_MAPERR, "level 3 translation fault" }, { do_bad, SIGBUS, 0, "unknown 8" }, { do_page_fault, SIGSEGV, SEGV_ACCERR, "level 1 access flag fault" }, { do_page_fault, SIGSEGV, SEGV_ACCERR, "level 2 access flag fault" },
arch/mips/kernel/perf_event_mipsxx.c +1 -2
@@ -618,8 +618,7 @@ static int mipspmu_event_init(struct perf_event *event)return -ENOENT ; } -if ((unsigned int )event->cpu >= nr_cpumask_bits || - (event->cpu >=0 && !cpu_online (event->cpu))) +if (event->cpu >=0 && !cpu_online (event->cpu))return -ENODEV ;if (!atomic_inc_not_zero (&active_events)) {
arch/powerpc/kernel/eeh.c +4 -0
@@ -1018,6 +1018,10 @@ int eeh_init(void) }else if ((ret = eeh_ops->init ()))return ret; +/* Initialize PHB PEs */ +list_for_each_entry_safe (hose, tmp, &hose_list, list_node) +eeh_dev_phb_init_dynamic (hose); +/* Initialize EEH event */ ret =eeh_event_init ();if (ret)
arch/powerpc/kernel/eeh_dev.c +0 -18
@@ -83,21 +83,3 @@ void eeh_dev_phb_init_dynamic(struct pci_controller *phb)/* EEH PE for PHB */ eeh_phb_pe_create (phb); } - -/** -* eeh_dev_phb_init - Create EEH devices for devices included in existing PHBs -* -* Scan all the existing PHBs and create EEH devices for their OF -* nodes and their children OF nodes -*/ -static int __init eeh_dev_phb_init (void ) -{ -struct pci_controller *phb, *tmp; - -list_for_each_entry_safe (phb, tmp, &hose_list, list_node) -eeh_dev_phb_init_dynamic (phb); - -return 0 ; -} - -core_initcall (eeh_dev_phb_init);
arch/powerpc/kernel/ptrace.c +1 -1
@@ -131,7 +131,7 @@ static void flush_tmregs_to_thread(struct task_struct *tsk)* in the appropriate thread structures from live. */ -if (tsk != current) +if ((!cpu_has_feature (CPU_FTR_TM )) || (tsk != current))return ;if (MSR_TM_SUSPENDED (mfmsr ())) {
arch/powerpc/kvm/book3s_hv.c +2 -0
@@ -4187,11 +4187,13 @@ static int kvmhv_configure_mmu(struct kvm *kvm, struct kvm_ppc_mmuv3_cfg *cfg)if ((cfg->process_table &PRTS_MASK ) >24 )return -EINVAL ; +mutex_lock (&kvm->lock); kvm->arch.process_table = cfg->process_table;kvmppc_setup_partition_table (kvm); lpcr = (cfg->flags &KVM_PPC_MMUV3_GTSE ) ?LPCR_GTSE :0 ;kvmppc_update_lpcr (kvm, lpcr,LPCR_GTSE ); +mutex_unlock (&kvm->lock);return 0 ; }
arch/powerpc/kvm/book3s_hv_rm_xive.c +0 -1
@@ -38,7 +38,6 @@ static inline void __iomem *get_tima_phys(void)#define __x_tima get_tima_phys()#define __x_eoi_page (xd) ((void __iomem *)((xd)->eoi_page))#define __x_trig_page (xd) ((void __iomem *)((xd)->trig_page)) -#define __x_readb __raw_rm_readb#define __x_writeb __raw_rm_writeb#define __x_readw __raw_rm_readw#define __x_readq __raw_rm_readq
arch/powerpc/kvm/book3s_hv_rmhandlers.S +16 -1
@@ -765,6 +765,9 @@ END_FTR_SECTION_IFCLR(CPU_FTR_ARCH_207S) #ifdef CONFIG_PPC_TRANSACTIONAL_MEM BEGIN_FTR_SECTION + /* + * NOTE THAT THIS TRASHES ALL NON-VOLATILE REGISTERS INCLUDING CR + */ bl kvmppc_restore_tm END_FTR_SECTION_IFSET(CPU_FTR_TM) #endif
@@ -1623,6 +1626,9 @@ END_FTR_SECTION_IFCLR(CPU_FTR_ARCH_300) #ifdef CONFIG_PPC_TRANSACTIONAL_MEM BEGIN_FTR_SECTION + /* + * NOTE THAT THIS TRASHES ALL NON-VOLATILE REGISTERS INCLUDING CR + */ bl kvmppc_save_tm END_FTR_SECTION_IFSET(CPU_FTR_TM) #endif
@@ -1742,7 +1748,10 @@ END_FTR_SECTION_IFSET(CPU_FTR_ARCH_300) /* * Are we running hash or radix ? */ - beq cr2,3f + ld r5, VCPU_KVM(r9) + lbz r0, KVM_RADIX(r5) + cmpwi cr2, r0, 0 + beq cr2, 3f /* Radix: Handle the case where the guest used an illegal PID */ LOAD_REG_ADDR(r4, mmu_base_pid)
@@ -2459,6 +2468,9 @@ _GLOBAL(kvmppc_h_cede) /* r3 = vcpu pointer, r11 = msr, r13 = paca */ #ifdef CONFIG_PPC_TRANSACTIONAL_MEM BEGIN_FTR_SECTION + /* + * NOTE THAT THIS TRASHES ALL NON-VOLATILE REGISTERS INCLUDING CR + */ ld r9, HSTATE_KVM_VCPU(r13) bl kvmppc_save_tm END_FTR_SECTION_IFSET(CPU_FTR_TM)
@@ -2569,6 +2581,9 @@ kvm_end_cede: #ifdef CONFIG_PPC_TRANSACTIONAL_MEM BEGIN_FTR_SECTION + /* + * NOTE THAT THIS TRASHES ALL NON-VOLATILE REGISTERS INCLUDING CR + */ bl kvmppc_restore_tm END_FTR_SECTION_IFSET(CPU_FTR_TM) #endif
arch/powerpc/kvm/book3s_xive.c +0 -1
@@ -48,7 +48,6 @@#define __x_tima xive_tima#define __x_eoi_page (xd) ((void __iomem *)((xd)->eoi_mmio))#define __x_trig_page (xd) ((void __iomem *)((xd)->trig_mmio)) -#define __x_readb __raw_readb#define __x_writeb __raw_writeb#define __x_readw __raw_readw#define __x_readq __raw_readq
arch/powerpc/kvm/book3s_xive_template.c +4 -3
@@ -28,7 +28,8 @@ static void GLUE(X_PFX,ack_pending)(struct kvmppc_xive_vcpu *xc)* bit. */ if (cpu_has_feature (CPU_FTR_POWER9_DD1 )) { -u8 pipr =__x_readb (__x_tima +TM_QW1_OS +TM_PIPR ); +__be64 qw1 =__x_readq (__x_tima +TM_QW1_OS ); +u8 pipr =be64_to_cpu (qw1) &0xff ;if (pipr >= xc->hw_cppr)return ; }
@@ -336,7 +337,6 @@ X_STATIC unsigned long GLUE(X_PFX,h_ipoll)(struct kvm_vcpu *vcpu, unsigned longstruct kvmppc_xive_vcpu *xc = vcpu->arch.xive_vcpu;u8 pending = xc->pending;u32 hirq; -u8 pipr;pr_devel ("H_IPOLL(server=%ld)\n" , server);
@@ -353,7 +353,8 @@ X_STATIC unsigned long GLUE(X_PFX,h_ipoll)(struct kvm_vcpu *vcpu, unsigned long pending =0xff ; }else {/* Grab pending interrupt if any */ - pipr =__x_readb (__x_tima +TM_QW1_OS +TM_PIPR ); +__be64 qw1 =__x_readq (__x_tima +TM_QW1_OS ); +u8 pipr =be64_to_cpu (qw1) &0xff ;if (pipr <8 ) pending |=1 << pipr; }
arch/powerpc/platforms/pseries/mobility.c +3 -1
@@ -226,8 +226,10 @@ static int add_dt_node(__be32 parent_phandle, __be32 drc_index)return -ENOENT ; dn =dlpar_configure_connector (drc_index, parent_dn); -if (!dn) +if (!dn) { +of_node_put (parent_dn);return -ENOENT ; + } rc =dlpar_attach_node (dn);if (rc)
arch/s390/include/asm/pgtable.h +3 -1
@@ -1462,7 +1462,9 @@ static inline pmd_t pmdp_huge_clear_flush(struct vm_area_struct *vma,static inline void pmdp_invalidate (struct vm_area_struct *vma,unsigned long addr,pmd_t *pmdp) { -pmdp_xchg_direct (vma->vm_mm, addr, pmdp,__pmd (_SEGMENT_ENTRY_EMPTY)); +pmd_t pmd =__pmd (pmd_val (*pmdp) | _SEGMENT_ENTRY_INVALID); + +pmdp_xchg_direct (vma->vm_mm, addr, pmdp, pmd); }#define __HAVE_ARCH_PMDP_SET_WRPROTECT
arch/s390/kernel/perf_cpum_sf.c +6 -3
@@ -823,9 +823,12 @@ static int cpumsf_pmu_event_init(struct perf_event *event) }/* Check online status of the CPU to which the event is pinned */ -if ((unsigned int )event->cpu >= nr_cpumask_bits || - (event->cpu >=0 && !cpu_online (event->cpu))) -return -ENODEV ; +if (event->cpu >=0 ) { +if ((unsigned int )event->cpu >= nr_cpumask_bits) +return -ENODEV ; +if (!cpu_online (event->cpu)) +return -ENODEV ; + }/* Force reset of idle/hv excludes regardless of what the * user requested.
arch/s390/mm/gup.c +3 -4
@@ -56,13 +56,12 @@ static inline int gup_pte_range(pmd_t *pmdp, pmd_t pmd, unsigned long addr,static inline int gup_huge_pmd (pmd_t *pmdp,pmd_t pmd,unsigned long addr,unsigned long end,int write,struct page **pages,int *nr) { -unsigned long mask, result;struct page *head, *page; +unsigned long mask;int refs; - result = write ?0 : _SEGMENT_ENTRY_PROTECT; - mask = result | _SEGMENT_ENTRY_INVALID; -if ((pmd_val (pmd) & mask) != result) + mask = (write ? _SEGMENT_ENTRY_PROTECT :0 ) | _SEGMENT_ENTRY_INVALID; +if ((pmd_val (pmd) & mask) !=0 )return 0 ;VM_BUG_ON (!pfn_valid (pmd_val (pmd) >>PAGE_SHIFT ));
arch/x86/kernel/fpu/regset.c +7 -2
@@ -131,11 +131,16 @@ int xstateregs_set(struct task_struct *target, const struct user_regset *regset,fpu__activate_fpstate_write (fpu); -if (boot_cpu_has (X86_FEATURE_XSAVES )) +if (boot_cpu_has (X86_FEATURE_XSAVES )) { ret =copyin_to_xsaves (kbuf, ubuf, xsave); -else + }else { ret =user_regset_copyin (&pos, &count, &kbuf, &ubuf, xsave,0 ,-1 ); +/* xcomp_bv must be 0 when using uncompacted format */ +if (!ret && xsave->header.xcomp_bv) + ret = -EINVAL ; + } +/* * In case of failure, mark all states as init: */
arch/x86/kernel/fpu/signal.c +4 -0
@@ -329,6 +329,10 @@ static int __fpu__restore_sig(void __user *buf, void __user *buf_fx, int size) }else { err =__copy_from_user (&fpu->state.xsave, buf_fx, state_size); + +/* xcomp_bv must be 0 when using uncompacted format */ +if (!err && state_size > offsetof(struct xregs_state , header) && fpu->state.xsave.header.xcomp_bv) + err = -EINVAL ; }if (err ||__copy_from_user (&env, buf,sizeof (env))) {
arch/x86/kernel/kvm.c +2 -1
@@ -140,7 +140,8 @@ void kvm_async_pf_task_wait(u32 token) n.token = token; n.cpu =smp_processor_id (); - n.halted =is_idle_task (current) ||preempt_count () >1 ; + n.halted =is_idle_task (current) ||preempt_count () >1 || +rcu_preempt_depth ();init_swait_queue_head (&n.wq);hlist_add_head (&n.link, &b->list);raw_spin_unlock (&b->lock);
arch/x86/kvm/vmx.c +133 -123
380 lines not on this page · raw message
arch/x86/mm/fault.c +24 -23
155 lines not on this page · raw message
block/bsg-lib.c +0 -1
@@ -154,7 +154,6 @@ static int bsg_prepare_job(struct device *dev, struct request *req) failjob_rls_rqst_payload:kfree (job->request_payload.sg_list); failjob_rls_job: -kfree (job);return -ENOMEM ; }
crypto/drbg.c +4 -4
@@ -1133,10 +1133,10 @@ static inline void drbg_dealloc_state(struct drbg_state *drbg) {if (!drbg)return ; -kzfree (drbg->V); - drbg->Vbuf =NULL ; -kzfree (drbg->C); - drbg->Cbuf =NULL ; +kzfree (drbg->Vbuf); + drbg->V =NULL ; +kzfree (drbg->Cbuf); + drbg->C =NULL ;kzfree (drbg->scratchpadbuf); drbg->scratchpadbuf =NULL ; drbg->reseed_ctr =0 ;
drivers/base/power/main.c +6 -3
@@ -1835,10 +1835,13 @@ void device_pm_check_callbacks(struct device *dev) {spin_lock_irq (&dev->power.lock); dev->power.no_pm_callbacks = - (!dev->bus ||pm_ops_is_empty (dev->bus->pm)) && - (!dev->class ||pm_ops_is_empty (dev->class->pm)) && + (!dev->bus || (pm_ops_is_empty (dev->bus->pm) && + !dev->bus->suspend && !dev->bus->resume)) && + (!dev->class || (pm_ops_is_empty (dev->class->pm) && + !dev->class->suspend && !dev->class->resume)) && (!dev->type ||pm_ops_is_empty (dev->type->pm)) && (!dev->pm_domain ||pm_ops_is_empty (&dev->pm_domain->ops)) && - (!dev->driver ||pm_ops_is_empty (dev->driver->pm)); + (!dev->driver || (pm_ops_is_empty (dev->driver->pm) && + !dev->driver->suspend && !dev->driver->resume));spin_unlock_irq (&dev->power.lock); }
drivers/base/power/opp/core.c +7 -0
@@ -1581,6 +1581,9 @@ static int _opp_set_availability(struct device *dev, unsigned long freq, opp->available = availability_req; +dev_pm_opp_get (opp); +mutex_unlock (&opp_table->lock); +/* Notify the change of the OPP availability */ if (availability_req) blocking_notifier_call_chain(&opp_table->head, OPP_EVENT_ENABLE,
@@ -1589,8 +1592,12 @@ static int _opp_set_availability(struct device *dev, unsigned long freq,blocking_notifier_call_chain (&opp_table->head,OPP_EVENT_DISABLE , opp); +dev_pm_opp_put (opp); + goto put_table; + unlock:mutex_unlock (&opp_table->lock); +put_table:dev_pm_opp_put_opp_table (opp_table);return r; }
drivers/block/brd.c +1 -1
@@ -339,7 +339,7 @@ static long __brd_direct_access(struct brd_device *brd, pgoff_t pgoff,if (!brd)return -ENODEV ; - page =brd_insert_page (brd,PFN_PHYS (pgoff) /512 ); + page =brd_insert_page (brd, (sector_t )pgoff <<PAGE_SECTORS_SHIFT );if (!page)return -ENOSPC ; *kaddr =page_address (page);
drivers/crypto/talitos.c +5 -4
@@ -1756,9 +1756,9 @@ static int common_nonsnoop_hash(struct talitos_edesc *edesc, req_ctx->swinit =0 ; }else { desc->ptr[1 ] = zero_entry; -/* Indicate next op is not the first. */ - req_ctx->first =0 ; } +/* Indicate next op is not the first. */ + req_ctx->first =0 ;/* HMAC key */ if (ctx->keylen)
@@ -1769,7 +1769,7 @@ static int common_nonsnoop_hash(struct talitos_edesc *edesc, sg_count = edesc->src_nents ?:1 ;if (is_sec1 && sg_count >1 ) -sg_copy_to_buffer (areq->src, sg_count, edesc->buf, length); +sg_copy_to_buffer (req_ctx->psrc, sg_count, edesc->buf, length);else sg_count =dma_map_sg (dev, req_ctx->psrc, sg_count,DMA_TO_DEVICE );
@@ -3057,7 +3057,8 @@ static struct talitos_crypto_alg *talitos_alg_alloc(struct device *dev, t_alg->algt.alg.hash.final = ahash_final; t_alg->algt.alg.hash.finup = ahash_finup; t_alg->algt.alg.hash.digest = ahash_digest; - t_alg->algt.alg.hash.setkey = ahash_setkey; +if (!strncmp (alg->cra_name,"hmac" ,4 )) + t_alg->algt.alg.hash.setkey = ahash_setkey; t_alg->algt.alg.hash.import = ahash_import; t_alg->algt.alg.hash.export = ahash_export;
drivers/dax/super.c +14 -7
@@ -189,8 +189,10 @@ static umode_t dax_visible(struct kobject *kobj, struct attribute *a, int n)if (!dax_dev)return 0 ; -if (a == &dev_attr_write_cache.attr && !dax_dev->ops->flush) +#ifndef CONFIG_ARCH_HAS_PMEM_API +if (a == &dev_attr_write_cache.attr)return 0 ; +#endif return a->mode; }
@@ -255,18 +257,23 @@ size_t dax_copy_from_iter(struct dax_device *dax_dev, pgoff_t pgoff, void *addr, }EXPORT_SYMBOL_GPL (dax_copy_from_iter); -void dax_flush (struct dax_device *dax_dev,pgoff_t pgoff,void *addr, -size_t size) +#ifdef CONFIG_ARCH_HAS_PMEM_API +void arch_wb_cache_pmem (void *addr,size_t size); +void dax_flush (struct dax_device *dax_dev,void *addr,size_t size) { -if (!dax_alive (dax_dev)) +if (unlikely (!dax_alive (dax_dev)))return ; -if (!test_bit (DAXDEV_WRITE_CACHE , &dax_dev->flags)) +if (unlikely (!test_bit (DAXDEV_WRITE_CACHE , &dax_dev->flags)))return ; -if (dax_dev->ops->flush) - dax_dev->ops->flush (dax_dev, pgoff, addr, size); +arch_wb_cache_pmem (addr, size); } +#else +void dax_flush (struct dax_device *dax_dev,void *addr,size_t size) +{ +} +#endif EXPORT_SYMBOL_GPL (dax_flush);void dax_write_cache (struct dax_device *dax_dev,bool wc)
drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c +188 -1
195 lines not on this page · raw message
drivers/gpu/drm/etnaviv/etnaviv_gem.c +3 -0
@@ -551,12 +551,15 @@ static const struct etnaviv_gem_ops etnaviv_gem_shmem_ops = {void etnaviv_gem_free_object (struct drm_gem_object *obj) {struct etnaviv_gem_object *etnaviv_obj =to_etnaviv_bo (obj); +struct etnaviv_drm_private *priv = obj->dev->dev_private;struct etnaviv_vram_mapping *mapping, *tmp;/* object should not be active */ WARN_ON (is_active (etnaviv_obj)); +mutex_lock (&priv->gem_lock);list_del (&etnaviv_obj->gem_node); +mutex_unlock (&priv->gem_lock);list_for_each_entry_safe (mapping, tmp, &etnaviv_obj->vram_list, obj_node) {
drivers/gpu/drm/etnaviv/etnaviv_gem_submit.c +4 -2
@@ -445,8 +445,10 @@ int etnaviv_ioctl_gem_submit(struct drm_device *dev, void *data, cmdbuf->user_size =ALIGN (args->stream_size,8 ); ret =etnaviv_gpu_submit (gpu, submit, cmdbuf); -if (ret ==0 ) - cmdbuf =NULL ; +if (ret) + goto out; + + cmdbuf =NULL ;if (args->flags &ETNA_SUBMIT_FENCE_FD_OUT ) {/*
drivers/gpu/drm/exynos/exynos_drm_drv.c +4 -0
@@ -176,6 +176,7 @@ static int exynos_drm_suspend(struct device *dev)if (pm_runtime_suspended (dev) || !drm_dev)return 0 ; +drm_modeset_lock_all (drm_dev);drm_connector_list_iter_begin (drm_dev, &conn_iter);drm_for_each_connector_iter (connector, &conn_iter) {int old_dpms = connector->dpms;
@@ -187,6 +188,7 @@ static int exynos_drm_suspend(struct device *dev) connector->dpms = old_dpms; }drm_connector_list_iter_end (&conn_iter); +drm_modeset_unlock_all (drm_dev);return 0 ; }
@@ -200,6 +202,7 @@ static int exynos_drm_resume(struct device *dev)if (pm_runtime_suspended (dev) || !drm_dev)return 0 ; +drm_modeset_lock_all (drm_dev);drm_connector_list_iter_begin (drm_dev, &conn_iter);drm_for_each_connector_iter (connector, &conn_iter) {if (connector->funcs->dpms) {
@@ -210,6 +213,7 @@ static int exynos_drm_resume(struct device *dev) } }drm_connector_list_iter_end (&conn_iter); +drm_modeset_unlock_all (drm_dev);return 0 ; }
drivers/gpu/drm/i915/gvt/cfg_space.c +48 -65
156 lines not on this page · raw message
drivers/gpu/drm/i915/intel_dsi.c +0 -11
@@ -892,8 +892,6 @@ static void intel_dsi_disable(struct intel_encoder *encoder,struct intel_crtc_state *old_crtc_state, struct drm_connector_state *old_conn_state) { - struct drm_device *dev = encoder->base.dev; -struct drm_i915_private *dev_priv = dev->dev_private; struct intel_dsi *intel_dsi = enc_to_intel_dsi(&encoder->base);enum port port;
@@ -902,15 +900,6 @@ static void intel_dsi_disable(struct intel_encoder *encoder,intel_dsi_vbt_exec_sequence (intel_dsi,MIPI_SEQ_BACKLIGHT_OFF );intel_panel_disable_backlight (old_conn_state); -/* -* Disable Device ready before the port shutdown in order -* to avoid split screen -*/ -if (IS_BROXTON (dev_priv)) { -for_each_dsi_port (port, intel_dsi->ports) -I915_WRITE (MIPI_DEVICE_READY (port),0 ); - } -/* * According to the spec we should send SHUTDOWN before * MIPI_SEQ_DISPLAY_OFF only for v3+ VBTs, but field testing
drivers/gpu/drm/radeon/radeon_device.c +1 -1
@@ -1663,7 +1663,7 @@ int radeon_suspend_kms(struct drm_device *dev, bool suspend,radeon_agp_suspend (rdev);pci_save_state (dev->pdev); -if (freeze && rdev->family >=CHIP_CEDAR ) { +if (freeze && rdev->family >=CHIP_CEDAR && !(rdev->flags &RADEON_IS_IGP )) { rdev->asic->asic_reset (rdev, true);pci_restore_state (dev->pdev); }else if (suspend) {
drivers/infiniband/hw/cxgb4/cm.c +7 -2
@@ -2333,9 +2333,14 @@ static int close_listsrv_rpl(struct c4iw_dev *dev, struct sk_buff *skb)unsigned int stid =GET_TID (rpl);struct c4iw_listen_ep *ep =get_ep_from_stid (dev, stid); +if (!ep) { +pr_debug ("%s stid %d lookup failure!\n" , __func__, stid); + goto out; + }pr_debug ("%s ep %p\n" , __func__, ep);c4iw_wake_up (&ep->com.wr_wait,status2errno (rpl->status));c4iw_put_ep (&ep->com); +out:return 0 ; }
@@ -2594,9 +2599,9 @@ static int pass_accept_req(struct c4iw_dev *dev, struct sk_buff *skb)c4iw_put_ep (&child_ep->com); reject:reject_cr (dev, hwtid, skb); +out:if (parent_ep)c4iw_put_ep (&parent_ep->com); -out:return 0 ; }
@@ -3458,7 +3463,7 @@ int c4iw_create_listen(struct iw_cm_id *cm_id, int backlog) cm_id->provider_data = ep; goto out; } - +remove_handle (ep->com.dev, &ep->com.dev->stid_idr, ep->stid);cxgb4_free_stid (ep->com.dev->rdev.lldi.tids, ep->stid, ep->com.local_addr.ss_family); fail2:
drivers/infiniband/ulp/ipoib/ipoib_ib.c +0 -13
@@ -1000,19 +1000,6 @@ static inline int update_parent_pkey(struct ipoib_dev_priv *priv)*/ priv->dev->broadcast[8 ] = priv->pkey >>8 ; priv->dev->broadcast[9 ] = priv->pkey &0xff ; - -/* -* Update the broadcast address in the priv->broadcast object, -* in case it already exists, otherwise no one will do that. -*/ -if (priv->broadcast) { -spin_lock_irq (&priv->lock); -memcpy (priv->broadcast->mcmember.mgid.raw, - priv->dev->broadcast +4 , -sizeof (union ib_gid )); -spin_unlock_irq (&priv->lock); - } -return 0 ; }
drivers/md/dm-integrity.c +5 -1
@@ -1697,7 +1697,11 @@ static void dm_integrity_map_continue(struct dm_integrity_io *dio, bool from_mapif (need_sync_io) {wait_for_completion_io (&read_comp); -integrity_metadata (&dio->work); +if (likely (!bio->bi_status)) +integrity_metadata (&dio->work); +else +dec_in_flight (dio); + }else {INIT_WORK (&dio->work, integrity_metadata);queue_work (ic->metadata_wq, &dio->work);
drivers/md/dm-linear.c +0 -15
@@ -184,20 +184,6 @@ static size_t linear_dax_copy_from_iter(struct dm_target *ti, pgoff_t pgoff,return dax_copy_from_iter (dax_dev, pgoff, addr, bytes, i); } -static void linear_dax_flush (struct dm_target *ti,pgoff_t pgoff,void *addr, -size_t size) -{ -struct linear_c *lc = ti->private; -struct block_device *bdev = lc->dev->bdev; -struct dax_device *dax_dev = lc->dev->dax_dev; -sector_t dev_sector, sector = pgoff *PAGE_SECTORS ; - - dev_sector =linear_map_sector (ti, sector); -if (bdev_dax_pgoff (bdev, dev_sector,ALIGN (size,PAGE_SIZE ), &pgoff)) -return ; -dax_flush (dax_dev, pgoff, addr, size); -} -static struct target_type linear_target = { .name ="linear" , .version = {1 ,4 ,0 },
@@ -212,7 +198,6 @@ static struct target_type linear_target = { .iterate_devices = linear_iterate_devices, .direct_access = linear_dax_direct_access, .dax_copy_from_iter = linear_dax_copy_from_iter, - .dax_flush = linear_dax_flush, };int __init dm_linear_init (void )
drivers/md/dm-stripe.c +0 -20
@@ -351,25 +351,6 @@ static size_t stripe_dax_copy_from_iter(struct dm_target *ti, pgoff_t pgoff,return dax_copy_from_iter (dax_dev, pgoff, addr, bytes, i); } -static void stripe_dax_flush (struct dm_target *ti,pgoff_t pgoff,void *addr, -size_t size) -{ -sector_t dev_sector, sector = pgoff *PAGE_SECTORS ; -struct stripe_c *sc = ti->private; -struct dax_device *dax_dev; -struct block_device *bdev; -uint32_t stripe; - -stripe_map_sector (sc, sector, &stripe, &dev_sector); - dev_sector += sc->stripe[stripe].physical_start; - dax_dev = sc->stripe[stripe].dev->dax_dev; - bdev = sc->stripe[stripe].dev->bdev; - -if (bdev_dax_pgoff (bdev, dev_sector,ALIGN (size,PAGE_SIZE ), &pgoff)) -return ; -dax_flush (dax_dev, pgoff, addr, size); -} -/* * Stripe status: *
@@ -491,7 +472,6 @@ static struct target_type stripe_target = { .io_hints = stripe_io_hints, .direct_access = stripe_dax_direct_access, .dax_copy_from_iter = stripe_dax_copy_from_iter, - .dax_flush = stripe_dax_flush, };int __init dm_stripe_init (void )
drivers/md/dm.c +0 -19
@@ -987,24 +987,6 @@ static size_t dm_dax_copy_from_iter(struct dax_device *dax_dev, pgoff_t pgoff,return ret; } -static void dm_dax_flush (struct dax_device *dax_dev,pgoff_t pgoff,void *addr, -size_t size) -{ -struct mapped_device *md =dax_get_private (dax_dev); -sector_t sector = pgoff *PAGE_SECTORS ; -struct dm_target *ti; -int srcu_idx; - - ti =dm_dax_get_live_target (md, sector, &srcu_idx); - -if (!ti) - goto out; -if (ti->type->dax_flush) - ti->type->dax_flush (ti, pgoff, addr, size); - out: -dm_put_live_table (md, srcu_idx); -} -/* * A target may call dm_accept_partial_bio only from the map routine. It is * allowed for all bio types except REQ_PREFLUSH.
@@ -2992,7 +2974,6 @@ static const struct block_device_operations dm_blk_dops = {static const struct dax_operations dm_dax_ops = { .direct_access = dm_dax_direct_access, .copy_from_iter = dm_dax_copy_from_iter, - .flush = dm_dax_flush, };/*
drivers/md/md.c +43 -29
108 lines not on this page · raw message
drivers/md/md.h +1 -0
@@ -686,6 +686,7 @@ extern void md_stop_writes(struct mddev *mddev);extern int md_rdev_init (struct md_rdev *rdev);extern void md_rdev_clear (struct md_rdev *rdev); +extern void md_handle_request (struct mddev *mddev,struct bio *bio);extern void mddev_suspend (struct mddev *mddev);extern void mddev_resume (struct mddev *mddev); extern struct bio *bio_alloc_mddev(gfp_t gfp_mask, int nr_iovecs,
drivers/md/raid5.c +10 -3
@@ -812,6 +812,14 @@ static void stripe_add_to_batch_list(struct r5conf *conf, struct stripe_head *shspin_unlock (&head->batch_head->batch_lock); goto unlock_out; } +/* +* We must assign batch_head of this stripe within the +* batch_lock, otherwise clear_batch_ready of batch head +* stripe could clear BATCH_READY bit of this stripe and +* this stripe->batch_head doesn't get assigned, which +* could confuse clear_batch_ready for this stripe +*/ + sh->batch_head = head->batch_head;/* * at this point, head's BATCH_READY could be cleared, but we
@@ -819,8 +827,6 @@ static void stripe_add_to_batch_list(struct r5conf *conf, struct stripe_head *sh*/ list_add (&sh->batch_list, &head->batch_list);spin_unlock (&head->batch_head->batch_lock); - - sh->batch_head = head->batch_head; }else { head->batch_head = head; sh->batch_head = head->batch_head;
@@ -4608,7 +4614,8 @@ static void break_stripe_batch_list(struct stripe_head *head_sh,set_mask_bits (&sh->state, ~(STRIPE_EXPAND_SYNC_FLAGS | (1 <<STRIPE_PREREAD_ACTIVE ) | - (1 <<STRIPE_DEGRADED )), + (1 <<STRIPE_DEGRADED ) | + (1 <<STRIPE_ON_UNPLUG_LIST )), head_sh->state & (1 <<STRIPE_INSYNC )); sh->check_state = head_sh->check_state;
drivers/mmc/core/queue.c +6 -1
@@ -242,6 +242,12 @@ int mmc_init_queue(struct mmc_queue *mq, struct mmc_card *card,if (mmc_dev (host)->dma_mask && *mmc_dev (host)->dma_mask) limit = (u64 )dma_max_pfn (mmc_dev (host)) <<PAGE_SHIFT ; +/* +* mmc_init_request() depends on card->bouncesz so it must be calculated +* before blk_init_allocated_queue() starts allocating requests. +*/ + card->bouncesz =mmc_queue_calc_bouncesz (host); + mq->card = card; mq->queue =blk_alloc_queue (GFP_KERNEL );if (!mq->queue)
@@ -265,7 +271,6 @@ int mmc_init_queue(struct mmc_queue *mq, struct mmc_card *card,if (mmc_can_erase (card))mmc_queue_setup_discard (mq->queue, card); - card->bouncesz =mmc_queue_calc_bouncesz (host);if (card->bouncesz) {blk_queue_max_hw_sectors (mq->queue, card->bouncesz /512 );blk_queue_max_segments (mq->queue, card->bouncesz /512 );
drivers/mmc/host/sdhci-pci-core.c +15 -0
@@ -393,6 +393,7 @@ static const struct sdhci_pci_fixes sdhci_intel_pch_sdio = {enum {INTEL_DSM_FNS =0 , +INTEL_DSM_V18_SWITCH =3 ,INTEL_DSM_DRV_STRENGTH =9 ,INTEL_DSM_D3_RETUNE =10 , };
@@ -558,6 +559,19 @@ static void intel_hs400_enhanced_strobe(struct mmc_host *mmc,sdhci_writel (host, val,INTEL_HS400_ES_REG ); } +static void sdhci_intel_voltage_switch (struct sdhci_host *host) +{ +struct sdhci_pci_slot *slot =sdhci_priv (host); +struct intel_host *intel_host =sdhci_pci_priv (slot); +struct device *dev = &slot->chip->pdev->dev; +u32 result =0 ; +int err; + + err =intel_dsm (intel_host, dev,INTEL_DSM_V18_SWITCH , &result); +pr_debug ("%s: %s DSM error %d result %u\n" , +mmc_hostname (host->mmc), __func__, err, result); +} +static const struct sdhci_ops sdhci_intel_byt_ops = { .set_clock = sdhci_set_clock, .set_power = sdhci_intel_set_power,
@@ -566,6 +580,7 @@ static const struct sdhci_ops sdhci_intel_byt_ops = { .reset = sdhci_reset, .set_uhs_signaling = sdhci_set_uhs_signaling, .hw_reset = sdhci_pci_hw_reset, + .voltage_switch = sdhci_intel_voltage_switch, };static void byt_read_dsm (struct sdhci_pci_slot *slot)
drivers/mtd/mtdpart.c +8 -0
@@ -581,6 +581,14 @@ static struct mtd_part *allocate_partition(struct mtd_info *parent, slave->mtd.erasesize = parent->erasesize; } +/* +* Slave erasesize might differ from the master one if the master +* exposes several regions with different erasesize. Adjust +* wr_alignment accordingly. +*/ +if (!(slave->mtd.flags &MTD_NO_ERASE )) + wr_alignment = slave->mtd.erasesize; + tmp = slave->offset; remainder =do_div (tmp, wr_alignment);if ((slave->mtd.flags &MTD_WRITEABLE ) && remainder) {
drivers/mtd/nand/atmel/pmecc.c +1 -1
@@ -363,7 +363,7 @@ atmel_pmecc_create_user(struct atmel_pmecc *pmecc, size += (req->ecc.strength +1 ) *sizeof (u16);/* Reserve space for mu, dmu and delta. */ size =ALIGN (size,sizeof (s32)); - size += (req->ecc.strength +1 ) *sizeof (s32); + size += (req->ecc.strength +1 ) *sizeof (s32) *3 ; user =kzalloc (size,GFP_KERNEL );if (!user)
drivers/net/wireless/mac80211_hwsim.c +0 -2
@@ -1362,8 +1362,6 @@ static void mac80211_hwsim_tx(struct ieee80211_hw *hw, txi->control.rates, ARRAY_SIZE(txi->control.rates)); - txi->rate_driver_data[0 ] = channel; -if (skb->len >=24 +8 &&ieee80211_is_probe_resp (hdr->frame_control)) {/* fake header transmission time */
drivers/nvdimm/namespace_devs.c +9 -0
@@ -1417,6 +1417,15 @@ static int btt_claim_class(struct device *dev)struct nvdimm_drvdata *ndd =to_ndd (nd_mapping);struct nd_namespace_index *nsindex; +/* +* If any of the DIMMs do not support labels the only +* possible BTT format is v1. +*/ +if (!ndd) { + loop_bitmask =0 ; +break ; + } + nsindex =to_namespace_index (ndd, ndd->ns_current);if (nsindex ==NULL ) loop_bitmask |=1 ;
drivers/nvdimm/pmem.c +0 -7
@@ -243,16 +243,9 @@ static size_t pmem_copy_from_iter(struct dax_device *dax_dev, pgoff_t pgoff,return copy_from_iter_flushcache (addr, bytes, i); } -static void pmem_dax_flush (struct dax_device *dax_dev,pgoff_t pgoff, -void *addr,size_t size) -{ -arch_wb_cache_pmem (addr, size); -} -static const struct dax_operations pmem_dax_ops = { .direct_access = pmem_dax_direct_access, .copy_from_iter = pmem_copy_from_iter, - .flush = pmem_dax_flush, };static const struct attribute_group *pmem_attribute_groups[] = {
drivers/nvme/host/pci.c +42 -24
123 lines not on this page · raw message
drivers/pci/pci-sysfs.c +9 -2
@@ -686,7 +686,7 @@ static ssize_t driver_override_store(struct device *dev, const char *buf, size_t count) {struct pci_dev *pdev =to_pci_dev (dev); -char *driver_override, *old = pdev->driver_override, *cp; +char *driver_override, *old, *cp;/* We need to keep extra room for a newline */ if (count >= (PAGE_SIZE -1 ))
@@ -700,12 +700,15 @@ static ssize_t driver_override_store(struct device *dev,if (cp) *cp ='\0' ; +device_lock (dev); + old = pdev->driver_override;if (strlen (driver_override)) { pdev->driver_override = driver_override; }else {kfree (driver_override); pdev->driver_override =NULL ; } +device_unlock (dev);kfree (old);
@@ -716,8 +719,12 @@ static ssize_t driver_override_show(struct device *dev, struct device_attribute *attr, char *buf) { struct pci_dev *pdev = to_pci_dev(dev); +ssize_t len; -return snprintf (buf,PAGE_SIZE ,"%s\n" , pdev->driver_override); +device_lock (dev); + len =snprintf (buf,PAGE_SIZE ,"%s\n" , pdev->driver_override); +device_unlock (dev); +return len; }static DEVICE_ATTR_RW (driver_override);
drivers/platform/x86/fujitsu-laptop.c +6 -4
@@ -254,10 +254,12 @@ static int bl_update_status(struct backlight_device *b) {struct acpi_device *device =bl_get_data (b); -if (b->props.power ==FB_BLANK_POWERDOWN ) -call_fext_func (fext,FUNC_BACKLIGHT ,0x1 ,0x4 ,0x3 ); -else -call_fext_func (fext,FUNC_BACKLIGHT ,0x1 ,0x4 ,0x0 ); +if (fext) { +if (b->props.power ==FB_BLANK_POWERDOWN ) +call_fext_func (fext,FUNC_BACKLIGHT ,0x1 ,0x4 ,0x3 ); +else +call_fext_func (fext,FUNC_BACKLIGHT ,0x1 ,0x4 ,0x0 ); + }return set_lcd_level (device, b->props.brightness); }
drivers/scsi/aacraid/aachba.c +6 -6
@@ -699,13 +699,13 @@ static void _aac_probe_container1(void * context, struct fib * fibptr)int status; dresp = (struct aac_mount *)fib_data (fibptr); -if (!(fibptr->dev->supplement_adapter_info.supported_options2 & -AAC_OPTION_VARIABLE_BLOCK_SIZE )) +if (!aac_supports_2T (fibptr->dev)) { dresp->mnt[0 ].capacityhigh =0 ; -if ((le32_to_cpu (dresp->status) !=ST_OK ) || - (le32_to_cpu (dresp->mnt[0 ].vol) !=CT_NONE )) { -_aac_probe_container2 (context, fibptr); -return ; +if ((le32_to_cpu (dresp->status) ==ST_OK ) && + (le32_to_cpu (dresp->mnt[0 ].vol) !=CT_NONE )) { +_aac_probe_container2 (context, fibptr); +return ; + } } scsicmd = (struct scsi_cmnd *) context;
drivers/scsi/aacraid/aacraid.h +5 -0
@@ -2700,6 +2700,11 @@ static inline int aac_is_src(struct aac_dev *dev)return 0 ; } +static inline int aac_supports_2T (struct aac_dev *dev) +{ +return (dev->adapter_info.options &AAC_OPT_NEW_COMM_64 ); +} +char *get_container_type (unsigned type);extern int numacb;extern char aac_driver_version[];
drivers/scsi/aacraid/src.c +2 -0
@@ -740,6 +740,8 @@ static void aac_send_iop_reset(struct aac_dev *dev)aac_set_intx_mode (dev);src_writel (dev, MUnit.IDR,IOP_SRC_RESET_MASK ); + +msleep (5000 ); }static void aac_send_hardware_soft_reset (struct aac_dev *dev)
drivers/scsi/scsi_transport_fc.c +1 -1
@@ -3550,7 +3550,7 @@ fc_vport_sched_delete(struct work_struct *work)static enum blk_eh_timer_return fc_bsg_job_timeout (struct request *req) { -struct bsg_job *job = (void *) req->special; +struct bsg_job *job =blk_mq_rq_to_pdu (req);struct Scsi_Host *shost =fc_bsg_to_shost (job);struct fc_rport *rport =fc_bsg_to_rport (job);struct fc_internal *i =to_fc_internal (shost->transportt);
drivers/scsi/scsi_transport_iscsi.c +1 -1
@@ -3689,7 +3689,7 @@ iscsi_if_rx(struct sk_buff *skb)uint32_t group; nlh =nlmsg_hdr (skb); -if (nlh->nlmsg_len <sizeof (*nlh) || +if (nlh->nlmsg_len <sizeof (*nlh) +sizeof (*ev) || skb->len < nlh->nlmsg_len) {break ; }
drivers/video/fbdev/aty/atyfb_base.c +1 -1
@@ -1855,7 +1855,7 @@ static int atyfb_ioctl(struct fb_info *info, u_int cmd, u_long arg)#if defined(DEBUG ) && defined(CONFIG_FB_ATY_CT )case ATYIO_CLKR :if (M64_HAS (INTEGRATED )) { -struct atyclk clk; +struct atyclk clk = {0 };union aty_pll *pll = &par->pll;u32 dsp_config = pll->ct.dsp_config;u32 dsp_on_off = pll->ct.dsp_on_off;
fs/btrfs/inode.c +20 -0
@@ -135,6 +135,18 @@ static inline void btrfs_cleanup_ordered_extents(struct inode *inode,const u64 offset, const u64 bytes) { + unsigned long index = offset >> PAGE_SHIFT; +unsigned long end_index = (offset + bytes -1 ) >>PAGE_SHIFT ; +struct page *page; + +while (index <= end_index) { + page =find_get_page (inode->i_mapping, index); + index++; +if (!page) +continue ; +ClearPagePrivate2 (page); +put_page (page); + }return __endio_write_update_ordered (inode, offset +PAGE_SIZE , bytes -PAGE_SIZE , false); }
@@ -8297,6 +8309,7 @@ static void __endio_write_update_ordered(struct inode *inode,btrfs_work_func_t func;u64 ordered_offset = offset;u64 ordered_bytes = bytes; +u64 last_offset;int ret;if (btrfs_is_free_space_inode (BTRFS_I (inode))) {
@@ -8308,6 +8321,7 @@ static void __endio_write_update_ordered(struct inode *inode, } again: + last_offset = ordered_offset; ret = btrfs_dec_test_first_ordered_pending(inode, &ordered, &ordered_offset, ordered_bytes,
@@ -8318,6 +8332,12 @@ static void __endio_write_update_ordered(struct inode *inode,btrfs_init_work (&ordered->work, func, finish_ordered_fn,NULL ,NULL );btrfs_queue_work (wq, &ordered->work); out_test: +/* +* If btrfs_dec_test_ordered_pending does not find any ordered extent +* in the range, we can exit. +*/ +if (ordered_offset == last_offset) +return ;/* * our bio might span multiple ordered extents. If we haven't * completed the accounting for the whole dio, go back and try again
fs/btrfs/ioctl.c +5 -1
@@ -3063,7 +3063,7 @@ static int btrfs_cmp_data_prepare(struct inode *src, u64 loff, out:if (ret)btrfs_cmp_data_free (cmp); -return 0 ; +return ret; }static int btrfs_cmp_data (u64 len,struct cmp_pages *cmp)
@@ -4072,6 +4072,10 @@ static long btrfs_ioctl_default_subvol(struct file *file, void __user *argp) ret =PTR_ERR (new_root); goto out; } +if (!is_fstree (new_root->objectid)) { + ret = -ENOENT ; + goto out; + } path =btrfs_alloc_path ();if (!path) {
fs/btrfs/relocation.c +1 -1
@@ -2393,11 +2393,11 @@ void free_reloc_roots(struct list_head *list)while (!list_empty (list)) { reloc_root = list_entry(list->next, struct btrfs_root, root_list); +__del_reloc_root (reloc_root);free_extent_buffer (reloc_root->node);free_extent_buffer (reloc_root->commit_root); reloc_root->node =NULL ; reloc_root->commit_root =NULL ; -__del_reloc_root (reloc_root); } }
fs/cifs/cifsfs.c +1 -1
@@ -1447,7 +1447,7 @@ exit_cifs(void)exit_cifs_idmap ();#endif #ifdef CONFIG_CIFS_UPCALL -unregister_key_type (&cifs_spnego_key_type); +exit_cifs_spnego ();#endif cifs_destroy_request_bufs ();cifs_destroy_mids ();
fs/cifs/cifsglob.h +6 -0
@@ -188,6 +188,8 @@ enum smb_version {#ifdef CONFIG_CIFS_SMB311 Smb_311, #endif /* SMB311 */ + Smb_3any, + Smb_default, Smb_version_err };
@@ -1701,6 +1703,10 @@ extern struct smb_version_values smb20_values;#define SMB21_VERSION_STRING "2.1"extern struct smb_version_operations smb21_operations;extern struct smb_version_values smb21_values; +#define SMBDEFAULT_VERSION_STRING "default" +extern struct smb_version_values smbdefault_values; +#define SMB3ANY_VERSION_STRING "3" +extern struct smb_version_values smb3any_values;#define SMB30_VERSION_STRING "3.0"extern struct smb_version_operations smb30_operations;extern struct smb_version_values smb30_values;
fs/cifs/connect.c +25 -7
@@ -301,6 +301,8 @@ static const match_table_t cifs_smb_version_tokens = { { Smb_311, SMB311_VERSION_STRING }, { Smb_311, ALT_SMB311_VERSION_STRING }, #endif /* SMB311 */ + { Smb_3any, SMB3ANY_VERSION_STRING }, + { Smb_default, SMBDEFAULT_VERSION_STRING }, { Smb_version_err, NULL } };
@@ -1147,6 +1149,14 @@ cifs_parse_smb_version(char *value, struct smb_vol *vol) vol->vals = &smb311_values;break ;#endif /* SMB311 */ +case Smb_3any: + vol->ops = &smb30_operations;/* currently identical with 3.0 */ + vol->vals = &smb3any_values; +break ; +case Smb_default: + vol->ops = &smb30_operations;/* currently identical with 3.0 */ + vol->vals = &smbdefault_values; +break ;default :cifs_dbg (VFS ,"Unknown vers= option specified: %s\n" , value);return 1 ;
@@ -1273,9 +1283,9 @@ cifs_parse_mount_options(const char *mountdata, const char *devname, vol->actimeo =CIFS_DEF_ACTIMEO ; -/* FIXME: add autonegotiation for SMB3 or later rather than just SMB3 */ - vol->ops = &smb30_operations;/* both secure and accepted widely */ - vol->vals = &smb30_values; +/* offer SMB2.1 and later (SMB3 etc). Secure and widely accepted */ + vol->ops = &smb30_operations; + vol->vals = &smbdefault_values; vol->echo_interval =SMB_ECHO_INTERVAL_DEFAULT ;
@@ -1987,11 +1997,10 @@ cifs_parse_mount_options(const char *mountdata, const char *devname,if (got_version == false)pr_warn ("No dialect specified on mount. Default has changed to " -"a more secure dialect, SMB3 (vers=3.0), from CIFS " +"a more secure dialect, SMB2.1 or later (e.g. SMB3), from CIFS " "(SMB1). To use the less secure SMB1 dialect to access " -"old servers which do not support SMB3 specify vers=1.0" -" on mount. For somewhat newer servers such as Windows " -"7 try vers=2.1.\n" ); +"old servers which do not support SMB3 (or SMB2.1) specify vers=1.0" +" on mount.\n" );kfree (mountdata_copy);return 0 ;
@@ -2132,6 +2141,7 @@ static int match_server(struct TCP_Server_Info *server, struct smb_vol *vol)if (vol->nosharesock)return 0 ; +/* BB update this for smb3any and default case */ if ((server->vals != vol->vals) || (server->ops != vol->ops))return 0 ;
@@ -4143,6 +4153,14 @@ cifs_setup_session(const unsigned int xid, struct cifs_ses *ses,cifs_dbg (FYI ,"Security Mode: 0x%x Capabilities: 0x%x TimeAdjust: %d\n" , server->sec_mode, server->capabilities, server->timeAdj); +if (ses->auth_key.response) { +cifs_dbg (VFS ,"Free previous auth_key.response = %p\n" , + ses->auth_key.response); +kfree (ses->auth_key.response); + ses->auth_key.response =NULL ; + ses->auth_key.len =0 ; + } +if (server->ops->sess_setup) rc = server->ops->sess_setup (xid, ses, nls_info);
fs/cifs/file.c +7 -0
@@ -224,6 +224,13 @@ cifs_nt_open(char *full_path, struct inode *inode, struct cifs_sb_info *cifs_sb,if (backup_cred (cifs_sb)) create_options |=CREATE_OPEN_BACKUP_INTENT ; +/* O_SYNC also has bit for O_DSYNC so following check picks up either */ +if (f_flags &O_SYNC ) + create_options |=CREATE_WRITE_THROUGH ; + +if (f_flags &O_DIRECT ) + create_options |=CREATE_NO_BUFFER ; + oparms.tcon = tcon; oparms.cifs_sb = cifs_sb; oparms.desired_access = desired_access;
fs/cifs/inode.c +15 -0
@@ -234,6 +234,8 @@ cifs_unix_basic_to_fattr(struct cifs_fattr *fattr, FILE_UNIX_BASIC_INFO *info, fattr->cf_atime =cifs_NTtimeToUnix (info->LastAccessTime); fattr->cf_mtime =cifs_NTtimeToUnix (info->LastModificationTime); fattr->cf_ctime =cifs_NTtimeToUnix (info->LastStatusChange); +/* old POSIX extensions don't get create time */ + fattr->cf_mode =le64_to_cpu (info->Permissions);/*
@@ -2024,6 +2026,19 @@ int cifs_getattr(const struct path *path, struct kstat *stat, stat->blksize =CIFS_MAX_MSGSIZE ; stat->ino =CIFS_I (inode)->uniqueid; +/* old CIFS Unix Extensions doesn't return create time */ +if (CIFS_I (inode)->createtime) { + stat->result_mask |=STATX_BTIME ; + stat->btime = +cifs_NTtimeToUnix (cpu_to_le64 (CIFS_I (inode)->createtime)); + } + + stat->attributes_mask |= (STATX_ATTR_COMPRESSED |STATX_ATTR_ENCRYPTED ); +if (CIFS_I (inode)->cifsAttrs &FILE_ATTRIBUTE_COMPRESSED ) + stat->attributes |=STATX_ATTR_COMPRESSED ; +if (CIFS_I (inode)->cifsAttrs &FILE_ATTRIBUTE_ENCRYPTED ) + stat->attributes |=STATX_ATTR_ENCRYPTED ; +/* * If on a multiuser mount without unix extensions or cifsacl being * enabled, and the admin hasn't overridden them, set the ownership
fs/cifs/smb2ops.c +40 -0
@@ -2906,6 +2906,46 @@ struct smb_version_values smb21_values = { .create_lease_size = sizeof(struct create_lease), }; +struct smb_version_values smb3any_values = { + .version_string =SMB3ANY_VERSION_STRING , + .protocol_id =SMB302_PROT_ID ,/* doesn't matter, send protocol array */ + .req_capabilities =SMB2_GLOBAL_CAP_DFS |SMB2_GLOBAL_CAP_LEASING |SMB2_GLOBAL_CAP_LARGE_MTU |SMB2_GLOBAL_CAP_PERSISTENT_HANDLES |SMB2_GLOBAL_CAP_ENCRYPTION , + .large_lock_type =0 , + .exclusive_lock_type =SMB2_LOCKFLAG_EXCLUSIVE_LOCK , + .shared_lock_type =SMB2_LOCKFLAG_SHARED_LOCK , + .unlock_lock_type =SMB2_LOCKFLAG_UNLOCK , + .header_size =sizeof (struct smb2_hdr ), + .max_header_size =MAX_SMB2_HDR_SIZE , + .read_rsp_size =sizeof (struct smb2_read_rsp ) -1 , + .lock_cmd =SMB2_LOCK , + .cap_unix =0 , + .cap_nt_find =SMB2_NT_FIND , + .cap_large_files =SMB2_LARGE_FILES , + .signing_enabled =SMB2_NEGOTIATE_SIGNING_ENABLED |SMB2_NEGOTIATE_SIGNING_REQUIRED , + .signing_required =SMB2_NEGOTIATE_SIGNING_REQUIRED , + .create_lease_size =sizeof (struct create_lease_v2 ), +}; + +struct smb_version_values smbdefault_values = { + .version_string =SMBDEFAULT_VERSION_STRING , + .protocol_id =SMB302_PROT_ID ,/* doesn't matter, send protocol array */ + .req_capabilities =SMB2_GLOBAL_CAP_DFS |SMB2_GLOBAL_CAP_LEASING |SMB2_GLOBAL_CAP_LARGE_MTU |SMB2_GLOBAL_CAP_PERSISTENT_HANDLES |SMB2_GLOBAL_CAP_ENCRYPTION , + .large_lock_type =0 , + .exclusive_lock_type =SMB2_LOCKFLAG_EXCLUSIVE_LOCK , + .shared_lock_type =SMB2_LOCKFLAG_SHARED_LOCK , + .unlock_lock_type =SMB2_LOCKFLAG_UNLOCK , + .header_size =sizeof (struct smb2_hdr ), + .max_header_size =MAX_SMB2_HDR_SIZE , + .read_rsp_size =sizeof (struct smb2_read_rsp ) -1 , + .lock_cmd =SMB2_LOCK , + .cap_unix =0 , + .cap_nt_find =SMB2_NT_FIND , + .cap_large_files =SMB2_LARGE_FILES , + .signing_enabled =SMB2_NEGOTIATE_SIGNING_ENABLED |SMB2_NEGOTIATE_SIGNING_REQUIRED , + .signing_required =SMB2_NEGOTIATE_SIGNING_REQUIRED , + .create_lease_size =sizeof (struct create_lease_v2 ), +}; +struct smb_version_values smb30_values = { .version_string =SMB30_VERSION_STRING , .protocol_id =SMB30_PROT_ID ,
fs/cifs/smb2pdu.c +93 -18
181 lines not on this page · raw message
fs/cifs/smb2pdu.h +1 -1
@@ -716,7 +716,7 @@ struct validate_negotiate_info_req {__u8 Guid[SMB2_CLIENT_GUID_SIZE ];__le16 SecurityMode;__le16 DialectCount; -__le16 Dialects[1 ];/* dialect (someday maybe list) client asked for */ +__le16 Dialects[3 ];/* BB expand this if autonegotiate > 3 dialects */ } __packed;struct validate_negotiate_info_rsp {
fs/dax.c +2 -2
@@ -786,7 +786,7 @@ static int dax_writeback_one(struct block_device *bdev, }dax_mapping_entry_mkclean (mapping, index,pfn_t_to_pfn (pfn)); -dax_flush (dax_dev, pgoff, kaddr, size); +dax_flush (dax_dev, kaddr, size);/* * After we have flushed the cache, we can clear the dirty tag. There * cannot be new dirty data in the pfn after the flush has completed as
@@ -981,7 +981,7 @@ int __dax_zero_page_range(struct block_device *bdev,return rc; }memset (kaddr + offset,0 , size); -dax_flush (dax_dev, pgoff, kaddr + offset, size); +dax_flush (dax_dev, kaddr + offset, size);dax_read_unlock (id); }return 0 ;
fs/gfs2/glock.c +5 -9
@@ -1863,13 +1863,9 @@ static void *gfs2_glock_seq_start(struct seq_file *seq, loff_t *pos) {struct gfs2_glock_iter *gi = seq->private;loff_t n = *pos; -int ret; - -if (gi->last_pos <= *pos) - n = (*pos - gi->last_pos); - ret =rhashtable_walk_start (&gi->hti); -if (ret) +rhashtable_walk_enter (&gl_hash_table, &gi->hti); +if (rhashtable_walk_start (&gi->hti) !=0 )return NULL ; do {
@@ -1877,6 +1873,7 @@ static void *gfs2_glock_seq_start(struct seq_file *seq, loff_t *pos) }while (gi->gl && n--); gi->last_pos = *pos; +return gi->gl; }
@@ -1888,6 +1885,7 @@ static void *gfs2_glock_seq_next(struct seq_file *seq, void *iter_ptr, (*pos)++; gi->last_pos = *pos;gfs2_glock_iter_next (gi); +return gi->gl; }
@@ -1897,6 +1895,7 @@ static void gfs2_glock_seq_stop(struct seq_file *seq, void *iter_ptr) gi->gl =NULL ;rhashtable_walk_stop (&gi->hti); +rhashtable_walk_exit (&gi->hti); }static int gfs2_glock_seq_show (struct seq_file *seq,void *iter_ptr)
@@ -1959,12 +1958,10 @@ static int __gfs2_glocks_open(struct inode *inode, struct file *file,struct gfs2_glock_iter *gi = seq->private; gi->sdp = inode->i_private; - gi->last_pos =0 ; seq->buf =kmalloc (GFS2_SEQ_GOODSIZE ,GFP_KERNEL | __GFP_NOWARN);if (seq->buf) seq->size =GFS2_SEQ_GOODSIZE ; gi->gl =NULL ; -rhashtable_walk_enter (&gl_hash_table, &gi->hti); }return ret; }
@@ -1980,7 +1977,6 @@ static int gfs2_glocks_release(struct inode *inode, struct file *file)struct gfs2_glock_iter *gi = seq->private; gi->gl =NULL ; -rhashtable_walk_exit (&gi->hti);return seq_release_private (inode, file); }
fs/proc/array.c +9 -0
@@ -62,6 +62,7 @@#include <linux/mman.h> #include <linux/sched/mm.h> #include <linux/sched/numa_balancing.h> +#include <linux/sched/task_stack.h> #include <linux/sched/task.h> #include <linux/sched/cputime.h> #include <linux/proc_fs.h>
@@ -421,7 +422,15 @@ static int do_task_stat(struct seq_file *m, struct pid_namespace *ns,* esp and eip are intentionally zeroed out. There is no * non-racy way to read them without freezing the task. * Programs that need reliable values can use ptrace(2). +* +* The only exception is if the task is core dumping because +* a program is not able to use ptrace(2) in that case. It is +* safe because the task has stopped executing permanently. */ +if (permitted && (task->flags &PF_DUMPCORE )) { + eip =KSTK_EIP (task); + esp =KSTK_ESP (task); + } }get_task_comm (tcomm, task);
fs/read_write.c +2 -2
@@ -112,7 +112,7 @@ generic_file_llseek_size(struct file *file, loff_t offset, int whence,* In the generic case the entire file is data, so as long as * offset isn't at the end of the file then the offset is data. */ -if (offset >= eof) +if ((unsigned long long )offset >= eof)return -ENXIO ;break ;case SEEK_HOLE :
@@ -120,7 +120,7 @@ generic_file_llseek_size(struct file *file, loff_t offset, int whence,* There is a virtual hole at the end of the file, so as long as * offset isn't i_size or larger, return i_size. */ -if (offset >= eof) +if ((unsigned long long )offset >= eof)return -ENXIO ; offset = eof;break ;
fs/xfs/xfs_ioctl.c +2 -1
@@ -1088,6 +1088,7 @@ xfs_ioctl_setattr_dax_invalidate( int *join_flags) {struct inode *inode =VFS_I (ip); +struct super_block *sb = inode->i_sb;int error; *join_flags =0 ;
@@ -1100,7 +1101,7 @@ xfs_ioctl_setattr_dax_invalidate(if (fa->fsx_xflags &FS_XFLAG_DAX ) {if (!(S_ISREG (inode->i_mode) ||S_ISDIR (inode->i_mode)))return -EINVAL ; -if (ip->i_mount->m_sb.sb_blocksize !=PAGE_SIZE ) +if (bdev_dax_supported (sb, sb->s_blocksize) <0 )return -EINVAL ; }
include/linux/dax.h +1 -4
@@ -19,8 +19,6 @@ struct dax_operations {/* copy_from_iter: required operation for fs-dax direct-i/o */ size_t (*copy_from_iter)(struct dax_device *,pgoff_t ,void *,size_t ,struct iov_iter *); -/* flush: optional driver-specific cache management after writes */ -void (*flush)(struct dax_device *,pgoff_t ,void *,size_t ); };extern struct attribute_group dax_attribute_group;
@@ -84,8 +82,7 @@ long dax_direct_access(struct dax_device *dax_dev, pgoff_t pgoff, long nr_pages, void **kaddr, pfn_t *pfn);size_t dax_copy_from_iter (struct dax_device *dax_dev,pgoff_t pgoff,void *addr,size_t bytes,struct iov_iter *i); -void dax_flush (struct dax_device *dax_dev,pgoff_t pgoff,void *addr, -size_t size); +void dax_flush (struct dax_device *dax_dev,void *addr,size_t size);void dax_write_cache (struct dax_device *dax_dev,bool wc);bool dax_write_cache_enabled (struct dax_device *dax_dev);
include/linux/device-mapper.h +0 -3
@@ -134,8 +134,6 @@ typedef long (*dm_dax_direct_access_fn) (struct dm_target *ti, pgoff_t pgoff, long nr_pages, void **kaddr, pfn_t *pfn);typedef size_t (*dm_dax_copy_from_iter_fn )(struct dm_target *ti,pgoff_t pgoff,void *addr,size_t bytes,struct iov_iter *i); -typedef void (*dm_dax_flush_fn )(struct dm_target *ti,pgoff_t pgoff,void *addr, -size_t size);#define PAGE_SECTORS (PAGE_SIZE / 512)void dm_error (const char *message);
@@ -186,7 +184,6 @@ struct target_type {dm_io_hints_fn io_hints;dm_dax_direct_access_fn direct_access;dm_dax_copy_from_iter_fn dax_copy_from_iter; -dm_dax_flush_fn dax_flush;/* For internal device-mapper use. */ struct list_head list;
include/linux/key.h +2 -0
@@ -187,6 +187,7 @@ struct key {#define KEY_FLAG_BUILTIN 8/* set if key is built in to the kernel */ #define KEY_FLAG_ROOT_CAN_INVAL 9/* set if key can be invalidated by root without permission */ #define KEY_FLAG_KEEP 10/* set if key should not be removed */ +#define KEY_FLAG_UID_KEYRING 11/* set if key is a user or user session keyring */ /* the key type and key description string * - the desc is used to match a key against search criteria
@@ -243,6 +244,7 @@ extern struct key *key_alloc(struct key_type *type,#define KEY_ALLOC_NOT_IN_QUOTA 0x0002/* not in quota */ #define KEY_ALLOC_BUILT_IN 0x0004/* Key is built into kernel */ #define KEY_ALLOC_BYPASS_RESTRICTION 0x0008/* Override the check on restricted keyrings */ +#define KEY_ALLOC_UID_KEYRING 0x0010/* allocating a user or user session keyring */ extern void key_revoke (struct key *key);extern void key_invalidate (struct key *key);
include/net/mac80211.h +2 -13
@@ -919,21 +919,10 @@ struct ieee80211_tx_info {unsigned long jiffies; };/* NB: vif can be NULL for injected frames */ -union { -/* NB: vif can be NULL for injected frames */ -struct ieee80211_vif *vif; - -/* When packets are enqueued on txq it's easy -* to re-construct the vif pointer. There's no -* more space in tx_info so it can be used to -* store the necessary enqueue time for packet -* sojourn time computation. -*/ -codel_time_t enqueue_time; - }; +struct ieee80211_vif *vif;struct ieee80211_key_conf *hw_key;u32 flags; -/* 4 bytes free */ +codel_time_t enqueue_time; } control;struct {u64 cookie;
kernel/exit.c +10 -13
@@ -1601,12 +1601,10 @@ SYSCALL_DEFINE5(waitid, int, which, pid_t, upid, struct siginfo __user *,struct waitid_info info = {.status =0 };long err =kernel_waitid (which, upid, &info, options, ru ? &r :NULL );int signo =0 ; +if (err >0 ) { signo =SIGCHLD ; err =0 ; - } - -if (!err) {if (ru &©_to_user (ru, &r,sizeof (struct rusage )))return -EFAULT ; }
@@ -1724,16 +1722,15 @@ COMPAT_SYSCALL_DEFINE5(waitid,if (err >0 ) { signo =SIGCHLD ; err =0 ; - } - -if (!err && uru) { -/* kernel_waitid() overwrites everything in ru */ -if (COMPAT_USE_64BIT_TIME ) - err =copy_to_user (uru, &ru,sizeof (ru)); -else - err =put_compat_rusage (&ru, uru); -if (err) -return -EFAULT ; +if (uru) { +/* kernel_waitid() overwrites everything in ru */ +if (COMPAT_USE_64BIT_TIME ) + err =copy_to_user (uru, &ru,sizeof (ru)); +else + err =put_compat_rusage (&ru, uru); +if (err) +return -EFAULT ; + } }if (!infop)
kernel/extable.c +31 -14
63 lines not on this page · raw message
kernel/futex.c +22 -11
@@ -821,8 +821,6 @@ static void get_pi_state(struct futex_pi_state *pi_state)/* * Drops a reference to the pi_state object and frees or caches it * when the last reference is gone. -* -* Must be called with the hb lock held. */ static void put_pi_state (struct futex_pi_state *pi_state) {
@@ -837,16 +835,22 @@ static void put_pi_state(struct futex_pi_state *pi_state)* and has cleaned up the pi_state already */ if (pi_state->owner) { -raw_spin_lock_irq (&pi_state->owner->pi_lock); -list_del_init (&pi_state->list); -raw_spin_unlock_irq (&pi_state->owner->pi_lock); +struct task_struct *owner; -rt_mutex_proxy_unlock (&pi_state->pi_mutex, pi_state->owner); +raw_spin_lock_irq (&pi_state->pi_mutex.wait_lock); + owner = pi_state->owner; +if (owner) { +raw_spin_lock (&owner->pi_lock); +list_del_init (&pi_state->list); +raw_spin_unlock (&owner->pi_lock); + } +rt_mutex_proxy_unlock (&pi_state->pi_mutex, owner); +raw_spin_unlock_irq (&pi_state->pi_mutex.wait_lock); } -if (current->pi_state_cache) +if (current->pi_state_cache) {kfree (pi_state); -else { + }else {/* * pi_state->list is already empty. * clear pi_state->owner.
@@ -905,13 +909,14 @@ void exit_pi_state_list(struct task_struct *curr)raw_spin_unlock_irq (&curr->pi_lock);spin_lock (&hb->lock); - -raw_spin_lock_irq (&curr->pi_lock); +raw_spin_lock_irq (&pi_state->pi_mutex.wait_lock); +raw_spin_lock (&curr->pi_lock);/* * We dropped the pi-lock, so re-check whether this * task still owns the PI-state: */ if (head->next != next) { +raw_spin_unlock (&pi_state->pi_mutex.wait_lock);spin_unlock (&hb->lock);continue ; }
@@ -920,9 +925,10 @@ void exit_pi_state_list(struct task_struct *curr)WARN_ON (list_empty (&pi_state->list));list_del_init (&pi_state->list); pi_state->owner =NULL ; -raw_spin_unlock_irq (&curr->pi_lock); +raw_spin_unlock (&curr->pi_lock);get_pi_state (pi_state); +raw_spin_unlock_irq (&pi_state->pi_mutex.wait_lock);spin_unlock (&hb->lock);rt_mutex_futex_unlock (&pi_state->pi_mutex);
@@ -1204,6 +1210,10 @@ static int attach_to_pi_owner(u32 uval, union futex_key *key,WARN_ON (!list_empty (&pi_state->list));list_add (&pi_state->list, &p->pi_state_list); +/* +* Assignment without holding pi_state->pi_mutex.wait_lock is safe +* because there is no concurrency as the object is not published yet. +*/ pi_state->owner = p;raw_spin_unlock_irq (&p->pi_lock);
@@ -2820,6 +2830,7 @@ static int futex_unlock_pi(u32 __user *uaddr, unsigned int flags)raw_spin_lock_irq (&pi_state->pi_mutex.wait_lock);spin_unlock (&hb->lock); +/* drops pi_state->pi_mutex.wait_lock */ ret =wake_futex_pi (uaddr, uval, pi_state);put_pi_state (pi_state);
kernel/irq/chip.c +1 -1
@@ -202,7 +202,7 @@ __irq_startup_managed(struct irq_desc *desc, struct cpumask *aff, bool force)irqd_clr_managed_shutdown (d); -if (cpumask_any_and (aff, cpu_online_mask) > nr_cpu_ids) { +if (cpumask_any_and (aff, cpu_online_mask) >= nr_cpu_ids) {/* * Catch code which fiddles with enable_irq() on a managed * and potentially shutdown IRQ. Chained interrupt
kernel/irq/generic-chip.c +0 -1
@@ -322,7 +322,6 @@ int __irq_alloc_domain_generic_chips(struct irq_domain *d, int irqs_per_chip,/* Calc pointer to the next generic chip */ tmp +=sizeof (*gc) + num_ct *sizeof (struct irq_chip_type ); } - d->name = name;return 0 ; }EXPORT_SYMBOL_GPL (__irq_alloc_domain_generic_chips);
kernel/irq/irqdesc.c +7 -17
@@ -421,10 +421,8 @@ static void free_desc(unsigned int irq)* The sysfs entry must be serialized against a concurrent * irq_sysfs_init() as well. */ -mutex_lock (&sparse_irq_lock);kobject_del (&desc->kobj);delete_irq_desc (irq); -mutex_unlock (&sparse_irq_lock);/* * We free the descriptor, masks and stat fields via RCU. That
@@ -462,20 +460,15 @@ static int alloc_descs(unsigned int start, unsigned int cnt, int node, desc =alloc_desc (start + i, node, flags, mask, owner);if (!desc) goto err; -mutex_lock (&sparse_irq_lock);irq_insert_desc (start + i, desc);irq_sysfs_add (start + i, desc); -mutex_unlock (&sparse_irq_lock); } +bitmap_set (allocated_irqs, start, cnt);return start; err:for (i--; i >=0 ; i--)free_desc (start + i); - -mutex_lock (&sparse_irq_lock); -bitmap_clear (allocated_irqs, start, cnt); -mutex_unlock (&sparse_irq_lock);return -ENOMEM ; }
@@ -575,6 +568,7 @@ static inline int alloc_descs(unsigned int start, unsigned int cnt, int node, desc->owner = owner; } +bitmap_set (allocated_irqs, start, cnt);return start; }
@@ -670,10 +664,10 @@ void irq_free_descs(unsigned int from, unsigned int cnt)if (from >= nr_irqs || (from + cnt) > nr_irqs)return ; +mutex_lock (&sparse_irq_lock);for (i =0 ; i < cnt; i++)free_desc (from + i); -mutex_lock (&sparse_irq_lock);bitmap_clear (allocated_irqs, from, cnt);mutex_unlock (&sparse_irq_lock); }
@@ -720,19 +714,15 @@ __irq_alloc_descs(int irq, unsigned int from, unsigned int cnt, int node, from, cnt, 0); ret = -EEXIST ;if (irq >=0 && start != irq) - goto err; + goto unlock;if (start + cnt > nr_irqs) { ret =irq_expand_nr_irqs (start + cnt);if (ret) - goto err; + goto unlock; } - -bitmap_set (allocated_irqs, start, cnt); -mutex_unlock (&sparse_irq_lock); -return alloc_descs (start, cnt, node, affinity, owner); - -err: + ret =alloc_descs (start, cnt, node, affinity, owner); +unlock:mutex_unlock (&sparse_irq_lock);return ret; }
kernel/irq/msi.c +3 -2
@@ -315,11 +315,12 @@ int msi_domain_populate_irqs(struct irq_domain *domain, struct device *dev, ops->set_desc (arg, desc);/* Assumes the domain mutex is held! */ - ret =irq_domain_alloc_irqs_hierarchy (domain, virq,1 , arg); + ret =irq_domain_alloc_irqs_hierarchy (domain, desc->irq,1 , + arg);if (ret)break ; -irq_set_msi_desc_off (virq,0 , desc); +irq_set_msi_desc_off (desc->irq,0 , desc); }if (ret) {
kernel/rcu/tree.c +10 -0
@@ -888,6 +888,11 @@ void rcu_irq_exit(void)RCU_LOCKDEP_WARN (!irqs_disabled (),"rcu_irq_exit() invoked with irqs enabled!!!" ); rdtp =this_cpu_ptr (&rcu_dynticks); + +/* Page faults can happen in NMI handlers, so check... */ +if (READ_ONCE (rdtp->dynticks_nmi_nesting)) +return ; +WARN_ON_ONCE (IS_ENABLED (CONFIG_RCU_EQS_DEBUG ) && rdtp->dynticks_nesting <1 );if (rdtp->dynticks_nesting <=1 ) {
@@ -1020,6 +1025,11 @@ void rcu_irq_enter(void)RCU_LOCKDEP_WARN (!irqs_disabled (),"rcu_irq_enter() invoked with irqs enabled!!!" ); rdtp =this_cpu_ptr (&rcu_dynticks); + +/* Page faults can happen in NMI handlers, so check... */ +if (READ_ONCE (rdtp->dynticks_nmi_nesting)) +return ; + oldval = rdtp->dynticks_nesting; rdtp->dynticks_nesting++; WARN_ON_ONCE(IS_ENABLED(CONFIG_RCU_EQS_DEBUG) &&
kernel/seccomp.c +16 -7
@@ -458,14 +458,19 @@ static long seccomp_attach_filter(unsigned int flags,return 0 ; } +void __get_seccomp_filter (struct seccomp_filter *filter) +{ +/* Reference count is bounded by the number of total processes. */ +refcount_inc (&filter->usage); +} +/* get_seccomp_filter - increments the reference count of the filter on @tsk */ void get_seccomp_filter (struct task_struct *tsk) {struct seccomp_filter *orig = tsk->seccomp.filter;if (!orig)return ; -/* Reference count is bounded by the number of total processes. */ -refcount_inc (&orig->usage); +__get_seccomp_filter (orig); }static inline void seccomp_filter_free (struct seccomp_filter *filter)
@@ -476,10 +481,8 @@ static inline void seccomp_filter_free(struct seccomp_filter *filter) } } -/* put_seccomp_filter - decrements the ref count of tsk->seccomp.filter */ -void put_seccomp_filter (struct task_struct *tsk) +static void __put_seccomp_filter (struct seccomp_filter *orig) { -struct seccomp_filter *orig = tsk->seccomp.filter;/* Clean up single-reference branches iteratively. */ while (orig &&refcount_dec_and_test (&orig->usage)) {struct seccomp_filter *freeme = orig;
@@ -488,6 +491,12 @@ void put_seccomp_filter(struct task_struct *tsk) } } +/* put_seccomp_filter - decrements the ref count of tsk->seccomp.filter */ +void put_seccomp_filter (struct task_struct *tsk) +{
Lines of this file are not shown. View the raw message.
security/keys/big_key.c +65 -73
138 lines not on this page · raw message
tools/testing/selftests/seccomp/seccomp_bpf.c +13 -5
Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
Part of the diff is not shown here. View the raw message.