Linux 3.10.93
Greg KH
maintainerI'm announcing the release of the 3.10.93 kernel.
All users of the 3.10 kernel series must upgrade.
The updated 3.10.y git tree can be found at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git linux-3.10.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/kernel/stacktrace.c | 6 -- arch/powerpc/kernel/rtas.c | 3 + arch/x86/xen/enlighten.c | 6 +- crypto/ablkcipher.c | 2 crypto/algapi.c | 2 crypto/api.c | 6 +- crypto/crypto_user.c | 2 drivers/block/rbd.c | 67 +++++++++++++++------------ drivers/block/xen-blkfront.c | 3 - drivers/gpu/drm/nouveau/nouveau_gem.c | 5 +- drivers/infiniband/core/cm.c | 10 +++- drivers/iommu/amd_iommu.c | 4 - drivers/iommu/amd_iommu_types.h | 1 drivers/md/persistent-data/dm-btree-remove.c | 17 ++++-- drivers/md/persistent-data/dm-btree.c | 2 drivers/md/raid1.c | 2 drivers/md/raid10.c | 2 drivers/net/wireless/ath/ath9k/init.c | 1 drivers/net/wireless/iwlwifi/dvm/lib.c | 2 drivers/net/wireless/iwlwifi/mvm/d3.c | 12 ++-- drivers/scsi/mvsas/mv_sas.c | 2 drivers/usb/host/xhci-ring.c | 20 ++++++-- include/sound/wm8904.h | 2 kernel/module.c | 8 ++- mm/filemap.c | 9 ++- 26 files changed, 121 insertions(+), 77 deletions(-)
Cathy Avery (1):
xen-blkfront: check for null drvdata in blkback_changed (XenbusStateClosing)
Charles Keepax (1):
ASoC: wm8904: Correct number of EQ registers
Doron Tsur (1):
IB/cm: Fix rb-tree duplicate free and use-after-free
Dāvis Mosāns (1):
mvsas: Fix NULL pointer dereference in mvs_slot_task_free
Felix Fietkau (1):
ath9k: declare required extra tx headroom
Greg Kroah-Hartman (2):
xen: fix backport of previous kexec patch
Linux 3.10.93
Herbert Xu (1):
crypto: api - Only abort operations on fatal signal
Ilia Mirkin (1):
drm/nouveau/gem: return only valid domain when there's only one
Ilya Dryomov (2):
rbd: don't leak parent_spec in rbd_dev_probe_parent()
rbd: prevent kernel stack blow up on rbd map
Jan Kara (1):
mm: make sendfile(2) killable
Jes Sorensen (2):
md/raid1: submit_bio_wait() returns 0 on success md/raid10: submit_bio_wait() returns 0 on success
Joe Thornber (1):
dm btree remove: fix a bug when rebalancing nodes after removal
Joerg Roedel (1):
iommu/amd: Don't clear DTE flags when modifying it
Johannes Berg (2):
iwlwifi: dvm: fix D3 firmware PN programming
iwlwifi: mvm: fix D3 firmware PN programming
Mathias Nyman (1):
xhci: handle no ping response error properly
Mike Snitzer (1):
dm btree: fix leak of bufio-backed block in btree_split_beneath error path
Peter Zijlstra (1):
module: Fix locking in symbol_put_addr()
Ronny Hegewald (1):
rbd: require stable pages if message data CRCs are enabled
Vasant Hegde (1):
powerpc/rtas: Validate rtas.entry before calling enter_rtas()
Will Deacon (1):
Revert "ARM64: unwind: Fix PC calculation"
Greg KH
maintainerMakefile +1 -1
@@ -1,6 +1,6 @@ VERSION = 3 PATCHLEVEL = 10 -SUBLEVEL = 92 +SUBLEVEL = 93 EXTRAVERSION = NAME = TOSSUG Baby Fish
arch/arm64/kernel/stacktrace.c +1 -5
@@ -48,11 +48,7 @@ int unwind_frame(struct stackframe *frame) frame->sp = fp +0x10 ; frame->fp = *(unsigned long *)(fp); -/* -* -4 here because we care about the PC at time of bl, -* not where the return will go. -*/ - frame->pc = *(unsigned long *)(fp +8 ) -4 ; + frame->pc = *(unsigned long *)(fp +8 );return 0 ; }
arch/powerpc/kernel/rtas.c +3 -0
@@ -1041,6 +1041,9 @@ asmlinkage int ppc_rtas(struct rtas_args __user *uargs)if (!capable (CAP_SYS_ADMIN ))return -EPERM ; +if (!rtas.entry) +return -EINVAL ; +if (copy_from_user (&args, uargs,3 *sizeof (u32)) !=0 )return -EFAULT ;
arch/x86/xen/enlighten.c +3 -3
@@ -33,7 +33,7 @@#include <linux/memblock.h> #include <linux/edd.h> -#ifdef CONFIG_KEXEC_CORE +#ifdef CONFIG_KEXEC #include <linux/kexec.h> #endif
@@ -1748,7 +1748,7 @@ static struct notifier_block xen_hvm_cpu_notifier __cpuinitdata = { .notifier_call = xen_hvm_cpu_notify, }; -#ifdef CONFIG_KEXEC_CORE +#ifdef CONFIG_KEXEC static void xen_hvm_shutdown (void ) {native_machine_shutdown ();
@@ -1777,7 +1777,7 @@ static void __init xen_hvm_guest_init(void) x86_init.irqs.intr_init = xen_init_IRQ;xen_hvm_init_time_ops ();xen_hvm_init_mmu_ops (); -#ifdef CONFIG_KEXEC_CORE +#ifdef CONFIG_KEXEC machine_ops.shutdown = xen_hvm_shutdown; machine_ops.crash_shutdown = xen_hvm_crash_shutdown;#endif
crypto/ablkcipher.c +1 -1
@@ -700,7 +700,7 @@ struct crypto_ablkcipher *crypto_alloc_ablkcipher(const char *alg_name, err:if (err != -EAGAIN )break ; -if (signal_pending (current)) { +if (fatal_signal_pending (current)) { err = -EINTR ;break ; }
crypto/algapi.c +1 -1
@@ -325,7 +325,7 @@ static void crypto_wait_for_test(struct crypto_larval *larval)crypto_alg_tested (larval->alg.cra_driver_name,0 ); } - err =wait_for_completion_interruptible (&larval->completion); + err =wait_for_completion_killable (&larval->completion);WARN_ON (err); out:
crypto/api.c +3 -3
@@ -172,7 +172,7 @@ static struct crypto_alg *crypto_larval_wait(struct crypto_alg *alg)struct crypto_larval *larval = (void *)alg;long timeout; - timeout =wait_for_completion_interruptible_timeout ( + timeout =wait_for_completion_killable_timeout ( &larval->completion,60 *HZ ); alg = larval->adult;
@@ -435,7 +435,7 @@ struct crypto_tfm *crypto_alloc_base(const char *alg_name, u32 type, u32 mask) err:if (err != -EAGAIN )break ; -if (signal_pending (current)) { +if (fatal_signal_pending (current)) { err = -EINTR ;break ; }
@@ -552,7 +552,7 @@ void *crypto_alloc_tfm(const char *alg_name, err:if (err != -EAGAIN )break ; -if (signal_pending (current)) { +if (fatal_signal_pending (current)) { err = -EINTR ;break ; }
crypto/crypto_user.c +1 -1
@@ -361,7 +361,7 @@ static struct crypto_alg *crypto_user_aead_alg(const char *name, u32 type, err =PTR_ERR (alg);if (err != -EAGAIN )break ; -if (signal_pending (current)) { +if (fatal_signal_pending (current)) { err = -EINTR ;break ; }
drivers/block/rbd.c +39 -28
137 lines not on this page · raw message
drivers/block/xen-blkfront.c +2 -1
@@ -1590,7 +1590,8 @@ static void blkback_changed(struct xenbus_device *dev,break ;/* Missed the backend's Closing state -- fallthrough */ case XenbusStateClosing: -blkfront_closing (info); +if (info) +blkfront_closing (info);break ; } }
drivers/gpu/drm/nouveau/nouveau_gem.c +3 -2
@@ -177,11 +177,12 @@ nouveau_gem_info(struct drm_file *file_priv, struct drm_gem_object *gem,struct nouveau_bo *nvbo =nouveau_gem_object (gem);struct nouveau_vma *vma; -if (nvbo->bo.mem.mem_type ==TTM_PL_TT ) +if (is_power_of_2 (nvbo->valid_domains)) + rep->domain = nvbo->valid_domains; +else if (nvbo->bo.mem.mem_type ==TTM_PL_TT ) rep->domain =NOUVEAU_GEM_DOMAIN_GART ;else rep->domain =NOUVEAU_GEM_DOMAIN_VRAM ; - rep->offset = nvbo->bo.offset;if (cli->base.vm) { vma =nouveau_bo_vma_find (nvbo, cli->base.vm);
drivers/infiniband/core/cm.c +9 -1
@@ -857,6 +857,11 @@ retest:case IB_CM_SIDR_REQ_RCVD :spin_unlock_irq (&cm_id_priv->lock);cm_reject_sidr_req (cm_id_priv,IB_SIDR_REJECT ); +spin_lock_irq (&cm.lock); +if (!RB_EMPTY_NODE (&cm_id_priv->sidr_id_node)) +rb_erase (&cm_id_priv->sidr_id_node, + &cm.remote_sidr_table); +spin_unlock_irq (&cm.lock);break ;case IB_CM_REQ_SENT :ib_cancel_mad (cm_id_priv->av.port->mad_agent, cm_id_priv->msg);
@@ -3093,7 +3098,10 @@ int ib_send_cm_sidr_rep(struct ib_cm_id *cm_id,spin_unlock_irqrestore (&cm_id_priv->lock, flags);spin_lock_irqsave (&cm.lock, flags); -rb_erase (&cm_id_priv->sidr_id_node, &cm.remote_sidr_table); +if (!RB_EMPTY_NODE (&cm_id_priv->sidr_id_node)) { +rb_erase (&cm_id_priv->sidr_id_node, &cm.remote_sidr_table); +RB_CLEAR_NODE (&cm_id_priv->sidr_id_node); + }spin_unlock_irqrestore (&cm.lock, flags);return 0 ;
drivers/iommu/amd_iommu.c +2 -2
@@ -2106,8 +2106,8 @@ static void set_dte_entry(u16 devid, struct protection_domain *domain, bool ats)static void clear_dte_entry (u16 devid) {/* remove entry from the device table seen by the hardware */ - amd_iommu_dev_table[devid].data[0 ] =IOMMU_PTE_P |IOMMU_PTE_TV ; - amd_iommu_dev_table[devid].data[1 ] =0 ; + amd_iommu_dev_table[devid].data[0 ] =IOMMU_PTE_P |IOMMU_PTE_TV ; + amd_iommu_dev_table[devid].data[1 ] &=DTE_FLAG_MASK ;amd_iommu_apply_erratum_63 (devid); }
drivers/iommu/amd_iommu_types.h +1 -0
@@ -282,6 +282,7 @@#define IOMMU_PTE_IR (1ULL << 61)#define IOMMU_PTE_IW (1ULL << 62) +#define DTE_FLAG_MASK (0x3ffULL << 32)#define DTE_FLAG_IOTLB (0x01UL << 32)#define DTE_FLAG_GV (0x01ULL << 55)#define DTE_GLX_SHIFT (56)
drivers/md/persistent-data/dm-btree-remove.c +11 -6
@@ -301,11 +301,16 @@ static void redistribute3(struct dm_btree_info *info, struct btree_node *parent, {int s;uint32_t max_entries =le32_to_cpu (left->header.max_entries); -unsigned target = (nr_left + nr_center + nr_right) /3 ; -BUG_ON (target > max_entries); +unsigned total = nr_left + nr_center + nr_right; +unsigned target_right = total /3 ; +unsigned remainder = (target_right *3 ) != total; +unsigned target_left = target_right + remainder; + +BUG_ON (target_left > max_entries); +BUG_ON (target_right > max_entries);if (nr_left < nr_right) { - s = nr_left - target; + s = nr_left - target_left;if (s <0 && nr_center < -s) {/* not enough in central node */
@@ -316,10 +321,10 @@ static void redistribute3(struct dm_btree_info *info, struct btree_node *parent, }else shift (left, center, s); -shift (center, right, target - nr_right); +shift (center, right, target_right - nr_right); }else { - s = target - nr_right; + s = target_right - nr_right;if (s >0 && nr_center < s) {/* not enough in central node */ shift (center, right, nr_center);
@@ -329,7 +334,7 @@ static void redistribute3(struct dm_btree_info *info, struct btree_node *parent, }else shift (center, right, s); -shift (left, center, nr_left - target); +shift (left, center, nr_left - target_left); } *key_ptr (parent, c->index) = center->keys[0 ];
drivers/md/persistent-data/dm-btree.c +1 -1
@@ -507,7 +507,7 @@ static int btree_split_beneath(struct shadow_spine *s, uint64_t key) r =new_block (s->info, &right);if (r <0 ) { -/* FIXME: put left */ +unlock_block (s->info, left);return r; }
drivers/md/raid1.c +1 -1
@@ -2147,7 +2147,7 @@ static int narrow_write_error(struct r1bio *r1_bio, int i)md_trim_bio (wbio, sector - r1_bio->sector, sectors); wbio->bi_sector += rdev->data_offset; wbio->bi_bdev = rdev->bdev; -if (submit_bio_wait (WRITE , wbio) ==0 ) +if (submit_bio_wait (WRITE , wbio) <0 )/* failure! */ ok =rdev_set_badblocks (rdev, sector, sectors,0 )
drivers/md/raid10.c +1 -1
@@ -2597,7 +2597,7 @@ static int narrow_write_error(struct r10bio *r10_bio, int i)choose_data_offset (r10_bio, rdev) + (sector - r10_bio->sector)); wbio->bi_bdev = rdev->bdev; -if (submit_bio_wait (WRITE , wbio) ==0 ) +if (submit_bio_wait (WRITE , wbio) <0 )/* Failure! */ ok =rdev_set_badblocks (rdev, sector, sectors,0 )
drivers/net/wireless/ath/ath9k/init.c +1 -0
@@ -819,6 +819,7 @@ void ath9k_set_hw_capab(struct ath_softc *sc, struct ieee80211_hw *hw) hw->max_rate_tries =10 ; hw->sta_data_size =sizeof (struct ath_node ); hw->vif_data_size =sizeof (struct ath_vif ); + hw->extra_tx_headroom =4 ; hw->wiphy->available_antennas_rx =BIT (ah->caps.max_rxchains) -1 ; hw->wiphy->available_antennas_tx =BIT (ah->caps.max_txchains) -1 ;
drivers/net/wireless/iwlwifi/dvm/lib.c +1 -1
@@ -1023,7 +1023,7 @@ static void iwlagn_wowlan_program_keys(struct ieee80211_hw *hw,u8 *pn = seq.ccmp.pn;ieee80211_get_key_rx_seq (key, i, &seq); - aes_sc->pn = cpu_to_le64( + aes_sc[i].pn = cpu_to_le64( (u64)pn[5] | ((u64)pn[4] << 8) | ((u64)pn[3] << 16) |
drivers/net/wireless/iwlwifi/mvm/d3.c +6 -6
@@ -295,12 +295,12 @@ static void iwl_mvm_wowlan_program_keys(struct ieee80211_hw *hw,u8 *pn = seq.ccmp.pn;ieee80211_get_key_rx_seq (key, i, &seq); - aes_sc->pn =cpu_to_le64 ((u64 )pn[5 ] | - ((u64 )pn[4 ] <<8 ) | - ((u64 )pn[3 ] <<16 ) | - ((u64 )pn[2 ] <<24 ) | - ((u64 )pn[1 ] <<32 ) | - ((u64 )pn[0 ] <<40 )); + aes_sc[i].pn =cpu_to_le64 ((u64 )pn[5 ] | + ((u64 )pn[4 ] <<8 ) | + ((u64 )pn[3 ] <<16 ) | + ((u64 )pn[2 ] <<24 ) | + ((u64 )pn[1 ] <<32 ) | + ((u64 )pn[0 ] <<40 )); } data->use_rsc_tsc = true;break ;
drivers/scsi/mvsas/mv_sas.c +2 -0
@@ -987,6 +987,8 @@ static void mvs_slot_free(struct mvs_info *mvi, u32 rx_desc)static void mvs_slot_task_free (struct mvs_info *mvi,struct sas_task *task,struct mvs_slot_info *slot,u32 slot_idx) { +if (!slot) +return ;if (!slot->task)return ;if (!sas_protocol_ata (task->task_proto))
drivers/usb/host/xhci-ring.c +15 -5
@@ -2348,6 +2348,7 @@ static int handle_tx_event(struct xhci_hcd *xhci,u32 trb_comp_code;int ret =0 ;int td_num =0 ; +bool handling_skipped_tds = false; slot_id =TRB_TO_SLOT_ID (le32_to_cpu (event->flags)); xdev = xhci->devs[slot_id];
@@ -2481,6 +2482,10 @@ static int handle_tx_event(struct xhci_hcd *xhci, ep->skip = true;xhci_dbg (xhci,"Miss service interval error, set skip flag\n" ); goto cleanup; +case COMP_PING_ERR : + ep->skip = true; +xhci_dbg (xhci,"No Ping response error, Skip one Isoc TD\n" ); + goto cleanup;default :if (xhci_is_vendor_info_code (xhci, trb_comp_code)) { status =0 ;
@@ -2612,13 +2617,18 @@ static int handle_tx_event(struct xhci_hcd *xhci, ep, &status); cleanup: + + + handling_skipped_tds = ep->skip && + trb_comp_code !=COMP_MISSED_INT && + trb_comp_code !=COMP_PING_ERR ; +/* -* Do not update event ring dequeue pointer if ep->skip is set. -* Will roll back to continue process missed tds. +* Do not update event ring dequeue pointer if we're in a loop +* processing missed tds. */ -if (trb_comp_code ==COMP_MISSED_INT || !ep->skip) { +if (!handling_skipped_tds)inc_deq (xhci, xhci->event_ring); - }if (ret) { urb = td->urb;
@@ -2662,7 +2672,7 @@ cleanup:* Process them as short transfer until reach the td pointed by * the event. */ - }while (ep->skip && trb_comp_code !=COMP_MISSED_INT ); + }while (handling_skipped_tds);return 0 ; }
include/sound/wm8904.h +1 -1
@@ -119,7 +119,7 @@#define WM8904_MIC_REGS 2#define WM8904_GPIO_REGS 4#define WM8904_DRC_REGS 4 -#define WM8904_EQ_REGS 25 +#define WM8904_EQ_REGS 24/** * DRC configurations are specified with a label and a set of register
kernel/module.c +6 -2
@@ -942,11 +942,15 @@ void symbol_put_addr(void *addr)if (core_kernel_text (a))return ; -/* module_text_address is safe here: we're supposed to have reference -* to module from symbol_get, so it can't go away. */ +/* +* Even though we hold a reference on the module; we still need to +* disable preemption in order to safely traverse the data structure. +*/ +preempt_disable (); modaddr =__module_text_address (a);BUG_ON (!modaddr);module_put (modaddr); +preempt_enable (); }EXPORT_SYMBOL_GPL (symbol_put_addr);
mm/filemap.c +5 -4
@@ -2340,6 +2340,11 @@ again:break ; } +if (fatal_signal_pending (current)) { + status = -EINTR ; +break ; + } + status = a_ops->write_begin (file, mapping, pos, bytes, flags, &page, &fsdata);if (unlikely (status))
@@ -2380,10 +2385,6 @@ again: written += copied;balance_dirty_pages_ratelimited (mapping); -if (fatal_signal_pending (current)) { - status = -EINTR ; -break ; - } }while (iov_iter_count (i));return written ? written : status;