Linux 2.6.29.1
Subsystems (31)
We (the -stable team) are announcing the release of the 2.6.29.1 kernel.
There's many bugfixes all over the tree, but this should specifically fix the networking issues people had w/ 2.6.29. As usual, you're encouraged to upgrade. For details see the changelog and diffstat below.
I'll be replying to this message with a copy of the patch between 2.6.29 and 2.6.29.1.
The updated 2.6.26.y git tree can be found at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-2.6.29.y.git and can be browsed at the normal kernel.org git web browser: http://git.kernel.org/?p=linux/kernel/git/stable/linux-2.6.29.y.git;a=summary
thanks,
-chris
---------
Makefile | 2 - arch/arm/include/asm/elf.h | 1 arch/arm/kernel/module.c | 9 +++++ arch/arm/mach-iop13xx/pci.c | 5 ++- arch/arm/mach-omap2/mmc-twl4030.c | 1 arch/arm/mm/mmu.c | 2 - arch/sparc/include/asm/tlb_64.h | 4 +- arch/sparc/kernel/nmi.c | 23 +++++++++++++ arch/sparc/kernel/smp_64.c | 4 +- arch/x86/kernel/check.c | 6 +-- arch/x86/kernel/cpu/mtrr/generic.c | 51 ++++++++++++++++++------------- arch/x86/kernel/ptrace.c | 3 - arch/x86/kernel/tlb_uv.c | 3 + arch/x86/kvm/paging_tmpl.h | 2 - arch/x86/kvm/svm.c | 41 +++++++++++++++++------- arch/x86/kvm/vmx.c | 2 - arch/x86/lguest/boot.c | 10 +++++- arch/x86/mm/pat.c | 5 +-- arch/x86/pci/i386.c | 3 + drivers/char/raw.c | 1 drivers/lguest/page_tables.c | 4 +- drivers/media/dvb/firewire/firedtv-avc.c | 6 +++ drivers/media/video/v4l2-common.c | 8 ++-- drivers/net/dnet.c | 1 drivers/net/wireless/ath5k/base.c | 22 +++++++++---- drivers/net/wireless/ath5k/base.h | 2 - drivers/net/wireless/ath9k/recv.c | 7 +++- drivers/net/wireless/ath9k/xmit.c | 2 - drivers/net/wireless/b43/xmit.c | 2 - drivers/scsi/arm/cumana_2.c | 2 - drivers/usb/core/message.c | 3 + drivers/usb/core/quirks.c | 4 ++ drivers/usb/core/sysfs.c | 4 +- drivers/usb/gadget/f_rndis.c | 2 - drivers/usb/host/ehci-q.c | 32 +++++++++++++++++++ drivers/usb/host/ehci.h | 3 + drivers/usb/storage/cypress_atacb.c | 15 ++++----- drivers/usb/storage/scsiglue.c | 6 +++ drivers/video/pxafb.c | 14 ++++++++ fs/cifs/CHANGES | 3 + fs/cifs/cifssmb.c | 6 ++- fs/cifs/connect.c | 2 - fs/fuse/file.c | 3 + include/linux/mm.h | 15 +++++++-- include/linux/usb/quirks.h | 3 + mm/memory.c | 6 ++- net/bridge/br_if.c | 1 net/core/dev.c | 9 +---- net/ipv4/udp.c | 6 +++ net/ipv6/ip6_input.c | 4 -- net/netfilter/nf_conntrack_proto_tcp.c | 3 + net/wireless/reg.c | 23 ++++++++++--- net/xfrm/xfrm_state.c | 2 - 53 files changed, 296 insertions(+), 107 deletions(-)
Alan Cox (3):
ARM: cumana: Fix a long standing bogon
ARM: fix leak in iop13xx/pci
ARM: twl4030 - leak fix
Alan Stern (3):
USB: EHCI: add software retry for transaction errors
USB: usb-storage: increase max_sectors for tape drives
USB: add quirk to avoid config and interface strings
Andre Przywara (1):
KVM: SVM: set accessed bit for VMCB segment selectors
Andreas Herrmann (1):
x86: mtrr: don't modify RdDram/WrDram bits of fixed MTRRs
Avi Kivity (1):
KVM: VMX: Don't allow uninhibited access to EFER on i386
Beat Michel Liechti (1):
DVB: firedtv: FireDTV S2 problems with tuning solved
Boaz Harrosh (1):
USB: fix USB_STORAGE_CYPRESS_ATACB
Bob Copeland (3):
ath5k: use spin_lock_irqsave for beacon lock
ath5k: disable MIB interrupts
ath5k: warn and correct rate for unknown hw rate indexes
Chris Wright (1):
Linux 2.6.29.1
Chuck Ebbert (1):
xfrm: spin_lock() should be spin_unlock() in xfrm_state.c
Dan Carpenter (2):
fuse: fix fuse_file_lseek returning with lock held Add a missing unlock_kernel() in raw_open()
Daniel Silverstone (1):
ARM: 5428/1: Module relocation update for R_ARM_V4BX
David Brownell (1):
USB: gadget: fix rndis regression
David S. Miller (3):
sparc64: Fix MM refcount check in smp_flush_tlb_pending().
sparc64: Flush TLB before releasing pages.
sparc64: Fix reset hangs on Niagara systems.
Eric Miao (1):
ARM: pxa: fix overlay being un-necessarily initialized on pxa25x
Geert Uytterhoeven (1):
dnet: drivers/net/dnet.c needs <linux/io.h>
Hans Verkuil (1):
V4L: v4l2-common: remove incorrect MODULE test
Herbert Xu (1):
GRO: Disable GRO on legacy netif_rx path
Jeff Layton (1):
cifs: fix buffer format byte on NT Rename/hardlink
Jesper Nilsson (1):
ipv6: Plug sk_buff leak in ipv6_rcv (net/ipv6/ip6_input.c)
Joerg Roedel (1):
KVM: MMU: Fix another largepage memory leak
Lorenzo Nava (1):
b43: fix b43_plcp_get_bitrate_idx_ofdm return type
Luis R. Rodriguez (4):
ath9k: downgrade xmit queue full message to xmit debug
ath9k: fix dma mapping leak of rx buffer upon rmmod
cfg80211: force last_request to be set for OLD_REG if regdom is EU
cfg80211: fix incorrect assumption on last_request for 11d
Mark H. Weaver (1):
netfilter: nf_conntrack_tcp: fix unaligned memory access in tcp_sack
Mikael Pettersson (1):
ARM: 5435/1: fix compile warning in sanity_check_meminfo()
Pallipadi, Venkatesh (2):
x86, PAT, PCI: Change vma prot in pci_mmap to reflect inherited prot VM, x86, PAT: Change is_linear_pfn_mapping to not use vm_pgoff
Rusty Russell (3):
x86, uv: fix cpumask iterator in uv_bau_init()
lguest: wire up pte_update/pte_update_defer
lguest: fix spurious BUG_ON() on invalid guest stack.
Stephen Hemminger (1):
bridge: bad error handling when adding invalid ether address
Steve French (1):
CIFS: Fix memory overwrite when saving nativeFileSystem field during mount
Vitaly Mayatskikh (1):
udp: Wrong locking code in udp seq_file infrastructure
Yinghai Lu (1):
x86: fix 64k corruption-check
[email protected] (1):
x86: ptrace, bts: fix an unreachable statement
Makefile +1 -1
@@ -1,7 +1,7 @@ VERSION = 2 PATCHLEVEL = 6 SUBLEVEL = 29 -EXTRAVERSION = +EXTRAVERSION = .1 NAME = Temporary Tasmanian Devil # *DOCUMENTATION*
arch/arm/include/asm/elf.h +1 -0
@@ -50,6 +50,7 @@ typedef struct user_fp elf_fpregset_t;#define R_ARM_ABS32 2#define R_ARM_CALL 28#define R_ARM_JUMP24 29 +#define R_ARM_V4BX 40/* * These are used to set parameters in the core dumps.
arch/arm/kernel/module.c +9 -0
@@ -132,6 +132,15 @@ apply_relocate(Elf32_Shdr *sechdrs, const char *strtab, unsigned int symindex, *(u32 *)loc |= offset &0x00ffffff ;break ; +case R_ARM_V4BX : +/* Preserve Rm and the condition code. Alter +* other bits to re-code instruction as +* MOV PC,Rm. +*/ + *(u32 *)loc &=0xf000000f ; + *(u32 *)loc |=0x01a0f000 ; +break ; +default :printk (KERN_ERR "%s: unknown relocation: %u\n" , module->name,ELF32_R_TYPE (rel->r_info));
arch/arm/mach-iop13xx/pci.c +4 -1
@@ -1026,8 +1026,10 @@ int iop13xx_pci_setup(int nr, struct pci_sys_data *sys) which_atu =0 ; } -if (!which_atu) +if (!which_atu) { +kfree (res);return 0 ; + }switch (which_atu) {case IOP13XX_INIT_ATU_ATUX :
@@ -1074,6 +1076,7 @@ int iop13xx_pci_setup(int nr, struct pci_sys_data *sys) sys->map_irq = iop13xx_pcie_map_irq;break ;default : +kfree (res);return 0 ; }
arch/arm/mach-omap2/mmc-twl4030.c +1 -0
@@ -397,6 +397,7 @@ void __init twl4030_mmc_init(struct twl4030_hsmmc_info *controllers)break ;default :pr_err ("MMC%d configuration not supported!\n" , c->mmc); +kfree (mmc);continue ; } hsmmc_data[c->mmc -1 ] = mmc;
arch/arm/mm/mmu.c +1 -1
@@ -694,7 +694,7 @@ static void __init sanity_check_meminfo(void)* the vmalloc area. */ if (__va (bank->start) >=VMALLOC_MIN || -__va (bank->start) <PAGE_OFFSET ) { +__va (bank->start) < (void *)PAGE_OFFSET ) {printk (KERN_NOTICE "Ignoring RAM at %.8lx-%.8lx " "(vmalloc region overlap).\n" , bank->start, bank->start + bank->size -1 );
arch/sparc/include/asm/tlb_64.h +2 -2
@@ -58,6 +58,8 @@ static inline struct mmu_gather *tlb_gather_mmu(struct mm_struct *mm, unsigned istatic inline void tlb_flush_mmu (struct mmu_gather *mp) {if (mp->need_flush) { +if (!mp->fullmm) +flush_tlb_pending ();free_pages_and_swap_cache (mp->pages, mp->pages_nr); mp->pages_nr =0 ; mp->need_flush =0 ;
@@ -78,8 +80,6 @@ static inline void tlb_finish_mmu(struct mmu_gather *mp, unsigned long start, unif (mp->fullmm) mp->fullmm =0 ; -else -flush_tlb_pending ();/* keep the page table cache within bounds */ check_pgt_cache ();
arch/sparc/kernel/nmi.c +22 -1
@@ -13,6 +13,7 @@#include <linux/module.h> #include <linux/kprobes.h> #include <linux/kernel_stat.h> +#include <linux/reboot.h> #include <linux/slab.h> #include <linux/kdebug.h> #include <linux/delay.h>
@@ -206,13 +207,33 @@ void nmi_adjust_hz(unsigned int new_hz) }EXPORT_SYMBOL_GPL (nmi_adjust_hz); +static int nmi_shutdown (struct notifier_block *nb,unsigned long cmd,void *p) +{ +on_each_cpu (stop_watchdog,NULL ,1 ); +return 0 ; +} + +static struct notifier_block nmi_reboot_notifier = { + .notifier_call = nmi_shutdown, +}; +int __init nmi_init (void ) { +int err; + nmi_usable =1 ;on_each_cpu (start_watchdog,NULL ,1 ); -return check_nmi_watchdog (); + err =check_nmi_watchdog (); +if (!err) { + err =register_reboot_notifier (&nmi_reboot_notifier); +if (err) { + nmi_usable =0 ; +on_each_cpu (stop_watchdog,NULL ,1 ); + } + } +return err; }static int __init setup_nmi_watchdog (char *str)
arch/sparc/kernel/smp_64.c +2 -2
@@ -1031,7 +1031,7 @@ void smp_fetch_global_regs(void)* If the address space is non-shared (ie. mm->count == 1) we avoid * cross calls when we want to flush the currently running process's * tlb state. This is done by clearing all cpu bits except the current -* processor's in current->active_mm->cpu_vm_mask and performing the +* processor's in current->mm->cpu_vm_mask and performing the * flush locally only. This will force any subsequent cpus which run * this task to flush the context from the local tlb if the process * migrates to another cpu (again).
@@ -1074,7 +1074,7 @@ void smp_flush_tlb_pending(struct mm_struct *mm, unsigned long nr, unsigned longu32 ctx =CTX_HWBITS (mm->context);int cpu =get_cpu (); -if (mm == current->active_mm &&atomic_read (&mm->mm_users) ==1 ) +if (mm == current->mm &&atomic_read (&mm->mm_users) ==1 ) mm->cpu_vm_mask =cpumask_of_cpu (cpu);else smp_cross_call_masked(&xcall_flush_tlb_pending,
arch/x86/kernel/check.c +3 -3
@@ -86,12 +86,12 @@ void __init setup_bios_corruption_check(void)if (addr ==0 )break ; +if (addr >= corruption_check_size) +break ; +if ((addr + size) > corruption_check_size) size = corruption_check_size - addr; -if (size ==0 ) -break ; -e820_update_range (addr, size,E820_RAM ,E820_RESERVED ); scan_areas[num_scan_areas].addr = addr; scan_areas[num_scan_areas].size = size;
arch/x86/kernel/cpu/mtrr/generic.c +30 -21
85 lines not on this page · raw message
arch/x86/kernel/ptrace.c +1 -2
@@ -690,9 +690,8 @@ static int ptrace_bts_config(struct task_struct *child,if (!cfg.signal)return -EINVAL ; -return -EOPNOTSUPP ; - child->thread.bts_ovfl_signal = cfg.signal; +return -EOPNOTSUPP ; } if ((cfg.flags & PTRACE_BTS_O_ALLOC) &&
arch/x86/kernel/tlb_uv.c +2 -1
@@ -742,7 +742,7 @@ static int __init uv_bau_init(void)int node;int nblades;int last_blade; -int cur_cpu =0 ; +int cur_cpu;if (!is_uv_system ())return 0 ;
@@ -752,6 +752,7 @@ static int __init uv_bau_init(void) uv_mmask = (1UL << uv_hub_info->n_val) -1 ; nblades =0 ; last_blade =-1 ; + cur_cpu =0 ;for_each_online_node (node) { blade =uv_node_to_blade_id (node);if (blade == last_blade)
arch/x86/kvm/paging_tmpl.h +1 -1
@@ -314,9 +314,9 @@ static int FNAME(shadow_walk_entry)(struct kvm_shadow_walk *_sw,return 0 ;if (is_large_pte (*sptep)) { +rmap_remove (vcpu->kvm, sptep);set_shadow_pte (sptep, shadow_trap_nonpresent_pte);kvm_flush_remote_tlbs (vcpu->kvm); -rmap_remove (vcpu->kvm, sptep); }if (level ==PT_DIRECTORY_LEVEL && gw->level ==PT_DIRECTORY_LEVEL ) {
arch/x86/kvm/svm.c +29 -12
49 lines not on this page · raw message
arch/x86/kvm/vmx.c +1 -1
@@ -928,11 +928,11 @@ static int vmx_set_msr(struct kvm_vcpu *vcpu, u32 msr_index, u64 data)int ret =0 ;switch (msr_index) { -#ifdef CONFIG_X86_64 case MSR_EFER :vmx_load_host_state (vmx); ret =kvm_set_msr_common (vcpu, msr_index, data);break ; +#ifdef CONFIG_X86_64 case MSR_FS_BASE :vmcs_writel (GUEST_FS_BASE , data);break ;
arch/x86/lguest/boot.c +9 -1
@@ -485,11 +485,17 @@ static void lguest_write_cr4(unsigned long val)* into a process' address space. We set the entry then tell the Host the * toplevel and address this corresponds to. The Guest uses one pagetable per * process, so we need to tell the Host which one we're changing (mm->pgd). */ +static void lguest_pte_update (struct mm_struct *mm,unsigned long addr, +pte_t *ptep) +{ +lazy_hcall (LHCALL_SET_PTE ,__pa (mm->pgd), addr, ptep->pte_low); +} +static void lguest_set_pte_at (struct mm_struct *mm,unsigned long addr,pte_t *ptep,pte_t pteval) { *ptep = pteval; -lazy_hcall (LHCALL_SET_PTE ,__pa (mm->pgd), addr, pteval.pte_low); +lguest_pte_update (mm, addr, ptep); }/* The Guest calls this to set a top-level entry. Again, we set the entry then
@@ -1034,6 +1040,8 @@ __init void lguest_init(void) pv_mmu_ops.read_cr3 = lguest_read_cr3; pv_mmu_ops.lazy_mode.enter = paravirt_enter_lazy_mmu; pv_mmu_ops.lazy_mode.leave = lguest_leave_lazy_mode; + pv_mmu_ops.pte_update = lguest_pte_update; + pv_mmu_ops.pte_update_defer = lguest_pte_update;#ifdef CONFIG_X86_LOCAL_APIC /* apic read/write intercepts */
arch/x86/mm/pat.c +3 -2
@@ -641,10 +641,11 @@ static int reserve_pfn_range(u64 paddr, unsigned long size, pgprot_t *vma_prot, is_ram =pat_pagerange_is_ram (paddr, paddr + size);/* -* reserve_pfn_range() doesn't support RAM pages. +* reserve_pfn_range() doesn't support RAM pages. Maintain the current +* behavior with RAM pages by returning success. */ if (is_ram !=0 ) -return -EINVAL ; +return 0 ; ret =reserve_memtype (paddr, paddr + size, want_flags, &flags);if (ret)
arch/x86/pci/i386.c +3 -0
@@ -319,6 +319,9 @@ int pci_mmap_page_range(struct pci_dev *dev, struct vm_area_struct *vma,return -EINVAL ; } flags = new_flags; + vma->vm_page_prot =__pgprot ( + (pgprot_val (vma->vm_page_prot) & ~_PAGE_CACHE_MASK) | + flags); } if (((vma->vm_pgoff < max_low_pfn_mapped) ||
drivers/char/raw.c +1 -0
@@ -90,6 +90,7 @@ out1:blkdev_put (bdev, filp->f_mode); out:mutex_unlock (&raw_mutex); +unlock_kernel ();return err; }
drivers/lguest/page_tables.c +3 -1
@@ -373,8 +373,10 @@ unsigned long guest_pa(struct lg_cpu *cpu, unsigned long vaddr)/* First step: get the top-level Guest page table entry. */ gpgd =lgread (cpu,gpgd_addr (cpu, vaddr), pgd_t);/* Toplevel not present? We can't map it in. */ -if (!(pgd_flags (gpgd) & _PAGE_PRESENT)) +if (!(pgd_flags (gpgd) & _PAGE_PRESENT)) {kill_guest (cpu,"Bad address %#lx" , vaddr); +return -1UL ; + } gpte =lgread (cpu,gpte_addr (gpgd, vaddr), pte_t);if (!(pte_flags (gpte) & _PAGE_PRESENT))
drivers/media/dvb/firewire/firedtv-avc.c +5 -1
@@ -135,6 +135,7 @@ static const char *debug_fcp_opcode(unsigned int opcode,case SFE_VENDOR_OPCODE_REGISTER_REMOTE_CONTROL :return "RegisterRC" ;case SFE_VENDOR_OPCODE_LNB_CONTROL :return "LNBControl" ;case SFE_VENDOR_OPCODE_TUNE_QPSK :return "TuneQPSK" ; +case SFE_VENDOR_OPCODE_TUNE_QPSK2 :return "TuneQPSK2" ;case SFE_VENDOR_OPCODE_HOST2CA :return "Host2CA" ;case SFE_VENDOR_OPCODE_CA2HOST :return "CA2Host" ; }
@@ -266,7 +267,10 @@ static void avc_tuner_tuneqpsk(struct firedtv *fdtv, c->operand[0 ] =SFE_VENDOR_DE_COMPANYID_0 ; c->operand[1 ] =SFE_VENDOR_DE_COMPANYID_1 ; c->operand[2 ] =SFE_VENDOR_DE_COMPANYID_2 ; - c->operand[3 ] =SFE_VENDOR_OPCODE_TUNE_QPSK ; +if (fdtv->type ==FIREDTV_DVB_S2 ) + c->operand[3 ] =SFE_VENDOR_OPCODE_TUNE_QPSK2 ; +else + c->operand[3 ] =SFE_VENDOR_OPCODE_TUNE_QPSK ; c->operand[4 ] = (params->frequency >>24 ) &0xff ; c->operand[5 ] = (params->frequency >>16 ) &0xff ;
drivers/media/video/v4l2-common.c +4 -4
@@ -910,10 +910,10 @@ struct v4l2_subdev *v4l2_i2c_new_subdev(struct i2c_adapter *adapter,struct i2c_board_info info;BUG_ON (!dev); -#ifdef MODULE +if (module_name)request_module (module_name); -#endif +/* Setup the i2c board info with the device type and the device address. */ memset (&info,0 ,sizeof (info));
@@ -958,10 +958,10 @@ struct v4l2_subdev *v4l2_i2c_new_probed_subdev(struct i2c_adapter *adapter,struct i2c_board_info info;BUG_ON (!dev); -#ifdef MODULE +if (module_name)request_module (module_name); -#endif +/* Setup the i2c board info with the device type and the device address. */ memset (&info,0 ,sizeof (info));
drivers/net/dnet.c +1 -0
@@ -9,6 +9,7 @@* published by the Free Software Foundation. */ #include <linux/version.h> +#include <linux/io.h> #include <linux/module.h> #include <linux/moduleparam.h> #include <linux/kernel.h>
drivers/net/wireless/ath5k/base.c +16 -6
@@ -1090,8 +1090,18 @@ ath5k_mode_setup(struct ath5k_softc *sc)static inline int ath5k_hw_to_driver_rix (struct ath5k_softc *sc,int hw_rix) { -WARN_ON (hw_rix <0 || hw_rix >AR5K_MAX_RATES ); -return sc->rate_idx[sc->curband->band][hw_rix]; +int rix; + +/* return base rate on errors */ +if (WARN (hw_rix <0 || hw_rix >=AR5K_MAX_RATES , +"hw_rix out of bounds: %x\n" , hw_rix)) +return 0 ; + + rix = sc->rate_idx[sc->curband->band][hw_rix]; +if (WARN (rix <0 ,"invalid hw_rix: %x\n" , hw_rix)) + rix =0 ; + +return rix; }/***************\
@@ -1668,7 +1678,6 @@ ath5k_check_ibss_tsf(struct ath5k_softc *sc, struct sk_buff *skb, } } -static void ath5k_tasklet_rx (unsigned long data) {
@@ -2188,6 +2197,7 @@ static void ath5k_beacon_config(struct ath5k_softc *sc) {struct ath5k_hw *ah = sc->ah; +unsigned long flags;ath5k_hw_set_imr (ah,0 ); sc->bmisscount =0 ;
@@ -2211,9 +2221,9 @@ ath5k_beacon_config(struct ath5k_softc *sc)if (sc->opmode ==NL80211_IFTYPE_ADHOC ) {if (ath5k_hw_hasveol (ah)) { -spin_lock (&sc->block); +spin_lock_irqsave (&sc->block, flags);ath5k_beacon_send (sc); -spin_unlock (&sc->block); +spin_unlock_irqrestore (&sc->block, flags); } }else ath5k_beacon_update_timers (sc,-1 );
@@ -2259,7 +2269,7 @@ ath5k_init(struct ath5k_softc *sc, bool is_resume) sc->curband = &sc->sbands[sc->curchan->band]; sc->imask =AR5K_INT_RXOK |AR5K_INT_RXERR |AR5K_INT_RXEOL |AR5K_INT_RXORN |AR5K_INT_TXDESC |AR5K_INT_TXEOL | -AR5K_INT_FATAL |AR5K_INT_GLOBAL |AR5K_INT_MIB ; +AR5K_INT_FATAL |AR5K_INT_GLOBAL ; ret =ath5k_reset (sc, false, false);if (ret) goto done;
drivers/net/wireless/ath5k/base.h +1 -1
@@ -112,7 +112,7 @@ struct ath5k_softc {struct ieee80211_supported_band sbands[IEEE80211_NUM_BANDS ];struct ieee80211_channel channels[ATH_CHAN_MAX ];struct ieee80211_rate rates[IEEE80211_NUM_BANDS ][AR5K_MAX_RATES ]; -u8 rate_idx[IEEE80211_NUM_BANDS ][AR5K_MAX_RATES ]; +s8 rate_idx[IEEE80211_NUM_BANDS ][AR5K_MAX_RATES ];enum nl80211_iftype opmode;struct ath5k_hw *ah;/* Atheros HW */
drivers/net/wireless/ath9k/recv.c +6 -1
@@ -322,8 +322,13 @@ void ath_rx_cleanup(struct ath_softc *sc)list_for_each_entry (bf, &sc->rx.rxbuf, list) { skb = bf->bf_mpdu; -if (skb) +if (skb) { +pci_unmap_single (sc->pdev, + bf->bf_buf_addr, + sc->rx.bufsize, +DMA_FROM_DEVICE );dev_kfree_skb (skb); + } }if (sc->rx.rxdma.dd_desc_len !=0 )
drivers/net/wireless/ath9k/xmit.c +1 -1
@@ -2035,7 +2035,7 @@ struct ath_txq *ath_test_get_txq(struct ath_softc *sc, struct sk_buff *skb)/* Try to avoid running out of descriptors */ if (txq->axq_depth >= (ATH_TXBUF -20 )) { -DPRINTF (sc,ATH_DBG_FATAL , +DPRINTF (sc,ATH_DBG_XMIT ,"TX queue: %d is full, depth: %d\n" , qnum, txq->axq_depth);ieee80211_stop_queue (sc->hw,skb_get_queue_mapping (skb));
drivers/net/wireless/b43/xmit.c +1 -1
@@ -50,7 +50,7 @@ static int b43_plcp_get_bitrate_idx_cck(struct b43_plcp_hdr6 *plcp) }/* Extract the bitrate index out of an OFDM PLCP header. */ -static u8 b43_plcp_get_bitrate_idx_ofdm (struct b43_plcp_hdr6 *plcp,bool aphy) +static int b43_plcp_get_bitrate_idx_ofdm (struct b43_plcp_hdr6 *plcp,bool aphy) {int base = aphy ?0 :4 ;
drivers/scsi/arm/cumana_2.c +1 -1
@@ -318,7 +318,7 @@ cumanascsi_2_set_proc_info(struct Scsi_Host *host, char *buffer, int length) {int ret = length; -if (length >=11 &&strcmp (buffer,"CUMANASCSI2" ) ==0 ) { +if (length >=11 &&strncmp (buffer,"CUMANASCSI2" ,11 ) ==0 ) { buffer +=11 ; length -=11 ;
drivers/usb/core/message.c +2 -1
@@ -1719,7 +1719,8 @@ free_interfaces: }kfree (new_interfaces); -if (cp->string ==NULL ) +if (cp->string ==NULL && + !(dev->quirks &USB_QUIRK_CONFIG_INTF_STRINGS )) cp->string =usb_cache_string (dev, cp->desc.iConfiguration);/* Now that all the interfaces are set up, register them
drivers/usb/core/quirks.c +4 -0
@@ -54,6 +54,10 @@ static const struct usb_device_id usb_quirk_list[] = { { USB_DEVICE(0x0638, 0x0a13), .driver_info = USB_QUIRK_STRING_FETCH_255 }, + /* Saitek Cyborg Gold Joystick */ + { USB_DEVICE(0x06a3, 0x0006), .driver_info = + USB_QUIRK_CONFIG_INTF_STRINGS }, + /* M-Systems Flash Disk Pioneers */ { USB_DEVICE(0x08ec, 0x1000), .driver_info = USB_QUIRK_RESET_RESUME },
drivers/usb/core/sysfs.c +3 -1
@@ -13,6 +13,7 @@#include <linux/kernel.h> #include <linux/string.h> #include <linux/usb.h> +#include <linux/usb/quirks.h> #include "usb.h" /* Active configuration fields */
@@ -813,7 +814,8 @@ int usb_create_sysfs_intf_files(struct usb_interface *intf)if (intf->sysfs_files_created || intf->unregistering)return 0 ; -if (alt->string ==NULL ) +if (alt->string ==NULL && + !(udev->quirks &USB_QUIRK_CONFIG_INTF_STRINGS )) alt->string =usb_cache_string (udev, alt->desc.iInterface);if (alt->string) retval =device_create_file (&intf->dev, &dev_attr_interface);
drivers/usb/gadget/f_rndis.c +1 -1
@@ -437,7 +437,7 @@ invalid:DBG (cdev,"rndis req%02x.%02x v%04x i%04x l%d\n" , ctrl->bRequestType, ctrl->bRequest, w_value, w_index, w_length); - req->zero =0 ; + req->zero = (value < w_length); req->length = value; value =usb_ep_queue (cdev->gadget->ep0, req,GFP_ATOMIC );if (value <0 )
drivers/usb/host/ehci-q.c +32 -0
@@ -333,12 +333,40 @@ qh_completions (struct ehci_hcd *ehci, struct ehci_qh *qh) token =hc32_to_cpu (ehci, qtd->hw_token);/* always clean up qtds the hc de-activated */ + retry_xacterr:if ((token &QTD_STS_ACTIVE ) ==0 ) {/* on STALL, error, and short reads this urb must * complete and all its qtds must be recycled. */ if ((token &QTD_STS_HALT ) !=0 ) { + +/* retry transaction errors until we +* reach the software xacterr limit +*/ +if ((token &QTD_STS_XACT ) && +QTD_CERR (token) ==0 && + --qh->xacterrs >0 && + !urb->unlinked) { +ehci_dbg (ehci, +"detected XactErr len %d/%d retry %d\n" , + qtd->length -QTD_LENGTH (token), qtd->length, +QH_XACTERR_MAX - qh->xacterrs); + +/* reset the token in the qtd and the +* qh overlay (which still contains +* the qtd) so that we pick up from +* where we left off +*/ + token &= ~QTD_STS_HALT ; + token |=QTD_STS_ACTIVE | + (EHCI_TUNE_CERR <<10 ); + qtd->hw_token =cpu_to_hc32 (ehci, + token); +wmb (); + qh->hw_token =cpu_to_hc32 (ehci, token); + goto retry_xacterr; + } stopped =1 ;/* magic dummy for some short reads; qh won't advance.
@@ -421,6 +449,9 @@ halt:/* remove qtd; it's recycled after possible urb completion */ list_del (&qtd->qtd_list); last = qtd; + +/* reinit the xacterr counter for the next qtd */ + qh->xacterrs =QH_XACTERR_MAX ; }/* last urb's completion might still need calling */
@@ -862,6 +893,7 @@ static void qh_link_async (struct ehci_hcd *ehci, struct ehci_qh *qh) head->qh_next.qh = qh; head->hw_next = dma; + qh->xacterrs =QH_XACTERR_MAX ; qh->qh_state =QH_STATE_LINKED ;/* qtd completions reported later by interrupt */ }
drivers/usb/host/ehci.h +3 -0
@@ -376,6 +376,9 @@ struct ehci_qh {#define QH_STATE_UNLINK_WAIT 4/* LINKED and on reclaim q */ #define QH_STATE_COMPLETING 5/* don't touch token.HALT */ +u8 xacterrs;/* XactErr retry counter */ +#define QH_XACTERR_MAX 32/* XactErr retry limit */ +/* periodic schedule info */ u8 usecs;/* intr bandwidth */ u8 gap_uf;/* uframes split/csplit gap */
drivers/usb/storage/cypress_atacb.c +7 -8
@@ -133,19 +133,18 @@ void cypress_atacb_passthrough(struct scsi_cmnd *srb, struct us_data *us)/* build the command for * reading the ATA registers */ -scsi_eh_prep_cmnd (srb, &ses,NULL ,0 ,0 ); - srb->sdb.length =sizeof (regs); -sg_init_one (&ses.sense_sgl, regs, srb->sdb.length); - srb->sdb.table.sgl = &ses.sense_sgl; - srb->sc_data_direction =DMA_FROM_DEVICE ; - srb->sdb.table.nents =1 ; +scsi_eh_prep_cmnd (srb, &ses,NULL ,0 ,sizeof (regs)); +/* we use the same command as before, but we set * the read taskfile bit, for not executing atacb command, * but reading register selected in srb->cmnd[4] */ + srb->cmd_len =16 ; + srb->cmnd = ses.cmnd; srb->cmnd[2 ] =1 ;usb_stor_transparent_scsi_command (srb, us); +memcpy (regs, srb->sense_buffer,sizeof (regs)); tmp_result = srb->result;scsi_eh_restore_cmnd (srb, &ses);/* we fail to get registers, report invalid command */
@@ -162,8 +161,8 @@ void cypress_atacb_passthrough(struct scsi_cmnd *srb, struct us_data *us)/* XXX we should generate sk, asc, ascq from status and error * regs -* (see 11.1 Error translation ATA device error to SCSI error map) -* and ata_to_sense_error from libata. +* (see 11.1 Error translation ATA device error to SCSI error +* map, and ata_to_sense_error from libata.) */ /* Sense data is current and format is descriptor. */
drivers/usb/storage/scsiglue.c +6 -0
@@ -135,6 +135,12 @@ static int slave_configure(struct scsi_device *sdev)if (sdev->request_queue->max_sectors > max_sectors)blk_queue_max_sectors (sdev->request_queue, max_sectors); + }else if (sdev->type ==TYPE_TAPE ) { +/* Tapes need much higher max_sector limits, so just +* raise it to the maximum possible (4 GB / 512) and +* let the queue segment size sort out the real limit. +*/ +blk_queue_max_sectors (sdev->request_queue,0x7FFFFF ); }/* Some USB host controllers can't do DMA; they have to use PIO.
drivers/video/pxafb.c +14 -0
@@ -883,10 +883,21 @@ static void __devinit init_pxafb_overlay(struct pxafb_info *fbi,init_completion (&ofb->branch_done); } +static inline int pxafb_overlay_supported (void ) +{ +if (cpu_is_pxa27x () ||cpu_is_pxa3xx ()) +return 1 ; + +return 0 ; +} +static int __devinit pxafb_overlay_init (struct pxafb_info *fbi) {int i, ret; +if (!pxafb_overlay_supported ()) +return 0 ; +for (i =0 ; i <2 ; i++) {init_pxafb_overlay (fbi, &fbi->overlay[i], i); ret =register_framebuffer (&fbi->overlay[i].fb);
@@ -909,6 +920,9 @@ static void __devexit pxafb_overlay_exit(struct pxafb_info *fbi) {int i; +if (!pxafb_overlay_supported ()) +return ; +for (i =0 ; i <2 ; i++)unregister_framebuffer (&fbi->overlay[i].fb); }
fs/cifs/CHANGES +3 -0
@@ -7,6 +7,9 @@ are authenticated as guest, as reconnections, invalidating the earlier user's smb session. This fix allows cifs to mount multiple times to the same server with different userids without risking invalidating earlier established security contexts. +Fix "redzone overwritten" bug in cifs_put_tcon (CIFSTcon may allocate too +little memory for the "nativeFileSystem" field returned by the server +during mount). Version 1.56 ------------
fs/cifs/cifssmb.c +4 -2
@@ -2356,8 +2356,10 @@ winCreateHardLinkRetry: PATH_MAX, nls_codepage, remap); name_len++;/* trailing null */ name_len *=2 ; - pSMB->OldFileName[name_len] =0 ;/* pad */ - pSMB->OldFileName[name_len +1 ] =0x04 ; + +/* protocol specifies ASCII buffer format (0x04) for unicode */ + pSMB->OldFileName[name_len] =0x04 ; + pSMB->OldFileName[name_len +1 ] =0x00 ;/* pad */ name_len2 =cifsConvertToUCS ((__le16 *)&pSMB->OldFileName[name_len +2 ], toName,PATH_MAX , nls_codepage, remap);
fs/cifs/connect.c +1 -1
@@ -3667,7 +3667,7 @@ CIFSTCon(unsigned int xid, struct cifsSesInfo *ses, BCC(smb_buffer_response)) {kfree (tcon->nativeFileSystem); tcon->nativeFileSystem = -kzalloc (length +2 ,GFP_KERNEL ); +kzalloc (2 *(length +1 ),GFP_KERNEL );if (tcon->nativeFileSystem) cifs_strfromUCS_le( tcon->nativeFileSystem,
fs/fuse/file.c +2 -1
@@ -1465,7 +1465,7 @@ static loff_t fuse_file_llseek(struct file *file, loff_t offset, int origin)case SEEK_END : retval =fuse_update_attributes (inode,NULL , file,NULL );if (retval) -return retval; + goto exit; offset +=i_size_read (inode);break ;case SEEK_CUR :
@@ -1479,6 +1479,7 @@ static loff_t fuse_file_llseek(struct file *file, loff_t offset, int origin) } retval = offset; } +exit:mutex_unlock (&inode->i_mutex);return retval; }
include/linux/mm.h +13 -2
@@ -98,7 +98,7 @@ extern unsigned int kobjsize(const void *objp);#define VM_HUGETLB 0x00400000/* Huge TLB Page VM */ #define VM_NONLINEAR 0x00800000/* Is non-linear (remap_file_pages) */ #define VM_MAPPED_COPY 0x01000000/* T if mapped copy of data (nommu mmap) */ -#define VM_INSERTPAGE 0x02000000/* The vma has had "vm_insert_page()" done on it */ +#define VM_INSERTPAGE 0x02000000/* The vma has had "vm_insert_page()" done on it. Refer note in VM_PFNMAP_AT_MMAP below */ #define VM_ALWAYSDUMP 0x04000000/* Always include in core dumps */ #define VM_CAN_NONLINEAR 0x08000000/* Has ->fault & does nonlinear pages */
@@ -127,6 +127,17 @@ extern unsigned int kobjsize(const void *objp);#define VM_SPECIAL (VM_IO | VM_DONTEXPAND | VM_RESERVED | VM_PFNMAP)/* +* pfnmap vmas that are fully mapped at mmap time (not mapped on fault). +* Used by x86 PAT to identify such PFNMAP mappings and optimize their handling. +* Note VM_INSERTPAGE flag is overloaded here. i.e, +* VM_INSERTPAGE && !VM_PFNMAP implies +* The vma has had "vm_insert_page()" done on it +* VM_INSERTPAGE && VM_PFNMAP implies +* The vma is PFNMAP with full mapping at mmap time +*/ +#define VM_PFNMAP_AT_MMAP (VM_INSERTPAGE | VM_PFNMAP) + +/* * mapping from the currently active vm_flags protection bits (the * low four bits) to a page protection mask.. */
@@ -145,7 +156,7 @@ extern pgprot_t protection_map[16];*/ static inline int is_linear_pfn_mapping (struct vm_area_struct *vma) { -return ((vma->vm_flags &VM_PFNMAP ) && vma->vm_pgoff); +return ((vma->vm_flags &VM_PFNMAP_AT_MMAP ) ==VM_PFNMAP_AT_MMAP ); }static inline int is_pfn_mapping (struct vm_area_struct *vma)
include/linux/usb/quirks.h +3 -0
@@ -16,4 +16,7 @@/* device can't handle Set-Interface requests */ #define USB_QUIRK_NO_SET_INTF 0x00000004 +/* device can't handle its Configuration or Interface strings */ +#define USB_QUIRK_CONFIG_INTF_STRINGS 0x00000008 +#endif /* __LINUX_USB_QUIRKS_H */
mm/memory.c +4 -2
@@ -1665,9 +1665,10 @@ int remap_pfn_range(struct vm_area_struct *vma, unsigned long addr,* behaviour that some programs depend on. We mark the "original" * un-COW'ed pages by matching them up with "vma->vm_pgoff". */ -if (addr == vma->vm_start && end == vma->vm_end) +if (addr == vma->vm_start && end == vma->vm_end) { vma->vm_pgoff = pfn; -else if (is_cow_mapping (vma->vm_flags)) + vma->vm_flags |=VM_PFNMAP_AT_MMAP ; + }else if (is_cow_mapping (vma->vm_flags))return -EINVAL ; vma->vm_flags |=VM_IO |VM_RESERVED |VM_PFNMAP ;
@@ -1679,6 +1680,7 @@ int remap_pfn_range(struct vm_area_struct *vma, unsigned long addr,* needed from higher level routine calling unmap_vmas */ vma->vm_flags &= ~(VM_IO |VM_RESERVED |VM_PFNMAP ); + vma->vm_flags &= ~VM_PFNMAP_AT_MMAP ;return -EINVAL ; }
net/bridge/br_if.c +0 -1
@@ -426,7 +426,6 @@ err2: err1:kobject_del (&p->kobj); err0: -kobject_put (&p->kobj);dev_set_promiscuity (dev,-1 ); put_back:dev_put (dev);
net/core/dev.c +3 -6
@@ -2588,18 +2588,15 @@ static int process_backlog(struct napi_struct *napi, int quota)local_irq_disable (); skb =__skb_dequeue (&queue->input_pkt_queue);if (!skb) { +__napi_complete (napi);local_irq_enable (); -napi_complete (napi); - goto out; +break ; }local_irq_enable (); -napi_gro_receive (napi, skb); +netif_receive_skb (skb); }while (++work < quota && jiffies == start_time); -napi_gro_flush (napi); - -out:return work; }
net/ipv4/udp.c +5 -1
@@ -1614,7 +1614,8 @@ static struct sock *udp_get_next(struct seq_file *seq, struct sock *sk) }while (sk && (!net_eq (sock_net (sk), net) || sk->sk_family != state->family));if (!sk) { -spin_unlock_bh (&state->udp_table->hash[state->bucket].lock); +if (state->bucket <UDP_HTABLE_SIZE ) +spin_unlock_bh (&state->udp_table->hash[state->bucket].lock);return udp_get_first (seq, state->bucket +1 ); }return sk;
@@ -1632,6 +1633,9 @@ static struct sock *udp_get_idx(struct seq_file *seq, loff_t pos)static void *udp_seq_start (struct seq_file *seq,loff_t *pos) { +struct udp_iter_state *state = seq->private; + state->bucket =UDP_HTABLE_SIZE ; +return *pos ?udp_get_idx (seq, *pos-1 ) :SEQ_START_TOKEN ; }
net/ipv6/ip6_input.c +1 -3
@@ -75,8 +75,7 @@ int ipv6_rcv(struct sk_buff *skb, struct net_device *dev, struct packet_type *ptif ((skb =skb_share_check (skb,GFP_ATOMIC )) ==NULL || !idev ||unlikely (idev->cnf.disable_ipv6)) {IP6_INC_STATS_BH (net, idev,IPSTATS_MIB_INDISCARDS ); -rcu_read_unlock (); - goto out; + goto drop; }memset (IP6CB (skb),0 ,sizeof (struct inet6_skb_parm ));
@@ -147,7 +146,6 @@ err: drop:rcu_read_unlock ();kfree_skb (skb); -out:return 0 ; }
net/netfilter/nf_conntrack_proto_tcp.c +2 -1
@@ -15,6 +15,7 @@#include <linux/skbuff.h> #include <linux/ipv6.h> #include <net/ip6_checksum.h> +#include <asm/unaligned.h> #include <net/tcp.h>
@@ -466,7 +467,7 @@ static void tcp_sack(const struct sk_buff *skb, unsigned int dataoff,for (i =0 ; i < (opsize -TCPOLEN_SACK_BASE ); i +=TCPOLEN_SACK_PERBLOCK ) { - tmp =ntohl (*((__be32 *)(ptr+i)+1 )); + tmp =get_unaligned_be32 ((__be32 *)(ptr+i)+1 );if (after (tmp, *sack)) *sack = tmp;
net/wireless/reg.c +17 -6
@@ -1083,6 +1083,8 @@ EXPORT_SYMBOL(regulatory_hint);static bool reg_same_country_ie_hint (struct wiphy *wiphy,u32 country_ie_checksum) { +if (unlikely (last_request->initiator !=REGDOM_SET_BY_COUNTRY_IE )) +return false;if (!last_request->wiphy)return false;if (likely (last_request->wiphy != wiphy))
@@ -1133,7 +1135,9 @@ void regulatory_hint_11d(struct wiphy *wiphy,/* We will run this for *every* beacon processed for the BSSID, so * we optimize an early check to exit out early if we don't have to * do anything */ -if (likely (last_request->wiphy)) { +if (likely (last_request->initiator == +REGDOM_SET_BY_COUNTRY_IE && +likely (last_request->wiphy))) {struct cfg80211_registered_device *drv_last_ie; drv_last_ie =wiphy_to_dev (last_request->wiphy);
@@ -1469,13 +1473,20 @@ int regulatory_init(void)printk (KERN_INFO "cfg80211: Using static regulatory domain info\n" );print_regdomain_info (cfg80211_regdomain); -/* The old code still requests for a new regdomain and if +/* +* The old code still requests for a new regdomain and if * you have CRDA you get it updated, otherwise you get * stuck with the static values. We ignore "EU" code as -* that is not a valid ISO / IEC 3166 alpha2 */ -if (ieee80211_regdom[0 ] !='E' || ieee80211_regdom[1 ] !='U' ) - err =__regulatory_hint (NULL ,REGDOM_SET_BY_CORE , - ieee80211_regdom,0 ,ENVIRON_ANY ); +* that is not a valid ISO / IEC 3166 alpha2 +* stuck with the static values. Since "EU" is not a valid +* ISO / IEC 3166 alpha2 code we can't expect userpace to +* give us a regulatory domain for it. We need last_request +* iniitalized though so lets just send a request which we +* know will be ignored... this crap will be removed once +* OLD_REG dies. +*/ + err =__regulatory_hint (NULL ,REGDOM_SET_BY_CORE , + ieee80211_regdom,0 ,ENVIRON_ANY );#else cfg80211_regdomain = cfg80211_world_regdom;
net/xfrm/xfrm_state.c +1 -1
@@ -1615,7 +1615,7 @@ void xfrm_state_walk_done(struct xfrm_state_walk *walk)spin_lock_bh (&xfrm_state_lock);list_del (&walk->all); -spin_lock_bh (&xfrm_state_lock); +spin_unlock_bh (&xfrm_state_lock); }EXPORT_SYMBOL (xfrm_state_walk_done);