Linux 4.9.20
Greg KH
maintainerI'm announcing the release of the 4.9.20 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/c6x/kernel/ptrace.c | 41 -------------------------- arch/h8300/kernel/ptrace.c | 8 +++-- arch/metag/kernel/ptrace.c | 19 +++++++++--- arch/mips/kernel/ptrace.c | 3 + arch/sparc/kernel/ptrace_64.c | 2 - arch/x86/include/asm/kvm_page_track.h | 1 arch/x86/kvm/page_track.c | 8 +++++ arch/x86/kvm/x86.c | 1 drivers/pinctrl/qcom/pinctrl-msm.c | 4 -- drivers/usb/musb/musb_core.c | 2 - drivers/virtio/virtio_balloon.c | 2 + fs/crypto/crypto.c | 10 ------ fs/crypto/fname.c | 2 - fs/crypto/keyinfo.c | 52 +++++----------------------------- include/linux/fscrypto.h | 2 - kernel/sched/deadline.c | 3 - kernel/sched/rt.c | 3 - net/xfrm/xfrm_policy.c | 10 +++--- net/xfrm/xfrm_user.c | 9 +++++ 20 files changed, 63 insertions(+), 121 deletions(-)
Andy Whitcroft (2):
xfrm_user: validate XFRM_MSG_NEWAE XFRMA_REPLAY_ESN_VAL replay_window
xfrm_user: validate XFRM_MSG_NEWAE incoming ESN size harder
Bin Liu (1):
usb: musb: fix possible spinlock deadlock
Bjorn Andersson (1):
pinctrl: qcom: Don't clear status bit on irq_unmask
Dave Martin (7):
c6x/ptrace: Remove useless PTRACE_SETREGSET implementation h8300/ptrace: Fix incorrect register transfer count mips/ptrace: Preserve previous registers for short regset write sparc/ptrace: Preserve previous registers for short regset write metag/ptrace: Preserve previous registers for short regset write metag/ptrace: Provide default TXSTATUS for short NT_PRSTATUS metag/ptrace: Reject partial NT_METAG_RPIPE writes
Eric Biggers (1):
fscrypt: remove broken support for detecting keyring key revocation
Florian Westphal (1):
xfrm: policy: init locks early
Greg Kroah-Hartman (1):
Linux 4.9.20
Ladi Prosek (1):
virtio_balloon: init 1st buffer in stats vq
Paolo Bonzini (1):
KVM: x86: cleanup the page tracking SRCU instance
Sebastian Andrzej Siewior (1):
sched/rt: Add a missing rescheduling point
Greg KH
maintainerMakefile +1 -1
@@ -1,6 +1,6 @@ VERSION = 4 PATCHLEVEL = 9 -SUBLEVEL = 19 +SUBLEVEL = 20 EXTRAVERSION = NAME = Roaring Lionus
arch/c6x/kernel/ptrace.c +0 -41
53 lines not on this page · raw message
arch/h8300/kernel/ptrace.c +5 -3
@@ -95,7 +95,8 @@ static int regs_get(struct task_struct *target,long *reg = (long *)®s;/* build user regs in buffer */ -for (r =0 ; r <ARRAY_SIZE (register_offset); r++) +BUILD_BUG_ON (sizeof (regs) %sizeof (long ) !=0 ); +for (r =0 ; r <sizeof (regs) /sizeof (long ); r++) *reg++ =h8300_get_reg (target, r); return user_regset_copyout(&pos, &count, &kbuf, &ubuf,
@@ -113,7 +114,8 @@ static int regs_set(struct task_struct *target,long *reg;/* build user regs in buffer */ -for (reg = (long *)®s, r =0 ; r <ARRAY_SIZE (register_offset); r++) +BUILD_BUG_ON (sizeof (regs) %sizeof (long ) !=0 ); +for (reg = (long *)®s, r =0 ; r <sizeof (regs) /sizeof (long ); r++) *reg++ =h8300_get_reg (target, r); ret = user_regset_copyin(&pos, &count, &kbuf, &ubuf,
@@ -122,7 +124,7 @@ static int regs_set(struct task_struct *target,return ret;/* write back to pt_regs */ -for (reg = (long *)®s, r =0 ; r <ARRAY_SIZE (register_offset); r++) +for (reg = (long *)®s, r =0 ; r <sizeof (regs) /sizeof (long ); r++)h8300_put_reg (target, r, *reg++);return 0 ; }
arch/metag/kernel/ptrace.c +15 -4
@@ -24,6 +24,16 @@* user_regset definitions. */ +static unsigned long user_txstatus (const struct pt_regs *regs) +{ +unsigned long data = (unsigned long )regs->ctx.Flags; + +if (regs->ctx.SaveMask &TBICTX_CBUF_BIT ) + data |=USER_GP_REGS_STATUS_CATCH_BIT ; + +return data; +} +int metag_gp_regs_copyout (const struct pt_regs *regs,unsigned int pos,unsigned int count,void *kbuf,void __user *ubuf)
@@ -62,9 +72,7 @@ int metag_gp_regs_copyout(const struct pt_regs *regs,if (ret) goto out;/* TXSTATUS */ - data = (unsigned long )regs->ctx.Flags; -if (regs->ctx.SaveMask &TBICTX_CBUF_BIT ) - data |=USER_GP_REGS_STATUS_CATCH_BIT ; + data =user_txstatus (regs); ret =user_regset_copyout (&pos, &count, &kbuf, &ubuf, &data,4 *25 ,4 *26 );if (ret)
@@ -119,6 +127,7 @@ int metag_gp_regs_copyin(struct pt_regs *regs,if (ret) goto out;/* TXSTATUS */ + data =user_txstatus (regs); ret =user_regset_copyin (&pos, &count, &kbuf, &ubuf, &data,4 *25 ,4 *26 );if (ret)
@@ -244,6 +253,8 @@ int metag_rp_state_copyin(struct pt_regs *regs,unsigned long long *ptr;int ret, i; +if (count <4 *13 ) +return -EINVAL ;/* Read the entire pipeline before making any changes */ ret =user_regset_copyin (&pos, &count, &kbuf, &ubuf, &rp,0 ,4 *13 );
@@ -303,7 +314,7 @@ static int metag_tls_set(struct task_struct *target, const void *kbuf, const void __user *ubuf) { int ret; -void __user *tls; +void __user *tls = target->thread.tls_ptr; ret =user_regset_copyin (&pos, &count, &kbuf, &ubuf, &tls,0 ,-1 );if (ret)
arch/mips/kernel/ptrace.c +2 -1
@@ -485,7 +485,8 @@ static int fpr_set(struct task_struct *target, &target->thread.fpu, 0, sizeof(elf_fpregset_t)); -for (i =0 ; i <NUM_FPU_REGS ; i++) { +BUILD_BUG_ON (sizeof (fpr_val) !=sizeof (elf_fpreg_t)); +for (i =0 ; i <NUM_FPU_REGS && count >=sizeof (elf_fpreg_t); i++) { err =user_regset_copyin (&pos, &count, &kbuf, &ubuf, &fpr_val, i *sizeof (elf_fpreg_t), (i +1 ) *sizeof (elf_fpreg_t));
arch/sparc/kernel/ptrace_64.c +1 -1
@@ -313,7 +313,7 @@ static int genregs64_set(struct task_struct *target, }if (!ret) { -unsigned long y; +unsigned long y = regs->y; ret = user_regset_copyin(&pos, &count, &kbuf, &ubuf, &y,
arch/x86/include/asm/kvm_page_track.h +1 -0
@@ -35,6 +35,7 @@ struct kvm_page_track_notifier_node { };void kvm_page_track_init (struct kvm *kvm); +void kvm_page_track_cleanup (struct kvm *kvm);void kvm_page_track_free_memslot (struct kvm_memory_slot *free,struct kvm_memory_slot *dont);
arch/x86/kvm/page_track.c +8 -0
@@ -156,6 +156,14 @@ bool kvm_page_track_is_active(struct kvm_vcpu *vcpu, gfn_t gfn,return !!ACCESS_ONCE (slot->arch.gfn_track[mode][index]); } +void kvm_page_track_cleanup (struct kvm *kvm) +{ +struct kvm_page_track_notifier_head *head; + + head = &kvm->arch.track_notifier_head; +cleanup_srcu_struct (&head->track_srcu); +} +void kvm_page_track_init (struct kvm *kvm) {struct kvm_page_track_notifier_head *head;
arch/x86/kvm/x86.c +1 -0
@@ -7976,6 +7976,7 @@ void kvm_arch_destroy_vm(struct kvm *kvm)kvm_free_vcpus (kvm);kvfree (rcu_dereference_check (kvm->arch.apic_map,1 ));kvm_mmu_uninit_vm (kvm); +kvm_page_track_cleanup (kvm); } void kvm_arch_free_memslot(struct kvm *kvm, struct kvm_memory_slot *free,
drivers/pinctrl/qcom/pinctrl-msm.c +0 -4
@@ -594,10 +594,6 @@ static void msm_gpio_irq_unmask(struct irq_data *d)spin_lock_irqsave (&pctrl->lock, flags); - val =readl (pctrl->regs + g->intr_status_reg); - val &= ~BIT (g->intr_status_bit); -writel (val, pctrl->regs + g->intr_status_reg); - val =readl (pctrl->regs + g->intr_cfg_reg); val |=BIT (g->intr_enable_bit);writel (val, pctrl->regs + g->intr_cfg_reg);
drivers/usb/musb/musb_core.c +1 -1
@@ -2467,8 +2467,8 @@ static int musb_remove(struct platform_device *pdev)pm_runtime_get_sync (musb->controller);musb_host_cleanup (musb);musb_gadget_cleanup (musb); -spin_lock_irqsave (&musb->lock, flags);musb_platform_disable (musb); +spin_lock_irqsave (&musb->lock, flags);musb_generic_disable (musb);spin_unlock_irqrestore (&musb->lock, flags);musb_writeb (musb->mregs,MUSB_DEVCTL ,0 );
drivers/virtio/virtio_balloon.c +2 -0
@@ -427,6 +427,8 @@ static int init_vqs(struct virtio_balloon *vb)* Prime this virtqueue with one buffer so the hypervisor can * use it to signal us later (it can't be broken yet!). */ +update_balloon_stats (vb); +sg_init_one (&sg, vb->stats,sizeof vb->stats);if (virtqueue_add_outbuf (vb->stats_vq, &sg,1 , vb,GFP_KERNEL ) <0 )
fs/crypto/crypto.c +1 -9
@@ -352,7 +352,6 @@ EXPORT_SYMBOL(fscrypt_zeroout_range);static int fscrypt_d_revalidate (struct dentry *dentry,unsigned int flags) {struct dentry *dir; -struct fscrypt_info *ci;int dir_has_key, cached_with_key;if (flags &LOOKUP_RCU )
@@ -364,18 +363,11 @@ static int fscrypt_d_revalidate(struct dentry *dentry, unsigned int flags)return 0 ; } - ci =d_inode (dir)->i_crypt_info; -if (ci && ci->ci_keyring_key && - (ci->ci_keyring_key->flags & ((1 <<KEY_FLAG_INVALIDATED ) | - (1 <<KEY_FLAG_REVOKED ) | - (1 <<KEY_FLAG_DEAD )))) - ci =NULL ; -/* this should eventually be an flag in d_flags */ spin_lock (&dentry->d_lock); cached_with_key = dentry->d_flags &DCACHE_ENCRYPTED_WITH_KEY ;spin_unlock (&dentry->d_lock); - dir_has_key = (ci !=NULL ); + dir_has_key = (d_inode (dir)->i_crypt_info !=NULL );dput (dir);/*
fs/crypto/fname.c +1 -1
@@ -350,7 +350,7 @@ int fscrypt_setup_filename(struct inode *dir, const struct qstr *iname, fname->disk_name.len = iname->len;return 0 ; } - ret =get_crypt_info (dir); + ret =fscrypt_get_encryption_info (dir);if (ret && ret != -EOPNOTSUPP )return ret;
fs/crypto/keyinfo.c +9 -43
120 lines not on this page · raw message
include/linux/fscrypto.h +0 -2
@@ -79,7 +79,6 @@ struct fscrypt_info {u8 ci_filename_mode;u8 ci_flags;struct crypto_skcipher *ci_ctfm; -struct key *ci_keyring_key;u8 ci_master_key[FS_KEY_DESCRIPTOR_SIZE ]; };
@@ -256,7 +255,6 @@ extern int fscrypt_has_permitted_context(struct inode *, struct inode *);extern int fscrypt_inherit_context (struct inode *,struct inode *,void *,bool );/* keyinfo.c */ -extern int get_crypt_info (struct inode *);extern int fscrypt_get_encryption_info (struct inode *);extern void fscrypt_put_encryption_info (struct inode *,struct fscrypt_info *);
kernel/sched/deadline.c +1 -2
@@ -1729,12 +1729,11 @@ static void switched_to_dl(struct rq *rq, struct task_struct *p)#ifdef CONFIG_SMP if (tsk_nr_cpus_allowed (p) >1 && rq->dl.overloaded)queue_push_tasks (rq); -#else +#endif if (dl_task (rq->curr))check_preempt_curr_dl (rq, p,0 );else resched_curr (rq); -#endif } }
kernel/sched/rt.c +1 -2
@@ -2198,10 +2198,9 @@ static void switched_to_rt(struct rq *rq, struct task_struct *p)#ifdef CONFIG_SMP if (tsk_nr_cpus_allowed (p) >1 && rq->rt.overloaded)queue_push_tasks (rq); -#else +#endif /* CONFIG_SMP */ if (p->prio < rq->curr->prio)resched_curr (rq); -#endif /* CONFIG_SMP */ } }
net/xfrm/xfrm_policy.c +5 -5
@@ -3062,6 +3062,11 @@ static int __net_init xfrm_net_init(struct net *net) {int rv; +/* Initialize the per-net locks here */ +spin_lock_init (&net->xfrm.xfrm_state_lock); +spin_lock_init (&net->xfrm.xfrm_policy_lock); +mutex_init (&net->xfrm.xfrm_cfg_mutex); + rv =xfrm_statistics_init (net);if (rv <0 ) goto out_statistics;
@@ -3078,11 +3083,6 @@ static int __net_init xfrm_net_init(struct net *net)if (rv <0 ) goto out; -/* Initialize the per-net locks here */ -spin_lock_init (&net->xfrm.xfrm_state_lock); -spin_lock_init (&net->xfrm.xfrm_policy_lock); -mutex_init (&net->xfrm.xfrm_cfg_mutex); -return 0 ; out:
net/xfrm/xfrm_user.c +8 -1
@@ -412,7 +412,14 @@ static inline int xfrm_replay_verify_len(struct xfrm_replay_state_esn *replay_es up =nla_data (rp); ulen =xfrm_replay_state_esn_len (up); -if (nla_len (rp) < ulen ||xfrm_replay_state_esn_len (replay_esn) != ulen) +/* Check the overall length and the internal bitmap length to avoid +* potential overflow. */ +if (nla_len (rp) < ulen || +xfrm_replay_state_esn_len (replay_esn) != ulen || + replay_esn->bmp_len != up->bmp_len) +return -EINVAL ; + +if (up->replay_window > up->bmp_len *sizeof (__u32) *8 )return -EINVAL ;return 0 ;