Linux 3.10.87
Greg KH
maintainerI'm announcing the release of the 3.10.87 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/arm/kernel/entry-armv.S | 3 - arch/arm/kernel/fiq.c | 9 +-- arch/arm/mach-realview/include/mach/memory.h | 2 arch/arm64/kernel/signal32.c | 5 -- arch/mips/include/asm/pgtable.h | 31 ++++++++++++ arch/mips/kernel/mips-mt-fpaff.c | 5 +- arch/mips/kernel/signal32.c | 2 arch/powerpc/kernel/signal_32.c | 2 arch/sparc/include/asm/visasm.h | 18 ++++--- arch/sparc/lib/NG4memcpy.S | 19 ++++++- arch/sparc/lib/VISsave.S | 67 --------------------------- arch/sparc/lib/ksyms.c | 4 - arch/x86/kernel/cpu/perf_event_amd.c | 34 ++++++------- arch/x86/kvm/lapic.h | 2 arch/x86/xen/enlighten.c | 40 ++++++++++++++++ drivers/block/rbd.c | 22 ++++++-- drivers/char/ipmi/ipmi_si_intf.c | 2 drivers/crypto/ixp4xx_crypto.c | 1 drivers/gpu/drm/radeon/radeon_combios.c | 7 ++ drivers/md/bitmap.c | 2 drivers/md/md.c | 4 - drivers/md/raid1.c | 10 ++-- drivers/mfd/sm501.c | 2 drivers/scsi/ipr.c | 28 +++++++---- drivers/scsi/ipr.h | 1 drivers/scsi/sg.c | 3 + drivers/target/iscsi/iscsi_target.c | 18 ++++++- drivers/target/iscsi/iscsi_target_core.h | 1 drivers/target/iscsi/iscsi_target_login.c | 43 ++++++----------- drivers/target/iscsi/iscsi_target_login.h | 1 drivers/target/iscsi/iscsi_target_nego.c | 34 +++++++++++++ drivers/usb/host/xhci-ring.c | 2 drivers/usb/serial/sierra.c | 1 drivers/xen/gntdev.c | 2 fs/notify/mark.c | 30 ++++++++++-- fs/ocfs2/dlmglue.c | 10 ++-- fs/signalfd.c | 5 +- ipc/mqueue.c | 5 -- kernel/signal.c | 7 +- mm/vmscan.c | 11 +--- sound/pci/hda/patch_cirrus.c | 4 - 42 files changed, 301 insertions(+), 200 deletions(-)
Al Viro (1):
sg_start_req(): make sure that there's not too many elements in iovec
Alex Deucher (1):
drm/radeon/combios: add some validation of lvds values
Amanieu d'Antras (3):
signalfd: fix information leak in signalfd_copyinfo
signal: fix information leak in copy_siginfo_to_user
signal: fix information leak in copy_siginfo_from_user32
Andy Lutomirski (1):
x86/xen: Probe target addresses in set_aliased_prot() before the hypercall
Arnd Bergmann (1):
ARM: realview: fix sparsemem build
Benjamin Randazzo (1):
md: use kzalloc() when bitmap is disabled
Brian King (3):
ipr: Fix locking for unit attention handling
ipr: Fix incorrect trace indexing
ipr: Fix invalid array indexing for HRRQ
Dan Carpenter (1):
ALSA: hda - fix cs4210_spdif_automute()
David Daney (1):
MIPS: Make set_pte() SMP safe.
David S. Miller (2):
sparc64: Fix FPU register corruption with AES crypto offload.
sparc64: Fix userspace FPU register corruptions.
Dirk Behme (1):
USB: sierra: add 1199:68AB device ID
Fabio Estevam (1):
ARM: 7819/1: fiq: Cast the first argument of flush_icache_range()
Felix Fietkau (1):
MIPS: Fix sched_getaffinity with MT FPAFF enabled
Greg Kroah-Hartman (1):
Linux 3.10.87
Guenter Roeck (1):
mfd: sm501: dbg_regs attribute must be read-only
Herbert Xu (1):
crypto: ixp4xx - Remove bogus BUG_ON on scattered dst buffer
Ilya Dryomov (1):
rbd: fix copyup completion race
Jan Kara (1):
fsnotify: fix oops in fsnotify_clear_marks_by_group_flags()
Joseph Qi (1):
ocfs2: fix BUG in ocfs2_downconvert_thread_do_work()
Marcus Gelderie (1):
ipc: modify message queue accounting to not take kernel data structures into account
Marek Marczykowski-Górecki (1):
xen/gntdevt: Fix race condition in gntdev_release()
Mathias Nyman (1):
xhci: fix off by one error in TRB DMA address boundary check
Michal Hocko (1):
mm, vmscan: Do not wait for page writeback for GFP_NOFS allocations
NeilBrown (2):
md/raid1: extend spinlock to protect raid1_end_read_request against inconsistencies md/bitmap: return an error when bitmap superblock is corrupt.
Nicholas Bellinger (1):
iscsi-target: Fix iscsit_start_kthreads failure OOPs
Paolo Bonzini (1):
kvm: x86: fix kvm_apic_has_events to check for NULL pointer
Peter Zijlstra (1):
perf/x86/amd: Rework AMD PMU init code
Russell King (2):
ARM: Fix !kuser helpers case
ARM: Fix FIQ code on VIVT CPUs
Xie XiuQi (1):
ipmi: fix timeout calculation when bmc is disconnected
Greg KH
maintainerMakefile +1 -1
@@ -1,6 +1,6 @@ VERSION = 3 PATCHLEVEL = 10 -SUBLEVEL = 86 +SUBLEVEL = 87 EXTRAVERSION = NAME = TOSSUG Baby Fish
arch/arm/kernel/entry-armv.S +2 -1
@@ -358,7 +358,8 @@ ENDPROC(__pabt_svc) .endm .macro kuser_cmpxchg_check -#if !defined(CONFIG_CPU_32v6K) && !defined(CONFIG_NEEDS_SYSCALL_FOR_CMPXCHG) +#if !defined(CONFIG_CPU_32v6K) && defined(CONFIG_KUSER_HELPERS) && \ + !defined(CONFIG_NEEDS_SYSCALL_FOR_CMPXCHG) #ifndef CONFIG_MMU #warning "NPTL on non MMU needs fixing" #else
arch/arm/kernel/fiq.c +3 -6
@@ -84,17 +84,14 @@ int show_fiq_list(struct seq_file *p, int prec)void set_fiq_handler (void *start,unsigned int length) { -#if defined(CONFIG_CPU_USE_DOMAINS ) -void *base = (void *)0xffff0000 ; -#else void *base = vectors_page; -#endif unsigned offset =FIQ_OFFSET ;memcpy (base + offset, start, length); +if (!cache_is_vipt_nonaliasing ()) +flush_icache_range ((unsigned long )base + offset, offset + + length);flush_icache_range (0xffff0000 + offset,0xffff0000 + offset + length); -if (!vectors_high ()) -flush_icache_range (offset, offset + length); }int claim_fiq (struct fiq_handler *f)
arch/arm/mach-realview/include/mach/memory.h +2 -0
@@ -56,6 +56,8 @@#define PAGE_OFFSET1 (PAGE_OFFSET + 0x10000000)#define PAGE_OFFSET2 (PAGE_OFFSET + 0x30000000) +#define PHYS_OFFSET PLAT_PHYS_OFFSET +#define __phys_to_virt (phys) \ ((phys) >= 0x80000000 ? (phys) - 0x80000000 + PAGE_OFFSET2 : \ (phys) >= 0x20000000 ? (phys) - 0x20000000 + PAGE_OFFSET1 : \
arch/arm64/kernel/signal32.c +2 -3
@@ -193,7 +193,8 @@ int copy_siginfo_to_user32(compat_siginfo_t __user *to, siginfo_t *from)* Other callers might not initialize the si_lsb field, * so check explicitely for the right codes here. */ -if (from->si_code ==BUS_MCEERR_AR || from->si_code ==BUS_MCEERR_AO ) +if (from->si_signo ==SIGBUS && + (from->si_code ==BUS_MCEERR_AR || from->si_code ==BUS_MCEERR_AO )) err |=__put_user (from->si_addr_lsb, &to->si_addr_lsb);#endif break ;
@@ -220,8 +221,6 @@ int copy_siginfo_to_user32(compat_siginfo_t __user *to, siginfo_t *from)int copy_siginfo_from_user32 (siginfo_t *to,compat_siginfo_t __user *from) { -memset (to,0 ,sizeof *to); -if (copy_from_user (to, from, __ARCH_SI_PREAMBLE_SIZE) ||copy_from_user (to->_sifields._pad, from->_sifields._pad,SI_PAD_SIZE ))
arch/mips/include/asm/pgtable.h +31 -0
@@ -150,8 +150,39 @@ static inline void set_pte(pte_t *ptep, pte_t pteval)* Make sure the buddy is global too (if it's !none, * it better already be global) */ +#ifdef CONFIG_SMP +/* +* For SMP, multiple CPUs can race, so we need to do +* this atomically. +*/ +#ifdef CONFIG_64BIT +#define LL_INSN "lld" +#define SC_INSN "scd" +#else /* CONFIG_32BIT */ +#define LL_INSN "ll" +#define SC_INSN "sc" +#endif +unsigned long page_global = _PAGE_GLOBAL; +unsigned long tmp; + + __asm__ __volatile__ ( +" .set push\n" +" .set noreorder\n" +"1: " LL_INSN " %[tmp], %[buddy]\n" +" bnez %[tmp], 2f\n" +" or %[tmp], %[tmp], %[global]\n" +" " SC_INSN " %[tmp], %[buddy]\n" +" beqz %[tmp], 1b\n" +" nop\n" +"2:\n" +" .set pop" + : [buddy]"+m" (buddy->pte), + [tmp]"=&r" (tmp) + : [global]"r" (page_global)); +#else /* !CONFIG_SMP */ if (pte_none (*buddy))pte_val (*buddy) =pte_val (*buddy) | _PAGE_GLOBAL; +#endif /* CONFIG_SMP */ }#endif }
arch/mips/kernel/mips-mt-fpaff.c +3 -2
@@ -154,7 +154,7 @@ asmlinkage long mipsmt_sys_sched_getaffinity(pid_t pid, unsigned int len, unsigned long __user *user_mask_ptr) {unsigned int real_len; -cpumask_t mask; +cpumask_t allowed, mask;int retval;struct task_struct *p;
@@ -173,7 +173,8 @@ asmlinkage long mipsmt_sys_sched_getaffinity(pid_t pid, unsigned int len,if (retval) goto out_unlock; -cpumask_and (&mask, &p->thread.user_cpus_allowed, cpu_possible_mask); +cpumask_or (&allowed, &p->thread.user_cpus_allowed, &p->cpus_allowed); +cpumask_and (&mask, &allowed, cpu_active_mask); out_unlock:read_unlock (&tasklist_lock);
arch/mips/kernel/signal32.c +0 -2
@@ -368,8 +368,6 @@ int copy_siginfo_to_user32(compat_siginfo_t __user *to, siginfo_t *from)int copy_siginfo_from_user32 (siginfo_t *to,compat_siginfo_t __user *from) { -memset (to,0 ,sizeof *to); -if (copy_from_user (to, from,3 *sizeof (int )) ||copy_from_user (to->_sifields._pad, from->_sifields._pad,SI_PAD_SIZE32 ))
arch/powerpc/kernel/signal_32.c +0 -2
@@ -949,8 +949,6 @@ int copy_siginfo_to_user32(struct compat_siginfo __user *d, siginfo_t *s)int copy_siginfo_from_user32 (siginfo_t *to,struct compat_siginfo __user *from) { -memset (to,0 ,sizeof *to); -if (copy_from_user (to, from,3 *sizeof (int )) ||copy_from_user (to->_sifields._pad, from->_sifields._pad,SI_PAD_SIZE32 ))
arch/sparc/include/asm/visasm.h +10 -8
@@ -28,18 +28,20 @@* Must preserve %o5 between VISEntryHalf and VISExitHalf */ #define VISEntryHalf \ + VISEntry + +#define VISExitHalf \ + VISExit + +#define VISEntryHalfFast (fail_label) \ rd %fprs, %o5; \ andcc %o5, FPRS_FEF, %g0; \ be,pt %icc, 297f; \ - sethi %hi(298f), %g7; \ - sethi %hi(VISenterhalf), %g1; \ - jmpl %g1 + %lo(VISenterhalf), %g0; \ - or %g7, %lo(298f), %g7; \ - clr %o5; \ -297: wr %o5, FPRS_FEF, %fprs; \ -298: + nop; \ + ba,a,pt %xcc, fail_label; \ +297: wr %o5, FPRS_FEF, %fprs; -#define VISExitHalf \ +#define VISExitHalfFast \ wr %o5, 0, %fprs;#ifndef __ASSEMBLY__
arch/sparc/lib/NG4memcpy.S +17 -2
@@ -41,6 +41,10 @@ #endif #endif +#if !defined(EX_LD) && !defined(EX_ST) +#define NON_USER_COPY +#endif + #ifndef EX_LD #define EX_LD(x) x #endif
@@ -197,9 +201,13 @@ FUNC_NAME: /* %o0=dst, %o1=src, %o2=len */ mov EX_RETVAL(%o3), %o0 .Llarge_src_unaligned: +#ifdef NON_USER_COPY + VISEntryHalfFast(.Lmedium_vis_entry_fail) +#else + VISEntryHalf +#endif andn %o2, 0x3f, %o4 sub %o2, %o4, %o2 - VISEntryHalf alignaddr %o1, %g0, %g1 add %o1, %o4, %o1 EX_LD(LOAD(ldd, %g1 + 0x00, %f0))
@@ -232,14 +240,21 @@ FUNC_NAME: /* %o0=dst, %o1=src, %o2=len */ add %o0, 0x40, %o0 bne,pt %icc, 1b LOAD(prefetch, %g1 + 0x200, #n_reads_strong) +#ifdef NON_USER_COPY + VISExitHalfFast +#else VISExitHalf - +#endif brz,pn %o2, .Lexit cmp %o2, 19 ble,pn %icc, .Lsmall_unaligned nop ba,a,pt %icc, .Lmedium_unaligned +#ifdef NON_USER_COPY +.Lmedium_vis_entry_fail: + or %o0, %o1, %g2 +#endif .Lmedium: LOAD(prefetch, %o1 + 0x40, #n_reads_strong) andcc %g2, 0x7, %g0
arch/sparc/lib/VISsave.S +2 -65
76 lines not on this page · raw message
arch/sparc/lib/ksyms.c +0 -4
@@ -126,10 +126,6 @@ EXPORT_SYMBOL(copy_user_page);void VISenter (void );EXPORT_SYMBOL (VISenter); -/* CRYPTO code needs this */ -void VISenterhalf (void ); -EXPORT_SYMBOL (VISenterhalf); -extern void xor_vis_2 (unsigned long ,unsigned long *,unsigned long *);extern void xor_vis_3 (unsigned long ,unsigned long *,unsigned long *,unsigned long *);
arch/x86/kernel/cpu/perf_event_amd.c +17 -17
@@ -648,48 +648,48 @@ static __initconst const struct x86_pmu amd_pmu = { .cpu_dead = amd_pmu_cpu_dead, }; -static int setup_event_constraints (void ) +static int __init amd_core_pmu_init (void ) { -if (boot_cpu_data.x86 ==0x15 ) +if (!cpu_has_perfctr_core) +return 0 ; + +switch (boot_cpu_data.x86) { +case 0x15 : +pr_cont ("Fam15h " ); x86_pmu.get_event_constraints = amd_get_event_constraints_f15h; -return 0 ; -} +break ; -static int setup_perfctr_core (void ) -{ -if (!cpu_has_perfctr_core) { -WARN (x86_pmu.get_event_constraints == amd_get_event_constraints_f15h, -KERN_ERR "Odd, counter constraints enabled but no core perfctrs detected!" ); +default : +pr_err ("core perfctr but no constraints; unknown hardware!\n" );return -ENODEV ; } -WARN (x86_pmu.get_event_constraints == amd_get_event_constraints, -KERN_ERR "hw perf events core counters need constraints handler!" ); -/* * If core performance counter extensions exists, we must use * MSR_F15H_PERF_CTL/MSR_F15H_PERF_CTR msrs. See also -* x86_pmu_addr_offset(). +* amd_pmu_addr_offset(). */ x86_pmu.eventsel =MSR_F15H_PERF_CTL ; x86_pmu.perfctr =MSR_F15H_PERF_CTR ; x86_pmu.num_counters =AMD64_NUM_COUNTERS_CORE ; -printk (KERN_INFO "perf: AMD core performance counters detected\n" ); - +pr_cont ("core perfctr, " );return 0 ; }__init int amd_pmu_init (void ) { +int ret; +/* Performance-monitoring supported from K7 and later: */ if (boot_cpu_data.x86 <6 )return -ENODEV ; x86_pmu = amd_pmu; -setup_event_constraints (); -setup_perfctr_core (); + ret =amd_core_pmu_init (); +if (ret) +return ret;/* Events are common for all AMDs */ memcpy(hw_cache_event_ids, amd_hw_cache_event_ids,
arch/x86/kvm/lapic.h +1 -1
@@ -165,7 +165,7 @@ static inline u16 apic_logical_id(struct kvm_apic_map *map, u32 ldr)static inline bool kvm_apic_has_events (struct kvm_vcpu *vcpu) { -return vcpu->arch.apic->pending_events; +return kvm_vcpu_has_lapic (vcpu) && vcpu->arch.apic->pending_events; }bool kvm_apic_pending_eoi (struct kvm_vcpu *vcpu,int vector);
arch/x86/xen/enlighten.c +40 -0
@@ -481,6 +481,7 @@ static void set_aliased_prot(void *v, pgprot_t prot)pte_t pte;unsigned long pfn;struct page *page; +unsigned char dummy; ptep =lookup_address ((unsigned long )v, &level);BUG_ON (ptep ==NULL );
@@ -490,6 +491,32 @@ static void set_aliased_prot(void *v, pgprot_t prot) pte =pfn_pte (pfn, prot); +/* +* Careful: update_va_mapping() will fail if the virtual address +* we're poking isn't populated in the page tables. We don't +* need to worry about the direct map (that's always in the page +* tables), but we need to be careful about vmap space. In +* particular, the top level page table can lazily propagate +* entries between processes, so if we've switched mms since we +* vmapped the target in the first place, we might not have the +* top-level page table entry populated. +* +* We disable preemption because we want the same mm active when +* we probe the target and when we issue the hypercall. We'll +* have the same nominal mm, but if we're a kernel thread, lazy +* mm dropping could change our pgd. +* +* Out of an abundance of caution, this uses __get_user() to fault +* in the target address just in case there's some obscure case +* in which the target address isn't readable. +*/ + +preempt_disable (); + +pagefault_disable ();/* Avoid warnings due to being atomic. */ +__get_user (dummy, (unsigned char __user __force *)v); +pagefault_enable (); +if (HYPERVISOR_update_va_mapping ((unsigned long )v, pte,0 ))BUG ();
@@ -501,6 +528,8 @@ static void set_aliased_prot(void *v, pgprot_t prot)BUG (); }else kmap_flush_unused (); + +preempt_enable (); }static void xen_alloc_ldt (struct desc_struct *ldt,unsigned entries)
@@ -508,6 +537,17 @@ static void xen_alloc_ldt(struct desc_struct *ldt, unsigned entries)const unsigned entries_per_page =PAGE_SIZE /LDT_ENTRY_SIZE ;int i; +/* +* We need to mark the all aliases of the LDT pages RO. We +* don't need to call vm_flush_aliases(), though, since that's +* only responsible for flushing aliases out the TLBs, not the +* page tables, and Xen will flush the TLB for us if needed. +* +* To avoid confusing future readers: none of this is necessary +* to load the LDT. The hypervisor only checks this when the +* LDT is faulted in due to subsequent descriptor access. +*/ +for (i =0 ; i < entries; i += entries_per_page)set_aliased_prot (ldt + i,PAGE_KERNEL_RO ); }
drivers/block/rbd.c +17 -5
@@ -457,6 +457,7 @@ void rbd_warn(struct rbd_device *rbd_dev, const char *fmt, ...)# define rbd_assert (expr) ((void) 0)#endif /* !RBD_DEBUG */ +static void rbd_osd_copyup_callback (struct rbd_obj_request *obj_request);static int rbd_img_obj_request_submit (struct rbd_obj_request *obj_request);static void rbd_img_parent_read (struct rbd_obj_request *obj_request);static void rbd_dev_remove_parent (struct rbd_device *rbd_dev);
@@ -1670,6 +1671,16 @@ static void rbd_osd_stat_callback(struct rbd_obj_request *obj_request)obj_request_done_set (obj_request); } +static void rbd_osd_call_callback (struct rbd_obj_request *obj_request) +{ +dout ("%s: obj %p\n" , __func__, obj_request); + +if (obj_request_img_data_test (obj_request)) +rbd_osd_copyup_callback (obj_request); +else +obj_request_done_set (obj_request); +} +static void rbd_osd_req_callback (struct ceph_osd_request *osd_req,struct ceph_msg *msg) {
@@ -1708,6 +1719,8 @@ static void rbd_osd_req_callback(struct ceph_osd_request *osd_req,rbd_osd_stat_callback (obj_request);break ;case CEPH_OSD_OP_CALL : +rbd_osd_call_callback (obj_request); +break ;case CEPH_OSD_OP_NOTIFY_ACK :case CEPH_OSD_OP_WATCH :rbd_osd_trivial_callback (obj_request);
@@ -2305,13 +2318,15 @@ out_unwind: }static void -rbd_img_obj_copyup_callback (struct rbd_obj_request *obj_request) +rbd_osd_copyup_callback (struct rbd_obj_request *obj_request) {struct rbd_img_request *img_request;struct rbd_device *rbd_dev;struct page **pages;u32 page_count; +dout ("%s: obj %p\n" , __func__, obj_request); +rbd_assert (obj_request->type ==OBJ_REQUEST_BIO );rbd_assert (obj_request_img_data_test (obj_request)); img_request = obj_request->img_request;
@@ -2337,9 +2352,7 @@ rbd_img_obj_copyup_callback(struct rbd_obj_request *obj_request)if (!obj_request->result) obj_request->xferred = obj_request->length; -/* Finish up with the normal image object callback */ - -rbd_img_obj_callback (obj_request); +obj_request_done_set (obj_request); } static void
@@ -2436,7 +2449,6 @@ rbd_img_obj_parent_read_full_callback(struct rbd_img_request *img_request)/* All set, send it off. */ - orig_request->callback = rbd_img_obj_copyup_callback; osdc = &rbd_dev->rbd_client->client->osdc; img_result =rbd_obj_request_submit (osdc, orig_request);if (!img_result)
drivers/char/ipmi/ipmi_si_intf.c +1 -1
@@ -2717,7 +2717,7 @@ static int wait_for_msg_done(struct smi_info *smi_info) smi_result == SI_SM_CALL_WITH_TICK_DELAY) {schedule_timeout_uninterruptible (1 ); smi_result = smi_info->handlers->event ( - smi_info->si_sm,100 ); + smi_info->si_sm,jiffies_to_usecs (1 )); } else if (smi_result == SI_SM_CALL_WITHOUT_DELAY) { smi_result = smi_info->handlers->event ( smi_info->si_sm,0 );
drivers/crypto/ixp4xx_crypto.c +0 -1
@@ -915,7 +915,6 @@ static int ablk_perform(struct ablkcipher_request *req, int encrypt) crypt->mode |=NPE_OP_NOT_IN_PLACE ;/* This was never tested by Intel * for more than one dst buffer, I think. */ -BUG_ON (req->dst->length < nbytes); req_ctx->dst =NULL ;if (!chainup_buffers (dev, req->dst, nbytes, &dst_hook, flags,DMA_FROM_DEVICE ))
drivers/gpu/drm/radeon/radeon_combios.c +6 -1
@@ -1271,10 +1271,15 @@ struct radeon_encoder_lvds *radeon_combios_get_lvds_info(struct radeon_encoderif ((RBIOS16 (tmp) == lvds->native_mode.hdisplay) && (RBIOS16 (tmp +2 ) == lvds->native_mode.vdisplay)) { +u32 hss = (RBIOS16 (tmp +21 ) -RBIOS16 (tmp +19 ) -1 ) *8 ; + +if (hss > lvds->native_mode.hdisplay) + hss = (10 -1 ) *8 ; + lvds->native_mode.htotal = lvds->native_mode.hdisplay + (RBIOS16 (tmp +17 ) -RBIOS16 (tmp +19 )) *8 ; lvds->native_mode.hsync_start = lvds->native_mode.hdisplay + - (RBIOS16 (tmp +21 ) -RBIOS16 (tmp +19 ) -1 ) *8 ; + hss; lvds->native_mode.hsync_end = lvds->native_mode.hsync_start + (RBIOS8 (tmp +23 ) *8 );
drivers/md/bitmap.c +2 -0
@@ -564,6 +564,8 @@ static int bitmap_read_sb(struct bitmap *bitmap)if (err)return err; + err = -EINVAL ; + sb =kmap_atomic (sb_page); chunksize =le32_to_cpu (sb->chunksize);
drivers/md/md.c +2 -2
@@ -5628,9 +5628,9 @@ static int get_bitmap_file(struct mddev * mddev, void __user * arg)int err = -ENOMEM ;if (md_allow_write (mddev)) - file =kmalloc (sizeof (*file),GFP_NOIO ); + file =kzalloc (sizeof (*file),GFP_NOIO );else - file =kmalloc (sizeof (*file),GFP_KERNEL ); + file =kzalloc (sizeof (*file),GFP_KERNEL );if (!file) goto out;
drivers/md/raid1.c +6 -4
@@ -1382,6 +1382,7 @@ static void error(struct mddev *mddev, struct md_rdev *rdev) {char b[BDEVNAME_SIZE ];struct r1conf *conf = mddev->private; +unsigned long flags;/* * If it is not operational, then we have already marked it as dead
@@ -1401,14 +1402,13 @@ static void error(struct mddev *mddev, struct md_rdev *rdev)return ; }set_bit (Blocked, &rdev->flags); +spin_lock_irqsave (&conf->device_lock, flags);if (test_and_clear_bit (In_sync, &rdev->flags)) { -unsigned long flags; -spin_lock_irqsave (&conf->device_lock, flags); mddev->degraded++;set_bit (Faulty, &rdev->flags); -spin_unlock_irqrestore (&conf->device_lock, flags); }else set_bit (Faulty, &rdev->flags); +spin_unlock_irqrestore (&conf->device_lock, flags);/* * if recovery is running, make sure it aborts. */
@@ -1466,7 +1466,10 @@ static int raid1_spare_active(struct mddev *mddev)* Find all failed disks within the RAID1 configuration * and mark them readable. * Called under mddev lock, so rcu protection not needed. +* device_lock used to avoid races with raid1_end_read_request +* which expects 'In_sync' flags and ->degraded to be consistent. */ +spin_lock_irqsave (&conf->device_lock, flags);for (i =0 ; i < conf->raid_disks; i++) {struct md_rdev *rdev = conf->mirrors[i].rdev;struct md_rdev *repl = conf->mirrors[conf->raid_disks + i].rdev;
@@ -1496,7 +1499,6 @@ static int raid1_spare_active(struct mddev *mddev)sysfs_notify_dirent_safe (rdev->sysfs_state); } } -spin_lock_irqsave (&conf->device_lock, flags); mddev->degraded -= count;spin_unlock_irqrestore (&conf->device_lock, flags);
drivers/mfd/sm501.c +1 -1
@@ -1232,7 +1232,7 @@ static ssize_t sm501_dbg_regs(struct device *dev, } -static DEVICE_ATTR(dbg_regs, 0666, sm501_dbg_regs, NULL); +static DEVICE_ATTR(dbg_regs, 0444, sm501_dbg_regs, NULL);/* sm501_init_reg *
drivers/scsi/ipr.c +18 -10
@@ -554,9 +554,10 @@ static void ipr_trc_hook(struct ipr_cmnd *ipr_cmd, {struct ipr_trace_entry *trace_entry;struct ipr_ioa_cfg *ioa_cfg = ipr_cmd->ioa_cfg; +unsigned int trace_index; - trace_entry = &ioa_cfg->trace[atomic_add_return - (1 , &ioa_cfg->trace_index)%IPR_NUM_TRACE_ENTRIES ]; + trace_index =atomic_add_return (1 , &ioa_cfg->trace_index) &IPR_TRACE_INDEX_MASK ; + trace_entry = &ioa_cfg->trace[trace_index]; trace_entry->time = jiffies; trace_entry->op_code = ipr_cmd->ioarcb.cmd_pkt.cdb[0 ]; trace_entry->type = type;
@@ -1006,10 +1007,15 @@ static void ipr_send_blocking_cmd(struct ipr_cmnd *ipr_cmd,static int ipr_get_hrrq_index (struct ipr_ioa_cfg *ioa_cfg) { +unsigned int hrrq; +if (ioa_cfg->hrrq_num ==1 ) -return 0 ; -else -return (atomic_add_return (1 , &ioa_cfg->hrrq_index) % (ioa_cfg->hrrq_num -1 )) +1 ; + hrrq =0 ; +else { + hrrq =atomic_add_return (1 , &ioa_cfg->hrrq_index); + hrrq = (hrrq % (ioa_cfg->hrrq_num -1 )) +1 ; + } +return hrrq; }/**
@@ -6141,21 +6147,23 @@ static void ipr_scsi_done(struct ipr_cmnd *ipr_cmd)struct ipr_ioa_cfg *ioa_cfg = ipr_cmd->ioa_cfg;struct scsi_cmnd *scsi_cmd = ipr_cmd->scsi_cmd;u32 ioasc =be32_to_cpu (ipr_cmd->s.ioasa.hdr.ioasc); -unsigned long hrrq_flags; +unsigned long lock_flags;scsi_set_resid (scsi_cmd,be32_to_cpu (ipr_cmd->s.ioasa.hdr.residual_data_len));if (likely (IPR_IOASC_SENSE_KEY (ioasc) ==0 )) {scsi_dma_unmap (scsi_cmd); -spin_lock_irqsave (ipr_cmd->hrrq->lock, hrrq_flags); +spin_lock_irqsave (ipr_cmd->hrrq->lock, lock_flags);list_add_tail (&ipr_cmd->queue, &ipr_cmd->hrrq->hrrq_free_q); scsi_cmd->scsi_done (scsi_cmd); -spin_unlock_irqrestore (ipr_cmd->hrrq->lock, hrrq_flags); +spin_unlock_irqrestore (ipr_cmd->hrrq->lock, lock_flags); }else { -spin_lock_irqsave (ipr_cmd->hrrq->lock, hrrq_flags); +spin_lock_irqsave (ioa_cfg->host->host_lock, lock_flags); +spin_lock (&ipr_cmd->hrrq->_lock);ipr_erp_start (ioa_cfg, ipr_cmd); -spin_unlock_irqrestore (ipr_cmd->hrrq->lock, hrrq_flags); +spin_unlock (&ipr_cmd->hrrq->_lock); +spin_unlock_irqrestore (ioa_cfg->host->host_lock, lock_flags); } }
drivers/scsi/ipr.h +1 -0
@@ -1452,6 +1452,7 @@ struct ipr_ioa_cfg {#define IPR_NUM_TRACE_INDEX_BITS 8#define IPR_NUM_TRACE_ENTRIES (1 << IPR_NUM_TRACE_INDEX_BITS) +#define IPR_TRACE_INDEX_MASK (IPR_NUM_TRACE_ENTRIES - 1)#define IPR_TRACE_SIZE (sizeof(struct ipr_trace_entry) * IPR_NUM_TRACE_ENTRIES)char trace_start[8 ];#define IPR_TRACE_START_LABEL "trace"
drivers/scsi/sg.c +3 -0
@@ -1694,6 +1694,9 @@ static int sg_start_req(Sg_request *srp, unsigned char *cmd) md->from_user =0 ; } +if (unlikely (iov_count >UIO_MAXIOV )) +return -EINVAL ; +if (iov_count) {int len, size =sizeof (struct sg_iovec ) * iov_count;struct iovec *iov;
drivers/target/iscsi/iscsi_target.c +15 -3
@@ -3874,7 +3874,13 @@ get_immediate: } transport_err: -iscsit_take_action_for_connection_exit (conn); +/* +* Avoid the normal connection failure code-path if this connection +* is still within LOGIN mode, and iscsi_np process context is +* responsible for cleaning up the early connection failure. +*/ +if (conn->conn_state !=TARG_CONN_STATE_IN_LOGIN ) +iscsit_take_action_for_connection_exit (conn); out:return 0 ; }
@@ -3956,7 +3962,7 @@ reject:int iscsi_target_rx_thread (void *arg) { -int ret; +int ret, rc;u8 buffer[ISCSI_HDR_LEN ], opcode;u32 checksum =0 , digest =0 ;struct iscsi_conn *conn = arg;
@@ -3966,10 +3972,16 @@ int iscsi_target_rx_thread(void *arg)* connection recovery / failure event can be triggered externally. */ allow_signal (SIGINT ); +/* +* Wait for iscsi_post_login_handler() to complete before allowing +* incoming iscsi/tcp socket I/O, and/or failing the connection. +*/ + rc =wait_for_completion_interruptible (&conn->rx_login_comp); +if (rc <0 ) +return 0 ;if (conn->conn_transport->transport_type ==ISCSI_INFINIBAND ) {struct completion comp; -int rc;init_completion (&comp); rc =wait_for_completion_interruptible (&comp);
drivers/target/iscsi/iscsi_target_core.h +1 -0
@@ -589,6 +589,7 @@ struct iscsi_conn {int bitmap_id;int rx_thread_active;struct task_struct *rx_thread; +struct completion rx_login_comp;int tx_thread_active;struct task_struct *tx_thread;/* list_head for session connection list */
drivers/target/iscsi/iscsi_target_login.c +16 -27
107 lines not on this page · raw message
drivers/target/iscsi/iscsi_target_login.h +1 -0
@@ -12,6 +12,7 @@ extern int iscsit_accept_np(struct iscsi_np *, struct iscsi_conn *);extern int iscsit_get_login_rx (struct iscsi_conn *,struct iscsi_login *);extern int iscsit_put_login_tx (struct iscsi_conn *,struct iscsi_login *,u32 );extern void iscsit_free_conn (struct iscsi_np *,struct iscsi_conn *); +extern int iscsit_start_kthreads (struct iscsi_conn *);extern int iscsi_target_login_thread (void *);extern int iscsi_login_disable_FIM_keys (struct iscsi_param_list *,struct iscsi_conn *);
drivers/target/iscsi/iscsi_target_nego.c +33 -1
@@ -19,6 +19,7 @@******************************************************************************/ #include <linux/ctype.h> +#include <linux/kthread.h> #include <scsi/iscsi_proto.h> #include <target/target_core_base.h> #include <target/target_core_fabric.h>
@@ -352,10 +353,24 @@ static int iscsi_target_do_tx_login_io(struct iscsi_conn *conn, struct iscsi_log ntohl(login_rsp->statsn), login->rsp_length); padding = ((-login->rsp_length) &3 ); +/* +* Before sending the last login response containing the transition +* bit for full-feature-phase, go ahead and start up TX/RX threads +* now to avoid potential resource allocation failures after the +* final login response has been sent. +*/ +if (login->login_complete) { +int rc =iscsit_start_kthreads (conn); +if (rc) { +iscsit_tx_login_rsp (conn,ISCSI_STATUS_CLS_TARGET_ERR , +ISCSI_LOGIN_STATUS_NO_RESOURCES ); +return -1 ; + } + }if (conn->conn_transport->iscsit_put_login_tx (conn, login, login->rsp_length + padding) <0 ) -return -1 ; + goto err; login->rsp_length =0 ;mutex_lock (&sess->cmdsn_mutex);
@@ -364,6 +379,23 @@ static int iscsi_target_do_tx_login_io(struct iscsi_conn *conn, struct iscsi_logmutex_unlock (&sess->cmdsn_mutex);return 0 ; + +err: +if (login->login_complete) { +if (conn->rx_thread && conn->rx_thread_active) { +send_sig (SIGINT , conn->rx_thread,1 ); +kthread_stop (conn->rx_thread); + } +if (conn->tx_thread && conn->tx_thread_active) { +send_sig (SIGINT , conn->tx_thread,1 ); +kthread_stop (conn->tx_thread); + } +spin_lock (&iscsit_global->ts_bitmap_lock); +bitmap_release_region (iscsit_global->ts_bitmap, conn->bitmap_id, +get_order (1 )); +spin_unlock (&iscsit_global->ts_bitmap_lock); + } +return -1 ; }static int iscsi_target_do_login_io (struct iscsi_conn *conn,struct iscsi_login *login)
drivers/usb/host/xhci-ring.c +1 -1
@@ -85,7 +85,7 @@ dma_addr_t xhci_trb_virt_to_dma(struct xhci_segment *seg,return 0 ;/* offset in TRBs */ segment_offset = trb - seg->trbs; -if (segment_offset >TRBS_PER_SEGMENT ) +if (segment_offset >=TRBS_PER_SEGMENT )return 0 ;return seg->dma + (segment_offset *sizeof (*trb)); }
drivers/usb/serial/sierra.c +1 -0
@@ -289,6 +289,7 @@ static const struct usb_device_id id_table[] = { { USB_DEVICE_AND_INTERFACE_INFO(0x1199, 0x68AA, 0xFF, 0xFF, 0xFF), .driver_info = (kernel_ulong_t)&direct_ip_interface_blacklist }, + { USB_DEVICE(0x1199, 0x68AB) }, /* Sierra Wireless AR8550 */ /* AT&T Direct IP LTE modems */ { USB_DEVICE_AND_INTERFACE_INFO(0x0F3D, 0x68AA, 0xFF, 0xFF, 0xFF), .driver_info = (kernel_ulong_t)&direct_ip_interface_blacklist
drivers/xen/gntdev.c +2 -0
@@ -534,12 +534,14 @@ static int gntdev_release(struct inode *inode, struct file *flip)pr_debug ("priv %p\n" , priv); +mutex_lock (&priv->lock);while (!list_empty (&priv->maps)) { map = list_entry(priv->maps.next, struct grant_map, next);list_del (&map->next);gntdev_put_map (NULL /* already removed */ , map); }WARN_ON (!list_empty (&priv->freeable_maps)); +mutex_unlock (&priv->lock);if (use_ptemod)mmu_notifier_unregister (&priv->mn, priv->mm);
fs/notify/mark.c +25 -5
@@ -299,16 +299,36 @@ void fsnotify_clear_marks_by_group_flags(struct fsnotify_group *group, unsigned int flags) {struct fsnotify_mark *lmark, *mark; +LIST_HEAD (to_free); +/* +* We have to be really careful here. Anytime we drop mark_mutex, e.g. +* fsnotify_clear_marks_by_inode() can come and free marks. Even in our +* to_free list so we have to use mark_mutex even when accessing that +* list. And freeing mark requires us to drop mark_mutex. So we can +* reliably free only the first mark in the list. That's why we first +* move marks to free to to_free list in one go and then free marks in +* to_free list one by one. +*/ mutex_lock_nested (&group->mark_mutex,SINGLE_DEPTH_NESTING );list_for_each_entry_safe (mark, lmark, &group->marks_list, g_list) { -if (mark->flags & flags) { -fsnotify_get_mark (mark); -fsnotify_destroy_mark_locked (mark, group); -fsnotify_put_mark (mark); - } +if (mark->flags & flags) +list_move (&mark->g_list, &to_free); }mutex_unlock (&group->mark_mutex); + +while (1 ) { +mutex_lock_nested (&group->mark_mutex,SINGLE_DEPTH_NESTING ); +if (list_empty (&to_free)) { +mutex_unlock (&group->mark_mutex); +break ; + } + mark = list_first_entry(&to_free, struct fsnotify_mark, g_list); +fsnotify_get_mark (mark); +fsnotify_destroy_mark_locked (mark, group); +mutex_unlock (&group->mark_mutex); +fsnotify_put_mark (mark); + } }/*
fs/ocfs2/dlmglue.c +7 -3
@@ -3971,9 +3971,13 @@ static void ocfs2_downconvert_thread_do_work(struct ocfs2_super *osb) osb->dc_work_sequence = osb->dc_wake_sequence; processed = osb->blocked_lock_count; -while (processed) { -BUG_ON (list_empty (&osb->blocked_lock_list)); - +/* +* blocked lock processing in this loop might call iput which can +* remove items off osb->blocked_lock_list. Downconvert up to +* 'processed' number of locks, but stop short if we had some +* removed in ocfs2_mark_lockres_freeing when downconverting. +*/ +while (processed && !list_empty (&osb->blocked_lock_list)) { lockres =list_entry (osb->blocked_lock_list.next, struct ocfs2_lock_res, l_blocked_list);list_del_init (&lockres->l_blocked_list);
fs/signalfd.c +3 -2
@@ -121,8 +121,9 @@ static int signalfd_copyinfo(struct signalfd_siginfo __user *uinfo,* Other callers might not initialize the si_lsb field, * so check explicitly for the right codes here. */ -if (kinfo->si_code ==BUS_MCEERR_AR || - kinfo->si_code ==BUS_MCEERR_AO ) +if (kinfo->si_signo ==SIGBUS && + (kinfo->si_code ==BUS_MCEERR_AR || + kinfo->si_code ==BUS_MCEERR_AO )) err |=__put_user ((short ) kinfo->si_addr_lsb, &uinfo->ssi_addr_lsb);#endif
ipc/mqueue.c +0 -5
@@ -143,7 +143,6 @@ static int msg_insert(struct msg_msg *msg, struct mqueue_inode_info *info)if (!leaf)return -ENOMEM ;INIT_LIST_HEAD (&leaf->msg_list); - info->qsize +=sizeof (*leaf); } leaf->priority = msg->m_type;rb_link_node (&leaf->rb_node, parent, p);
@@ -188,7 +187,6 @@ try_again: "lazy leaf delete!\n");rb_erase (&leaf->rb_node, &info->msg_tree);if (info->node_cache) { - info->qsize -=sizeof (*leaf);kfree (leaf); }else { info->node_cache = leaf;
@@ -201,7 +199,6 @@ try_again:if (list_empty (&leaf->msg_list)) {rb_erase (&leaf->rb_node, &info->msg_tree);if (info->node_cache) { - info->qsize -=sizeof (*leaf);kfree (leaf); }else { info->node_cache = leaf;
@@ -1026,7 +1023,6 @@ SYSCALL_DEFINE5(mq_timedsend, mqd_t, mqdes, const char __user *, u_msg_ptr,/* Save our speculative allocation into the cache */ INIT_LIST_HEAD (&new_leaf->msg_list); info->node_cache = new_leaf; - info->qsize +=sizeof (*new_leaf); new_leaf =NULL ; }else {kfree (new_leaf);
@@ -1133,7 +1129,6 @@ SYSCALL_DEFINE5(mq_timedreceive, mqd_t, mqdes, char __user *, u_msg_ptr,/* Save our speculative allocation into the cache */ INIT_LIST_HEAD (&new_leaf->msg_list); info->node_cache = new_leaf; - info->qsize +=sizeof (*new_leaf); }else {kfree (new_leaf); }
kernel/signal.c +4 -3
@@ -2768,7 +2768,8 @@ int copy_siginfo_to_user(siginfo_t __user *to, siginfo_t *from)* Other callers might not initialize the si_lsb field, * so check explicitly for the right codes here. */ -if (from->si_code ==BUS_MCEERR_AR || from->si_code ==BUS_MCEERR_AO ) +if (from->si_signo ==SIGBUS && + (from->si_code ==BUS_MCEERR_AR || from->si_code ==BUS_MCEERR_AO )) err |=__put_user (from->si_addr_lsb, &to->si_addr_lsb);#endif break ;
@@ -3035,7 +3036,7 @@ COMPAT_SYSCALL_DEFINE3(rt_sigqueueinfo, int, sig, struct compat_siginfo __user *, uinfo) { - siginfo_t info; + siginfo_t info = {};int ret =copy_siginfo_from_user32 (&info, uinfo);if (unlikely (ret))return ret;
@@ -3081,7 +3082,7 @@ COMPAT_SYSCALL_DEFINE4(rt_tgsigqueueinfo, int, sig, struct compat_siginfo __user *, uinfo) { - siginfo_t info; + siginfo_t info = {};if (copy_siginfo_from_user32 (&info, uinfo))return -EFAULT ;
mm/vmscan.c +3 -8
@@ -730,20 +730,15 @@ static unsigned long shrink_page_list(struct list_head *page_list,* could easily OOM just because too many pages are in * writeback and there is nothing else to reclaim. * -* Check __GFP_IO, certainly because a loop driver +* Require may_enter_fs to wait on writeback, because +* fs may not have submitted IO yet. And a loop driver * thread might enter reclaim, and deadlock if it waits * on a page for which it is needed to do the write * (loop masks off __GFP_IO|__GFP_FS for this reason); * but more thought would probably show more reasons. -* -* Don't require __GFP_FS, since we're not going into -* the FS, just waiting on its writeback completion. -* Worryingly, ext4 gfs2 and xfs allocate pages with -* grab_cache_page_write_begin(,,AOP_FLAG_NOFS), so -* testing may_enter_fs here is liable to OOM on them. */ if (global_reclaim (sc) || - !PageReclaim (page) || !(sc->gfp_mask & __GFP_IO)) { + !PageReclaim (page) || !may_enter_fs) {/* * This is slightly racy - end_page_writeback() * might have just cleared PageReclaim, then
sound/pci/hda/patch_cirrus.c +1 -3
@@ -787,9 +787,7 @@ static void cs4210_spdif_automute(struct hda_codec *codec, spec->spdif_present = spdif_present;/* SPDIF TX on/off */ -if (spdif_present) -snd_hda_set_pin_ctl (codec, spdif_pin, - spdif_present ?PIN_OUT :0 ); +snd_hda_set_pin_ctl (codec, spdif_pin, spdif_present ?PIN_OUT :0 );cs_automute (codec); }