Linux 4.9.53
Greg KH
maintainerI'm announcing the release of the 4.9.53 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/arm/xen/mm.c | 1 arch/arm64/kernel/head.S | 1 arch/arm64/mm/fault.c | 2 arch/powerpc/kernel/entry_64.S | 20 +- arch/powerpc/kernel/ptrace.c | 2 arch/powerpc/kvm/book3s_64_vio.c | 57 +++--- arch/powerpc/platforms/pseries/mobility.c | 4 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 | 240 +++++++++++++------------- arch/x86/mm/fault.c | 47 ++--- block/bsg-lib.c | 1 crypto/drbg.c | 8 drivers/base/power/main.c | 9 drivers/crypto/talitos.c | 9 drivers/gpu/drm/etnaviv/etnaviv_gem.c | 3 drivers/gpu/drm/radeon/radeon_device.c | 2 drivers/infiniband/hw/cxgb4/cm.c | 4 drivers/md/raid5.c | 13 + drivers/misc/cxl/api.c | 4 drivers/misc/cxl/file.c | 8 drivers/net/wireless/mac80211_hwsim.c | 2 drivers/pci/pci-sysfs.c | 11 - drivers/scsi/scsi_transport_iscsi.c | 2 drivers/video/fbdev/aty/atyfb_base.c | 2 drivers/xen/swiotlb-xen.c | 19 ++ fs/btrfs/ioctl.c | 6 fs/btrfs/relocation.c | 2 fs/cifs/cifsfs.c | 2 fs/cifs/connect.c | 8 fs/cifs/file.c | 7 fs/cifs/smb2pdu.c | 21 +- fs/gfs2/glock.c | 16 - fs/proc/array.c | 9 fs/read_write.c | 4 fs/xfs/xfs_ioctl.c | 3 include/linux/key.h | 2 include/net/mac80211.h | 15 - include/xen/swiotlb-xen.h | 5 kernel/irq/irqdesc.c | 24 -- kernel/seccomp.c | 23 +- kernel/sysctl.c | 2 kernel/time/timer.c | 2 kernel/trace/trace.c | 12 - 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 + 59 files changed, 548 insertions(+), 381 deletions(-)
Alex Deucher (1):
drm/radeon: disable hard reset in hibernate for APUs
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
Bo Yan (1):
tracing: Erase irqsoff trace with empty write
Boqun Feng (1):
kvm/x86: Handle async PF in RCU read-side critical sections
Christoph Hellwig (1):
bsg-lib: don't free job in bsg_prepare_job
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
Frederic Barrat (1):
cxl: Fix driver use count
Gerald Schaefer (1):
s390/mm: fix write access check in gup_huge_pmd()
Greg Kroah-Hartman (1):
Linux 4.9.53
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
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
Jim Mattson (1):
kvm: nVMX: Don't allow L2 to access the hardware CR8
Johannes Berg (1):
mac80211: fix VLAN handling with TXQs
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
Laurent Dufour (1):
x86/mm: Fix fault error path using unsafe vma pointer
Lucas Stach (1):
etnaviv: fix gem object list corruption
Marc Zyngier (1):
arm64: Make sure SPsel is always set
Myungho Jung (1):
timer/sysclt: Restrict timer migration sysctl values to 0 and 1
Naohiro Aota (2):
btrfs: fix NULL pointer dereference from free_reloc_roots()
btrfs: propagate error to btrfs_cmp_data_prepare caller
Naveen N. Rao (1):
powerpc/ftrace: Pass the correct stack pointer for DYNAMIC_FTRACE_WITH_REGS
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 Mackerras (2):
KVM: PPC: Book3S: Fix race and leak in kvm_vm_ioctl_create_spapr_tce()
KVM: PPC: Book3S HV: Protect updates to spapr_tce_tables list
Rafael J. Wysocki (1):
PM: core: Fix device_pm_check_callbacks()
Ross Zwisler (1):
xfs: validate bdev support for DAX inode flag
Shaohua Li (1):
md/raid5: fix a race condition in stripe batch
Shu Wang (2):
cifs: release cifs root_cred after exit_cifs
cifs: release auth_key.response for reconnect.
Stefano Stabellini (1):
swiotlb-xen: implement xen_swiotlb_dma_mmap callback
Stephan Mueller (1):
crypto: drbg - fix freeing of resources
Steve French (4):
Fix SMB3.1.1 guest authentication to Samba
SMB3: Warn user if trying to sign connection that authenticated as guest
SMB: Validate negotiate (to protect against downgrade) even if signing off
SMB3: Don't ignore O_SYNC/O_DSYNC and O_DIRECT flags
Steve Wise (2):
iw_cxgb4: remove the stid on listen create failure
iw_cxgb4: put ep reference in pass_accept_req()
Tahsin Erdogan (1):
tracing: Fix trace_pipe behavior for instance traces
Thomas Gleixner (1):
genirq: Make sparse_irq_lock protect what it should protect
Tyrel Datwyler (1):
powerpc/pseries: Fix parent_dn reference leak in add_dt_node()
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 (1):
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 = 9 -SUBLEVEL = 52 +SUBLEVEL = 53 EXTRAVERSION = NAME = Roaring Lionus
arch/arm/xen/mm.c +1 -0
@@ -199,6 +199,7 @@ static struct dma_map_ops xen_swiotlb_dma_ops = { .unmap_page = xen_swiotlb_unmap_page, .dma_supported = xen_swiotlb_dma_supported, .set_dma_mask = xen_swiotlb_set_dma_mask, + .mmap = xen_swiotlb_dma_mmap, };int __init xen_mm_init (void )
arch/arm64/kernel/head.S +1 -0
@@ -486,6 +486,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.ne 1f
arch/arm64/mm/fault.c +1 -1
@@ -509,7 +509,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/powerpc/kernel/entry_64.S +12 -8
@@ -1235,10 +1235,14 @@ _GLOBAL(ftrace_caller) stdu r1,-SWITCH_FRAME_SIZE(r1) /* Save all gprs to pt_regs */ - SAVE_8GPRS(0,r1) - SAVE_8GPRS(8,r1) - SAVE_8GPRS(16,r1) - SAVE_8GPRS(24,r1) + SAVE_GPR(0, r1) + SAVE_10GPRS(2, r1) + SAVE_10GPRS(12, r1) + SAVE_10GPRS(22, r1) + + /* Save previous stack pointer (r1) */ + addi r8, r1, SWITCH_FRAME_SIZE + std r8, GPR1(r1) /* Load special regs for save below */ mfmsr r8
@@ -1292,10 +1296,10 @@ ftrace_call: #endif /* Restore gprs */ - REST_8GPRS(0,r1) - REST_8GPRS(8,r1) - REST_8GPRS(16,r1) - REST_8GPRS(24,r1) + REST_GPR(0,r1) + REST_10GPRS(2,r1) + REST_10GPRS(12,r1) + REST_10GPRS(22,r1) /* Restore callee's TOC */ ld r2, 24(r1)
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_64_vio.c +34 -23
96 lines not on this page · raw message
arch/powerpc/platforms/pseries/mobility.c +3 -1
@@ -225,8 +225,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/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
@@ -130,11 +130,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
@@ -141,7 +141,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 +125 -115
331 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
@@ -147,7 +147,6 @@ static int bsg_create_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
@@ -1757,10 +1757,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/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/gpu/drm/etnaviv/etnaviv_gem.c +3 -0
@@ -549,12 +549,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/radeon/radeon_device.c +1 -1
@@ -1674,7 +1674,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 +2 -2
@@ -2577,9 +2577,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 ; }
@@ -3441,7 +3441,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/md/raid5.c +10 -3
@@ -829,6 +829,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
@@ -836,8 +844,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;
@@ -4277,7 +4283,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/misc/cxl/api.c +4 -0
@@ -244,6 +244,10 @@ int cxl_start_context(struct cxl_context *ctx, u64 wed, ctx->real_mode = false; } +/* +* Increment driver use count. Enables global TLBIs for hash +* and callbacks to handle the segment table +*/ cxl_ctx_get ();if ((rc = cxl_ops->attach_process (ctx, kernel, wed,0 ))) {
drivers/misc/cxl/file.c +7 -1
@@ -91,7 +91,6 @@ static int __afu_open(struct inode *inode, struct file *file, bool master)pr_devel ("afu_open pe: %i\n" , ctx->pe); file->private_data = ctx; -cxl_ctx_get ();/* indicate success */ rc =0 ;
@@ -213,6 +212,12 @@ static long afu_ioctl_start_work(struct cxl_context *ctx, ctx->glpid =get_task_pid (current->group_leader,PIDTYPE_PID ); +/* +* Increment driver use count. Enables global TLBIs for hash +* and callbacks to handle the segment table +*/ +cxl_ctx_get (); +trace_cxl_attach (ctx, work.work_element_descriptor, work.num_interrupts, amr); if ((rc = cxl_ops->attach_process(ctx, false, work.work_element_descriptor,
@@ -222,6 +227,7 @@ static long afu_ioctl_start_work(struct cxl_context *ctx,put_pid (ctx->glpid);put_pid (ctx->pid); ctx->glpid = ctx->pid =NULL ; +cxl_ctx_put (); goto out; }
drivers/net/wireless/mac80211_hwsim.c +0 -2
@@ -1357,8 +1357,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/pci/pci-sysfs.c +9 -2
@@ -527,7 +527,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 ))
@@ -541,12 +541,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);
@@ -557,8 +560,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/scsi/scsi_transport_iscsi.c +1 -1
@@ -3696,7 +3696,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
@@ -1861,7 +1861,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;
drivers/xen/swiotlb-xen.c +19 -0
@@ -680,3 +680,22 @@ xen_swiotlb_set_dma_mask(struct device *dev, u64 dma_mask)return 0 ; }EXPORT_SYMBOL_GPL (xen_swiotlb_set_dma_mask); + +/* +* Create userspace mapping for the DMA-coherent memory. +* This function should be called with the pages from the current domain only, +* passing pages mapped from other domains would lead to memory corruption. +*/ +int +xen_swiotlb_dma_mmap (struct device *dev,struct vm_area_struct *vma, +void *cpu_addr,dma_addr_t dma_addr,size_t size, +unsigned long attrs) +{ +#if defined(CONFIG_ARM ) || defined(CONFIG_ARM64 ) +if (__generic_dma_ops (dev)->mmap) +return __generic_dma_ops (dev)->mmap (dev, vma, cpu_addr, + dma_addr, size, attrs); +#endif +return dma_common_mmap (dev, vma, cpu_addr, dma_addr, size); +} +EXPORT_SYMBOL_GPL (xen_swiotlb_dma_mmap);
fs/btrfs/ioctl.c +5 -1
@@ -3052,7 +3052,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(struct inode *src, u64 loff, struct inode *dst,
@@ -4082,6 +4082,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
@@ -2367,11 +2367,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
@@ -1360,7 +1360,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/connect.c +8 -0
@@ -4071,6 +4071,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/smb2pdu.c +15 -6
@@ -366,7 +366,7 @@ assemble_neg_contexts(struct smb2_negotiate_req *req)build_encrypt_ctxt ((struct smb2_encryption_neg_context *)pneg_ctxt); req->NegotiateContextOffset =cpu_to_le32 (OFFSET_OF_NEG_CONTEXT ); req->NegotiateContextCount =cpu_to_le16 (2 ); -inc_rfc1001_len (req,4 +sizeof (struct smb2_preauth_neg_context ) +2 +inc_rfc1001_len (req,4 +sizeof (struct smb2_preauth_neg_context ) + sizeof(struct smb2_encryption_neg_context)); /* calculate hash */ }#else
@@ -531,15 +531,22 @@ int smb3_validate_negotiate(const unsigned int xid, struct cifs_tcon *tcon)/* * validation ioctl must be signed, so no point sending this if we -* can not sign it. We could eventually change this to selectively +* can not sign it (ie are not known user). Even if signing is not +* required (enabled but not negotiated), in those cases we selectively * sign just this, the first and only signed request on a connection. -* This is good enough for now since a user who wants better security -* would also enable signing on the mount. Having validation of -* negotiate info for signed connections helps reduce attack vectors +* Having validation of negotiate info helps reduce attack vectors. */ -if (tcon->ses->server->sign == false) +if (tcon->ses->session_flags &SMB2_SESSION_FLAG_IS_GUEST )return 0 ;/* validation requires signing */ +if (tcon->ses->user_name ==NULL ) { +cifs_dbg (FYI ,"Can't validate negotiate: null user mount\n" ); +return 0 ;/* validation requires signing */ + } + +if (tcon->ses->session_flags &SMB2_SESSION_FLAG_IS_NULL ) +cifs_dbg (VFS ,"Unexpected null user (anonymous) auth flag sent by server\n" ); + vneg_inbuf.Capabilities =cpu_to_le32 (tcon->ses->server->vals->req_capabilities); memcpy(vneg_inbuf.Guid, tcon->ses->server->client_guid,
@@ -1010,6 +1017,8 @@ SMB2_sess_setup(const unsigned int xid, struct cifs_ses *ses,while (sess_data->func) sess_data->func (sess_data); +if ((ses->session_flags &SMB2_SESSION_FLAG_IS_GUEST ) && (ses->sign)) +cifs_dbg (VFS ,"signing requested but authenticated as guest\n" ); rc = sess_data->result; out:kfree (sess_data);
fs/gfs2/glock.c +5 -11
@@ -1836,13 +1836,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 {
@@ -1850,6 +1846,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; }
@@ -1861,6 +1858,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; }
@@ -1870,6 +1868,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)
@@ -1932,12 +1931,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 ; - ret =rhashtable_walk_init (&gl_hash_table, &gi->hti,GFP_KERNEL ); }return ret; }
@@ -1948,7 +1945,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); }
@@ -1960,12 +1956,10 @@ static int gfs2_glstats_open(struct inode *inode, struct file *file)struct seq_file *seq = file->private_data;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 ; - ret =rhashtable_walk_init (&gl_hash_table, &gi->hti,GFP_KERNEL ); }return ret; }
fs/proc/array.c +9 -0
@@ -60,6 +60,7 @@#include <linux/tty.h> #include <linux/string.h> #include <linux/mman.h> +#include <linux/sched.h> #include <linux/proc_fs.h> #include <linux/ioport.h> #include <linux/uaccess.h>
@@ -416,7 +417,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
@@ -114,7 +114,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 :
@@ -122,7 +122,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
@@ -1085,6 +1085,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 ;
@@ -1097,7 +1098,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/key.h +2 -0
@@ -176,6 +176,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
@@ -235,6 +236,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
@@ -902,21 +902,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;
include/xen/swiotlb-xen.h +5 -0
@@ -58,4 +58,9 @@ xen_swiotlb_dma_supported(struct device *hwdev, u64 mask);extern int xen_swiotlb_set_dma_mask (struct device *dev,u64 dma_mask); + +extern int +xen_swiotlb_dma_mmap (struct device *dev,struct vm_area_struct *vma, +void *cpu_addr,dma_addr_t dma_addr,size_t size, +unsigned long attrs);#endif /* __LINUX_SWIOTLB_XEN_H */
kernel/irq/irqdesc.c +7 -17
@@ -405,10 +405,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
@@ -446,20 +444,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 ; }
@@ -558,6 +551,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; }
@@ -653,10 +647,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); }
@@ -703,19 +697,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/seccomp.c +16 -7
@@ -457,14 +457,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. */ +atomic_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. */ -atomic_inc (&orig->usage); +__get_seccomp_filter (orig); }static inline void seccomp_filter_free (struct seccomp_filter *filter)
@@ -475,10 +480,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 &&atomic_dec_and_test (&orig->usage)) {struct seccomp_filter *freeme = orig;
@@ -487,6 +490,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) +{ +__put_seccomp_filter (tsk->seccomp.filter); +} +/** * seccomp_send_sigsys - signals the task to allow in-process syscall emulation * @syscall: syscall number to send to userland
@@ -892,13 +901,13 @@ long seccomp_get_filter(struct task_struct *task, unsigned long filter_off,if (!data) goto out; -get_seccomp_filter (task); +__get_seccomp_filter (filter);spin_unlock_irq (&task->sighand->siglock);if (copy_to_user (data, fprog->filter,bpf_classic_proglen (fprog))) ret = -EFAULT ; -put_seccomp_filter (task); +__put_seccomp_filter (filter);return ret; out:
kernel/sysctl.c +2 -0
@@ -1189,6 +1189,8 @@ static struct ctl_table kern_table[] = { .maxlen = sizeof(unsigned int), .mode = 0644, .proc_handler = timer_migration_handler, + .extra1 = &zero, + .extra2 = &one, },#endif #ifdef CONFIG_BPF_SYSCALL
kernel/time/timer.c +1 -1
@@ -240,7 +240,7 @@ int timer_migration_handler(struct ctl_table *table, int write,int ret;mutex_lock (&mutex); - ret =proc_dointvec (table, write, buffer, lenp, ppos); + ret =proc_dointvec_minmax (table, write, buffer, lenp, ppos);if (!ret && write)timers_update_migration (false);mutex_unlock (&mutex);
kernel/trace/trace.c +9 -3
@@ -3569,11 +3569,17 @@ static int tracing_open(struct inode *inode, struct file *file)/* If this file was open for write, then erase contents */ if ((file->f_mode &FMODE_WRITE ) && (file->f_flags &O_TRUNC )) {int cpu =tracing_get_cpu (inode); +struct trace_buffer *trace_buf = &tr->trace_buffer; + +#ifdef CONFIG_TRACER_MAX_TRACE +if (tr->current_trace->print_max) + trace_buf = &tr->max_buffer; +#endif if (cpu ==RING_BUFFER_ALL_CPUS ) -tracing_reset_online_cpus (&tr->trace_buffer); +tracing_reset_online_cpus (trace_buf);else -tracing_reset (&tr->trace_buffer, cpu); +tracing_reset (trace_buf, cpu); }if (file->f_mode &FMODE_READ ) {
@@ -5128,7 +5134,7 @@ static int tracing_wait_pipe(struct file *filp)* * iter->pos will be 0 if we haven't read anything. */ -if (!tracing_is_on () && iter->pos) +if (!tracer_tracing_is_on (iter->tr) && iter->pos)break ;mutex_unlock (&iter->mutex);
net/mac80211/iface.c +15 -2
@@ -791,6 +791,7 @@ static int ieee80211_open(struct net_device *dev)static void ieee80211_do_stop (struct ieee80211_sub_if_data *sdata,bool going_down) { +struct ieee80211_sub_if_data *txq_sdata = sdata;struct ieee80211_local *local = sdata->local;struct fq *fq = &local->fq;unsigned long flags;
@@ -931,6 +932,9 @@ static void ieee80211_do_stop(struct ieee80211_sub_if_data *sdata,switch (sdata->vif.type) {case NL80211_IFTYPE_AP_VLAN : + txq_sdata =container_of (sdata->bss, + struct ieee80211_sub_if_data, u.ap); +mutex_lock (&local->mtx);list_del (&sdata->u.vlan.list);mutex_unlock (&local->mtx);
@@ -1001,8 +1005,17 @@ static void ieee80211_do_stop(struct ieee80211_sub_if_data *sdata, }spin_unlock_irqrestore (&local->queue_stop_reason_lock, flags); -if (sdata->vif.txq) { -struct txq_info *txqi =to_txq_info (sdata->vif.txq); +if (txq_sdata->vif.txq) { +struct txq_info *txqi =to_txq_info (txq_sdata->vif.txq); + +/* +* FIXME FIXME +* +* We really shouldn't purge the *entire* txqi since that +* contains frames for the other AP_VLANs (and possibly +* the AP itself) as well, but there's no API in FQ now +* to be able to filter. +*/ spin_lock_bh (&fq->lock);ieee80211_txq_purge (local, txqi);
net/mac80211/offchannel.c +2 -0
@@ -707,6 +707,8 @@ static int ieee80211_cancel_roc(struct ieee80211_local *local,if (!cookie)return -ENOENT ; +flush_work (&local->hw_roc_start); +mutex_lock (&local->mtx);list_for_each_entry_safe (roc, tmp, &local->roc_list, list) {if (!mgmt_tx && roc->cookie != cookie)
net/mac80211/tx.c +29 -7
@@ -1277,11 +1277,6 @@ static void ieee80211_set_skb_enqueue_time(struct sk_buff *skb)IEEE80211_SKB_CB (skb)->control.enqueue_time =codel_get_time (); } -static void ieee80211_set_skb_vif (struct sk_buff *skb,struct txq_info *txqi) -{ -IEEE80211_SKB_CB (skb)->control.vif = txqi->txq.vif; -} -static u32 codel_skb_len_func (const struct sk_buff *skb) {return skb->len;
@@ -3388,6 +3383,7 @@ struct sk_buff *ieee80211_tx_dequeue(struct ieee80211_hw *hw,struct ieee80211_tx_info *info;struct ieee80211_tx_data tx;ieee80211_tx_result r; +struct ieee80211_vif *vif;spin_lock_bh (&fq->lock);
@@ -3404,8 +3400,6 @@ struct sk_buff *ieee80211_tx_dequeue(struct ieee80211_hw *hw,if (!skb) goto out; -ieee80211_set_skb_vif (skb, txqi); - hdr = (struct ieee80211_hdr *)skb->data; info =IEEE80211_SKB_CB (skb);
@@ -3462,6 +3456,34 @@ struct sk_buff *ieee80211_tx_dequeue(struct ieee80211_hw *hw, } } +switch (tx.sdata->vif.type) { +case NL80211_IFTYPE_MONITOR : +if (tx.sdata->u.mntr.flags &MONITOR_FLAG_ACTIVE ) { + vif = &tx.sdata->vif; +break ; + } + tx.sdata =rcu_dereference (local->monitor_sdata); +if (tx.sdata) { + vif = &tx.sdata->vif; + info->hw_queue = + vif->hw_queue[skb_get_queue_mapping (skb)]; + }else if (ieee80211_hw_check (&local->hw,QUEUE_CONTROL )) { +ieee80211_free_txskb (&local->hw, skb); + goto begin; + }else { + vif =NULL ; + } +break ; +case NL80211_IFTYPE_AP_VLAN : + tx.sdata =container_of (tx.sdata->bss, + struct ieee80211_sub_if_data, u.ap); +/* fall through */ +default : + vif = &tx.sdata->vif; +break ; + } + +IEEE80211_SKB_CB (skb)->control.vif = vif; out:spin_unlock_bh (&fq->lock);
net/wireless/nl80211.c +3 -0
@@ -10385,6 +10385,9 @@ static int nl80211_set_rekey_data(struct sk_buff *skb, struct genl_info *info)if (err)return err; +if (!tb[NL80211_REKEY_DATA_REPLAY_CTR ] || !tb[NL80211_REKEY_DATA_KEK ] || + !tb[NL80211_REKEY_DATA_KCK ]) +return -EINVAL ;if (nla_len (tb[NL80211_REKEY_DATA_REPLAY_CTR ]) !=NL80211_REPLAY_CTR_LEN )return -ERANGE ;if (nla_len (tb[NL80211_REKEY_DATA_KEK ]) !=NL80211_KEK_LEN )
security/keys/Kconfig +1 -3
@@ -41,10 +41,8 @@ config BIG_KEYS bool "Large payload keys" depends on KEYS depends on TMPFS - depends on (CRYPTO_ANSI_CPRNG = y || CRYPTO_DRBG = y) select CRYPTO_AES - select CRYPTO_ECB - select CRYPTO_RNG + select CRYPTO_GCM help This option provides support for holding large keys within the kernel (for example Kerberos ticket caches). The data may be stored out to
security/keys/big_key.c +64 -74
262 lines not on this page · raw message
security/keys/internal.h +1 -1
@@ -137,7 +137,7 @@ extern key_ref_t keyring_search_aux(key_ref_t keyring_ref,extern key_ref_t search_my_process_keyrings (struct keyring_search_context *ctx);extern key_ref_t search_process_keyrings (struct keyring_search_context *ctx); -extern struct key *find_keyring_by_name (const char *name,bool skip_perm_check); +extern struct key *find_keyring_by_name (const char *name,bool uid_keyring);extern int install_user_keyrings (void );extern int install_thread_keyring_to_cred (struct cred *);
security/keys/key.c +2 -0
@@ -301,6 +301,8 @@ struct key *key_alloc(struct key_type *type, const char *desc, key->flags |=1 <<KEY_FLAG_IN_QUOTA ;if (flags &KEY_ALLOC_BUILT_IN ) key->flags |=1 <<KEY_FLAG_BUILTIN ; +if (flags &KEY_ALLOC_UID_KEYRING ) + key->flags |=1 <<KEY_FLAG_UID_KEYRING ;#ifdef KEY_DEBUGGING key->magic =KEY_DEBUG_MAGIC ;
security/keys/keyctl.c +5 -0
@@ -766,6 +766,11 @@ long keyctl_read_key(key_serial_t keyid, char __user *buffer, size_t buflen) key =key_ref_to_ptr (key_ref); +if (test_bit (KEY_FLAG_NEGATIVE , &key->flags)) { + ret = -ENOKEY ; + goto error2; + } +/* see if we can read it directly */ ret =key_permission (key_ref,KEY_NEED_READ );if (ret ==0 )
security/keys/keyring.c +19 -18
@@ -416,7 +416,7 @@ static void keyring_describe(const struct key *keyring, struct seq_file *m) }struct keyring_read_iterator_context { -size_t qty; +size_t buflen;size_t count;key_serial_t __user *buffer; };
@@ -428,9 +428,9 @@ static int keyring_read_iterator(const void *object, void *data)int ret;kenter ("{%s,%d},,{%zu/%zu}" , - key->type->name, key->serial, ctx->count, ctx->qty); + key->type->name, key->serial, ctx->count, ctx->buflen); -if (ctx->count >= ctx->qty) +if (ctx->count >= ctx->buflen)return 1 ; ret =put_user (key->serial, ctx->buffer);
@@ -465,16 +465,12 @@ static long keyring_read(const struct key *keyring,return 0 ;/* Calculate how much data we could return */ - ctx.qty = nr_keys *sizeof (key_serial_t); -if (!buffer || !buflen) -return ctx.qty; - -if (buflen > ctx.qty) - ctx.qty = buflen; +return nr_keys *sizeof (key_serial_t);/* Copy the IDs of the subscribed keys into the buffer */ ctx.buffer = (key_serial_t __user *)buffer; + ctx.buflen = buflen; ctx.count =0 ; ret =assoc_array_iterate (&keyring->keys, keyring_read_iterator, &ctx);if (ret <0 ) {
@@ -989,15 +985,15 @@ key_ref_t find_key_to_update(key_ref_t keyring_ref,/* * Find a keyring with the specified name. * -* All named keyrings in the current user namespace are searched, provided they -* grant Search permission directly to the caller (unless this check is -* skipped). Keyrings whose usage points have reached zero or who have been -* revoked are skipped. +* Only keyrings that have nonzero refcount, are not revoked, and are owned by a +* user in the current user namespace are considered. If @uid_keyring is %true, +* the keyring additionally must have been allocated as a user or user session +* keyring; otherwise, it must grant Search permission directly to the caller. * * Returns a pointer to the keyring with the keyring's refcount having being * incremented on success. -ENOKEY is returned if a key could not be found. */ -struct key *find_keyring_by_name (const char *name,bool skip_perm_check) +struct key *find_keyring_by_name (const char *name,bool uid_keyring) {struct key *keyring;int bucket;
@@ -1025,10 +1021,15 @@ struct key *find_keyring_by_name(const char *name, bool skip_perm_check)if (strcmp (keyring->description, name) !=0 )continue ; -if (!skip_perm_check && -key_permission (make_key_ref (keyring,0 ), -KEY_NEED_SEARCH ) <0 ) -continue ; +if (uid_keyring) { +if (!test_bit (KEY_FLAG_UID_KEYRING , + &keyring->flags)) +continue ; + }else { +if (key_permission (make_key_ref (keyring,0 ), +KEY_NEED_SEARCH ) <0 ) +continue ; + }/* we've got a match but we might end up racing with * key_cleanup() if the keyring is currently 'dead'
security/keys/process_keys.c +4 -2
@@ -76,7 +76,8 @@ int install_user_keyrings(void)if (IS_ERR (uid_keyring)) { uid_keyring =keyring_alloc (buf, user->uid,INVALID_GID , cred, user_keyring_perm, -KEY_ALLOC_IN_QUOTA , +KEY_ALLOC_UID_KEYRING | +KEY_ALLOC_IN_QUOTA ,NULL ,NULL );if (IS_ERR (uid_keyring)) { ret =PTR_ERR (uid_keyring);
@@ -93,7 +94,8 @@ int install_user_keyrings(void) session_keyring =keyring_alloc (buf, user->uid,INVALID_GID , cred, user_keyring_perm, -KEY_ALLOC_IN_QUOTA , +KEY_ALLOC_UID_KEYRING | +KEY_ALLOC_IN_QUOTA ,NULL ,NULL );if (IS_ERR (session_keyring)) { ret =PTR_ERR (session_keyring);
tools/testing/selftests/seccomp/seccomp_bpf.c +13 -5
@@ -6,10 +6,18 @@*/ #include <sys/types.h> -#include <asm/siginfo.h> -#define __have_siginfo_t 1 -#define __have_sigval_t 1 -#define __have_sigevent_t 1 + +/* +* glibc 2.26 and later have SIGSYS in siginfo_t. Before that, +* we need to use the kernel's siginfo.h file and trick glibc +* into accepting it. +*/ +#if !__GLIBC_PREREQ (2 ,26 ) +# include <asm/siginfo.h> +# define __have_siginfo_t 1 +# define __have_sigval_t 1 +# define __have_sigevent_t 1 +#endif #include <errno.h> #include <linux/filter.h>
@@ -676,7 +684,7 @@ TEST_F_SIGNAL(TRAP, ign, SIGSYS)syscall (__NR_getpid); } -static struct siginfo TRAP_info; +static siginfo_t TRAP_info;static volatile int TRAP_nr;static void TRAP_action (int nr,siginfo_t *info,void *void_context) {