Linux 2.6.22.17
Subsystems (18)
We (the -stable team) are announcing the release of the 2.6.22.17 kernel.
It contains a number of bugfixes, and all users of the 2.6.22 series are encouraged to upgrade.
I'll also be replying to this message with a copy of the patch between 2.6.22.16 and 2.6.22.17
The updated 2.6.22.y git tree can be found at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-2.6.22.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.22.y.git;a=summarythanks,
greg k-h
--------
Makefile | 2 arch/powerpc/mm/hash_utils_64.c | 2 arch/sparc64/kernel/chmc.c | 16 +++-- arch/sparc64/kernel/entry.S | 12 +++ arch/sparc64/kernel/smp.c | 19 ++++-- arch/sparc64/mm/init.c | 29 ++++++--- drivers/acpi/dispatcher/dsobject.c | 91 ++++++++++++++++++++++++++++-- drivers/atm/nicstar.c | 19 ++---- drivers/char/drm/drm_vm.c | 2 drivers/char/mspec.c | 3 drivers/connector/cn_queue.c | 2 drivers/net/cassini.c | 45 +++----------- drivers/net/cassini.h | 18 ++--- drivers/net/chelsio/cxgb2.c | 66 ++++++++++++++++----- drivers/net/chelsio/pm3393.c | 112 ++++++++++++++----------------------- drivers/net/chelsio/sge.c | 40 +++++-------- drivers/net/chelsio/sge.h | 3 drivers/net/usb/kaweth.c | 2 drivers/net/usb/mcs7830.c | 4 - drivers/pci/quirks.c | 6 + fs/exec.c | 6 + fs/ncpfs/mmap.c | 3 include/asm-sparc64/hypervisor.h | 4 + include/linux/pci_ids.h | 2 kernel/relay.c | 1 mm/mmap.c | 2 net/atm/mpc.c | 7 ++ net/ax25/ax25_in.c | 2 net/ipv4/devinet.c | 2 net/ipv4/ip_gre.c | 2 net/ipv4/route.c | 8 +- net/irda/af_irda.c | 2 net/key/af_key.c | 14 +++- net/netrom/nr_dev.c | 2 net/x25/x25_forward.c | 5 - net/xfrm/xfrm_policy.c | 9 +- sound/oss/via82cxxx_audio.c | 14 +--- sound/usb/usx2y/usX2Yhwdep.c | 2 sound/usb/usx2y/usx2yhwdeppcm.c | 2 39 files changed, 355 insertions(+), 227 deletions(-)
Summary of changes from v2.6.22.16 to v2.6.22.17
================================================
Al Viro (1):
CASSINI: Fix endianness bug.
Bob Moore (1):
ACPICA: fix acpi-cpufreq boot crash due to _PSD return-by-reference
Chas Williams (1):
ATM: [nicstar] delay irq setup until card is configured
David Miller (6):
SPARC64: Fix two kernel linear mapping setup bugs.
SPARC64: Fix memory controller register access when non-SMP.
NET: Correct two mistaken skb_reset_mac_header() conversions. Fix sparc64 cpu cross call hangs.
CASSINI: Revert 'dont touch page_count'.
CASSINI: Set skb->truesize properly on receive packets.
Divy Le Ray (3):
cxgb: fix T2 GSO
cxgb: fix stats
chelsio: Fix skb->dev setting
Eric Dumazet (1):
IPV4 ROUTE: ip_rt_dump() is unecessary slow
Greg Kroah-Hartman (1):
Linux 2.6.22.17
Herbert Xu (3):
IPSEC: Fix potential dst leak in xfrm_lookup
IPSEC: Avoid undefined shift operation when testing algorithm ID
ATM: Check IP header validity in mpc_send_packet
Ilpo Järvinen (1):
POWERPC: Fix invalid semicolon after if statement
Ingo Molnar (1):
vfs: coredumping fix (CVE-2007-6206)
Julia Lawall (1):
X25: Add missing x25_neigh_put
Li Zefan (1):
CONNECTOR: Don't touch queue dev after decrement of ref count.
Mark McLoughlin (1):
INET: Fix netdev renaming and inet address labels
Nick Piggin (1):
vm audit: add VM_DONTEXPAND to mmap for drivers that need it (CVE-2008-0007)
Russ Dill (2):
NET: mcs7830 passes msecs instead of jiffies to usb_control_msg
NET: kaweth was forgotten in msec switchover of usb_start_wait_urb
Timo Teras (1):
IPV4: ip_gre: set mac_header correctly in receive path
Zhao Yakui (1):
ACPI: apply quirk_ich6_lpc_acpi to more ICH8 and ICH9
maximilian attems (1):
IRDA: irda_create() nuke user triggable printk
Makefile +1 -1
@@ -1,7 +1,7 @@ VERSION = 2 PATCHLEVEL = 6 SUBLEVEL = 22 -EXTRAVERSION = .16 +EXTRAVERSION = .17 NAME = Holy Dancing Manatees, Batman! # *DOCUMENTATION*
arch/powerpc/mm/hash_utils_64.c +1 -1
@@ -795,7 +795,7 @@ void hash_preload(struct mm_struct *mm, unsigned long ea,#ifdef CONFIG_PPC_MM_SLICES /* We only prefault standard pages for now */ -if (unlikely (get_slice_psize (mm, ea) != mm->context.user_psize)); +if (unlikely (get_slice_psize (mm, ea) != mm->context.user_psize))return ;#endif
arch/sparc64/kernel/chmc.c +10 -6
@@ -1,7 +1,6 @@ -/* $Id: chmc.c,v 1.4 2002/01/08 16:00:14 davem Exp $ -* memctrlr.c: Driver for UltraSPARC-III memory controller. +/* memctrlr.c: Driver for UltraSPARC-III memory controller. * -* Copyright (C) 2001 David S. Miller ([email protected]) +* Copyright (C) 2001, 2007 David S. Miller ([email protected]) */ #include <linux/module.h>
@@ -16,6 +15,7 @@#include <linux/init.h> #include <asm/spitfire.h> #include <asm/chmctrl.h> +#include <asm/cpudata.h> #include <asm/oplib.h> #include <asm/prom.h> #include <asm/io.h>
@@ -242,8 +242,11 @@ int chmc_getunumber(int syndrome_code,*/ static u64 read_mcreg (struct mctrl_info *mp,unsigned long offset) { -unsigned long ret; -int this_cpu =get_cpu (); +unsigned long ret, this_cpu; + +preempt_disable (); + + this_cpu =real_hard_smp_processor_id ();if (mp->portid == this_cpu) { __asm__ __volatile__("ldxa [%1] %2, %0"
@@ -255,7 +258,8 @@ static u64 read_mcreg(struct mctrl_info *mp, unsigned long offset) : "r" (mp->regs + offset), "i" (ASI_PHYS_BYPASS_EC_E)); } -put_cpu (); + +preempt_enable ();return ret; }
arch/sparc64/kernel/entry.S +12 -0
@@ -2593,3 +2593,15 @@ sun4v_mmustat_info: retl nop .size sun4v_mmustat_info, .-sun4v_mmustat_info + + .globl sun4v_mmu_demap_all + .type sun4v_mmu_demap_all,#function +sun4v_mmu_demap_all: + clr %o0 + clr %o1 + mov HV_MMU_ALL, %o2 + mov HV_FAST_MMU_DEMAP_ALL, %o5 + ta HV_FAST_TRAP + retl + nop + .size sun4v_mmu_demap_all, .-sun4v_mmu_demap_all
arch/sparc64/kernel/smp.c +13 -6
@@ -403,7 +403,7 @@ static __inline__ void spitfire_xcall_deliver(u64 data0, u64 data1, u64 data2, c*/ static void cheetah_xcall_deliver (u64 data0,u64 data1,u64 data2,cpumask_t mask) { -u64 pstate, ver; +u64 pstate, ver, busy_mask;int nack_busy_id, is_jbus, need_more;if (cpus_empty (mask))
@@ -435,14 +435,20 @@ retry: "i" (ASI_INTR_W)); nack_busy_id =0 ; + busy_mask =0 ; {int i;for_each_cpu_mask (i, mask) {u64 target = (i <<14 ) |0x70 ; -if (!is_jbus) +if (is_jbus) { + busy_mask |= (0x1UL << (i *2 )); + }else { target |= (nack_busy_id <<24 ); + busy_mask |= (0x1UL << + (nack_busy_id *2 )); + } __asm__ __volatile__("stxa %%g0, [%0] %1\n\t" "membar #Sync\n\t"
@@ -458,15 +464,16 @@ retry:/* Now, poll for completion. */ { -u64 dispatch_stat; +u64 dispatch_stat, nack_mask;long stuck; stuck =100000 * nack_busy_id; + nack_mask = busy_mask <<1 ; do { __asm__ __volatile__("ldxa [%%g0] %1, %0" : "=r" (dispatch_stat) : "i" (ASI_INTR_DISPATCH_STAT)); - if (dispatch_stat == 0UL) { + if (!(dispatch_stat & (busy_mask | nack_mask))) { __asm__ __volatile__("wrpr %0, 0x0, %%pstate" : : "r" (pstate)); if (unlikely(need_more)) {
@@ -483,12 +490,12 @@ retry: }if (!--stuck)break ; - }while (dispatch_stat &0x5555555555555555UL ); + }while (dispatch_stat & busy_mask); __asm__ __volatile__("wrpr %0, 0x0, %%pstate" : :"r" (pstate)); -if ((dispatch_stat & ~(0x5555555555555555UL )) ==0 ) { +if (dispatch_stat & busy_mask) {/* Busy bits will not clear, continue instead * of freezing up on this cpu. */
arch/sparc64/mm/init.c +20 -9
@@ -1135,14 +1135,9 @@ static void __init mark_kpte_bitmap(unsigned long start, unsigned long end) } } -static void __init kernel_physical_mapping_init (void ) +static void __init init_kpte_bitmap (void ) {unsigned long i; -#ifdef CONFIG_DEBUG_PAGEALLOC -unsigned long mem_alloced =0UL ; -#endif - -read_obp_memory ("reg" , &pall[0 ], &pall_ents);for (i =0 ; i < pall_ents; i++) {unsigned long phys_start, phys_end;
@@ -1151,14 +1146,24 @@ static void __init kernel_physical_mapping_init(void) phys_end = phys_start + pall[i].reg_size;mark_kpte_bitmap (phys_start, phys_end); + } +} +static void __init kernel_physical_mapping_init (void ) +{#ifdef CONFIG_DEBUG_PAGEALLOC +unsigned long i, mem_alloced =0UL ; + +for (i =0 ; i < pall_ents; i++) { +unsigned long phys_start, phys_end; + + phys_start = pall[i].phys_addr; + phys_end = phys_start + pall[i].reg_size; + mem_alloced +=kernel_map_range (phys_start, phys_end,PAGE_KERNEL ); -#endif } -#ifdef CONFIG_DEBUG_PAGEALLOC printk ("Allocated %ld bytes for kernel page tables.\n" , mem_alloced);
@@ -1400,6 +1405,10 @@ void __init paging_init(void)inherit_prom_mappings (); +read_obp_memory ("reg" , &pall[0 ], &pall_ents); + +init_kpte_bitmap (); +/* Ok, we can use our TLB miss and window trap handlers safely. */ setup_tba ();
@@ -1854,7 +1863,9 @@ void __flush_tlb_all(void) "wrpr %0, %1, %%pstate" : "=r" (pstate) : "i" (PSTATE_IE)); -if (tlb_type == spitfire) { +if (tlb_type == hypervisor) { +sun4v_mmu_demap_all (); + }else if (tlb_type == spitfire) {for (i =0 ; i <64 ; i++) {/* Spitfire Errata #32 workaround */ /* NOTE: Always runs on spitfire, so no
drivers/acpi/dispatcher/dsobject.c +85 -6
109 lines not on this page · raw message
drivers/atm/nicstar.c +9 -10
@@ -625,14 +625,6 @@ static int __devinit ns_init_card(int i, struct pci_dev *pcidev)if (mac[i] ==NULL )nicstar_init_eprom (card->membase); -if (request_irq (pcidev->irq, &ns_irq_handler,IRQF_DISABLED |IRQF_SHARED ,"nicstar" , card) !=0 ) - { -printk ("nicstar%d: can't allocate IRQ %d.\n" , i, pcidev->irq); - error =9 ; -ns_init_card_error (card, error); -return error; - } -/* Set the VPI/VCI MSb mask to zero so we can receive OAM cells */ writel (0x00000000 , card->membase +VPM );
@@ -858,8 +850,6 @@ static int __devinit ns_init_card(int i, struct pci_dev *pcidev) card->iovpool.count++; } - card->intcnt =0 ; -/* Configure NICStAR */ if (card->rct_size ==4096 ) ns_cfg_rctsize =NS_CFG_RCTSIZE_4096_ENTRIES ;
@@ -868,6 +858,15 @@ static int __devinit ns_init_card(int i, struct pci_dev *pcidev) card->efbie =1 ; + card->intcnt =0 ; +if (request_irq (pcidev->irq, &ns_irq_handler,IRQF_DISABLED |IRQF_SHARED ,"nicstar" , card) !=0 ) + { +printk ("nicstar%d: can't allocate IRQ %d.\n" , i, pcidev->irq); + error =9 ; +ns_init_card_error (card, error); +return error; + } +/* Register device */ card->atmdev =atm_dev_register ("nicstar" , &atm_ops,-1 ,NULL );if (card->atmdev ==NULL )
drivers/char/drm/drm_vm.c +2 -0
@@ -520,6 +520,7 @@ static int drm_mmap_dma(struct file *filp, struct vm_area_struct *vma) vma->vm_ops = &drm_vm_dma_ops; vma->vm_flags |=VM_RESERVED ;/* Don't swap */ + vma->vm_flags |=VM_DONTEXPAND ; vma->vm_file = filp;/* Needed for drm_vm_open() */ drm_vm_open_locked (vma);
@@ -669,6 +670,7 @@ static int drm_mmap_locked(struct file *filp, struct vm_area_struct *vma)return -EINVAL ;/* This should never happen. */ } vma->vm_flags |=VM_RESERVED ;/* Don't swap */ + vma->vm_flags |=VM_DONTEXPAND ; vma->vm_file = filp;/* Needed for drm_vm_open() */ drm_vm_open_locked (vma);
drivers/char/mspec.c +2 -1
@@ -265,7 +265,8 @@ mspec_mmap(struct file *file, struct vm_area_struct *vma, int type) vdata->refcnt =ATOMIC_INIT (1 ); vma->vm_private_data = vdata; - vma->vm_flags |= (VM_IO |VM_LOCKED |VM_RESERVED |VM_PFNMAP ); + vma->vm_flags |= (VM_IO |VM_LOCKED |VM_RESERVED |VM_PFNMAP | +VM_DONTEXPAND );if (vdata->type ==MSPEC_FETCHOP || vdata->type ==MSPEC_UNCACHED ) vma->vm_page_prot =pgprot_noncached (vma->vm_page_prot); vma->vm_ops = &mspec_vm_ops;
drivers/connector/cn_queue.c +1 -1
@@ -99,8 +99,8 @@ int cn_queue_add_callback(struct cn_queue_dev *dev, char *name, struct cb_id *idspin_unlock_bh (&dev->queue_lock);if (found) { -atomic_dec (&dev->refcnt);cn_queue_free_callback (cbq); +atomic_dec (&dev->refcnt);return -EINVAL ; }
drivers/net/cassini.c +10 -35
119 lines not on this page · raw message
drivers/net/cassini.h +9 -9
@@ -4122,8 +4122,8 @@ cas_saturn_patch_t cas_saturn_patch[] = {inserted into outgoing frame. */ struct cas_tx_desc { -u64 control; -u64 buffer; +__le64 control; +__le64 buffer; };/* descriptor ring for free buffers contains page-sized buffers. the index
@@ -4131,8 +4131,8 @@ struct cas_tx_desc {* the completion ring. */ struct cas_rx_desc { -u64 index; -u64 buffer; +__le64 index; +__le64 buffer; };/* received packets are put on the completion ring. */
@@ -4210,10 +4210,10 @@ struct cas_rx_desc {#define RX_INDEX_RELEASE 0x0000000000002000ULLstruct cas_rx_comp { -u64 word1; -u64 word2; -u64 word3; -u64 word4; +__le64 word1; +__le64 word2; +__le64 word3; +__le64 word4; };enum link_state {
@@ -4252,7 +4252,7 @@ struct cas_init_block {struct cas_rx_comp rxcs[N_RX_COMP_RINGS ][INIT_BLOCK_RX_COMP ];struct cas_rx_desc rxds[N_RX_DESC_RINGS ][INIT_BLOCK_RX_DESC ];struct cas_tx_desc txds[N_TX_RINGS ][INIT_BLOCK_TX ]; -u64 tx_compwb; +__le64 tx_compwb; };/* tiny buffers to deal with target abort issue. we allocate a bit
drivers/net/chelsio/cxgb2.c +51 -15
95 lines not on this page · raw message
drivers/net/chelsio/pm3393.c +45 -67
135 lines not on this page · raw message
drivers/net/chelsio/sge.c +16 -24
@@ -986,11 +986,10 @@ void t1_sge_get_port_stats(const struct sge *sge, int port,for_each_possible_cpu (cpu) {struct sge_port_stats *st =per_cpu_ptr (sge->port_stats[port], cpu); - ss->rx_packets += st->rx_packets; ss->rx_cso_good += st->rx_cso_good; - ss->tx_packets += st->tx_packets; ss->tx_cso += st->tx_cso; ss->tx_tso += st->tx_tso; + ss->tx_need_hdrroom += st->tx_need_hdrroom; ss->vlan_xtract += st->vlan_xtract; ss->vlan_insert += st->vlan_insert; }
@@ -1379,11 +1378,10 @@ static void sge_rx(struct sge *sge, struct freelQ *fl, unsigned int len) }__skb_pull (skb,sizeof (*p)); - skb->dev->last_rx = jiffies; st =per_cpu_ptr (sge->port_stats[p->iff],smp_processor_id ()); - st->rx_packets++; skb->protocol =eth_type_trans (skb, adapter->port[p->iff].dev); + skb->dev->last_rx = jiffies;if ((adapter->flags &RX_CSUM_ENABLED ) && p->csum ==0xffff && skb->protocol ==htons (ETH_P_IP ) && (skb->data[9 ] ==IPPROTO_TCP || skb->data[9 ] ==IPPROTO_UDP )) {
@@ -1851,7 +1849,8 @@ int t1_start_xmit(struct sk_buff *skb, struct net_device *dev) {struct adapter *adapter = dev->priv;struct sge *sge = adapter->sge; -struct sge_port_stats *st =per_cpu_ptr (sge->port_stats[dev->if_port],smp_processor_id ()); +struct sge_port_stats *st =per_cpu_ptr (sge->port_stats[dev->if_port], +smp_processor_id ());struct cpl_tx_pkt *cpl;struct sk_buff *orig_skb = skb;int ret;
@@ -1859,6 +1858,18 @@ int t1_start_xmit(struct sk_buff *skb, struct net_device *dev)if (skb->protocol ==htons (ETH_P_CPL5 )) goto send; +/* +* We are using a non-standard hard_header_len. +* Allocate more header room in the rare cases it is not big enough. +*/ +if (unlikely (skb_headroom (skb) < dev->hard_header_len -ETH_HLEN )) { + skb =skb_realloc_headroom (skb,sizeof (struct cpl_tx_pkt_lso )); + ++st->tx_need_hdrroom; +dev_kfree_skb_any (orig_skb); +if (!skb) +return NETDEV_TX_OK ; + } +if (skb_shinfo (skb)->gso_size) {int eth_type;struct cpl_tx_pkt_lso *hdr;
@@ -1892,24 +1903,6 @@ int t1_start_xmit(struct sk_buff *skb, struct net_device *dev)return NETDEV_TX_OK ; } -/* -* We are using a non-standard hard_header_len and some kernel -* components, such as pktgen, do not handle it right. -* Complain when this happens but try to fix things up. -*/ -if (unlikely (skb_headroom (skb) < dev->hard_header_len -ETH_HLEN )) { -pr_debug ("%s: headroom %d header_len %d\n" , dev->name, -skb_headroom (skb), dev->hard_header_len); - -if (net_ratelimit ()) -printk (KERN_ERR "%s: inadequate headroom in " -"Tx packet\n" , dev->name); - skb =skb_realloc_headroom (skb,sizeof (*cpl)); -dev_kfree_skb_any (orig_skb); -if (!skb) -return NETDEV_TX_OK ; - } -if (!(adapter->flags &UDP_CSUM_CAPABLE ) && skb->ip_summed ==CHECKSUM_PARTIAL &&ip_hdr (skb)->protocol ==IPPROTO_UDP ) {
@@ -1955,7 +1948,6 @@ int t1_start_xmit(struct sk_buff *skb, struct net_device *dev) cpl->vlan_valid =0 ; send: - st->tx_packets++; dev->trans_start = jiffies; ret =t1_sge_tx (skb, adapter,0 , dev);
drivers/net/chelsio/sge.h +1 -2
@@ -57,13 +57,12 @@ struct sge_intr_counts { };struct sge_port_stats { -u64 rx_packets;/* # of Ethernet packets received */ u64 rx_cso_good;/* # of successful RX csum offloads */ -u64 tx_packets;/* # of TX packets */ u64 tx_cso;/* # of TX checksum offloads */ u64 tx_tso;/* # of TSO requests */ u64 vlan_xtract;/* # of VLAN tag extractions */ u64 vlan_insert;/* # of VLAN tag insertions */ +u64 tx_need_hdrroom;/* # of TX skbs in need of more header room */ };struct sk_buff ;
drivers/net/usb/kaweth.c +1 -1
@@ -70,7 +70,7 @@#define KAWETH_TX_TIMEOUT (5 * HZ)#define KAWETH_SCRATCH_SIZE 32#define KAWETH_FIRMWARE_BUF_SIZE 4096 -#define KAWETH_CONTROL_TIMEOUT (30 * HZ) +#define KAWETH_CONTROL_TIMEOUT (30000)#define KAWETH_STATUS_BROKEN 0x0000001#define KAWETH_STATUS_CLOSING 0x0000002
drivers/net/usb/mcs7830.c +2 -2
@@ -94,7 +94,7 @@ static int mcs7830_get_reg(struct usbnet *dev, u16 index, u16 size, void *data) ret =usb_control_msg (xdev,usb_rcvctrlpipe (xdev,0 ),MCS7830_RD_BREQ ,MCS7830_RD_BMREQ ,0x0000 , index, data, - size,msecs_to_jiffies (MCS7830_CTRL_TIMEOUT )); + size,MCS7830_CTRL_TIMEOUT );return ret; }
@@ -105,7 +105,7 @@ static int mcs7830_set_reg(struct usbnet *dev, u16 index, u16 size, void *data) ret =usb_control_msg (xdev,usb_sndctrlpipe (xdev,0 ),MCS7830_WR_BREQ ,MCS7830_WR_BMREQ ,0x0000 , index, data, - size,msecs_to_jiffies (MCS7830_CTRL_TIMEOUT )); + size,MCS7830_CTRL_TIMEOUT );return ret; }
drivers/pci/quirks.c +6 -0
@@ -465,6 +465,12 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ICH7_31, quirkDECLARE_PCI_FIXUP_HEADER (PCI_VENDOR_ID_INTEL ,PCI_DEVICE_ID_INTEL_ICH8_0 , quirk_ich6_lpc_acpi );DECLARE_PCI_FIXUP_HEADER (PCI_VENDOR_ID_INTEL ,PCI_DEVICE_ID_INTEL_ICH8_2 , quirk_ich6_lpc_acpi );DECLARE_PCI_FIXUP_HEADER (PCI_VENDOR_ID_INTEL ,PCI_DEVICE_ID_INTEL_ICH8_3 , quirk_ich6_lpc_acpi ); +DECLARE_PCI_FIXUP_HEADER (PCI_VENDOR_ID_INTEL ,PCI_DEVICE_ID_INTEL_ICH8_1 , quirk_ich6_lpc_acpi ); +DECLARE_PCI_FIXUP_HEADER (PCI_VENDOR_ID_INTEL ,PCI_DEVICE_ID_INTEL_ICH8_4 , quirk_ich6_lpc_acpi ); +DECLARE_PCI_FIXUP_HEADER (PCI_VENDOR_ID_INTEL ,PCI_DEVICE_ID_INTEL_ICH9_2 , quirk_ich6_lpc_acpi ); +DECLARE_PCI_FIXUP_HEADER (PCI_VENDOR_ID_INTEL ,PCI_DEVICE_ID_INTEL_ICH9_4 , quirk_ich6_lpc_acpi ); +DECLARE_PCI_FIXUP_HEADER (PCI_VENDOR_ID_INTEL ,PCI_DEVICE_ID_INTEL_ICH9_7 , quirk_ich6_lpc_acpi ); +DECLARE_PCI_FIXUP_HEADER (PCI_VENDOR_ID_INTEL ,PCI_DEVICE_ID_INTEL_ICH9_8 , quirk_ich6_lpc_acpi );/* * VIA ACPI: One IO region pointed to by longword at
fs/exec.c +6 -0
@@ -1561,6 +1561,12 @@ int do_coredump(long signr, int exit_code, struct pt_regs * regs)but keep the previous behaviour for now. */ if (!ispipe && !S_ISREG (inode->i_mode)) goto close_fail; +/* +* Dont allow local users get cute and trick others to coredump +* into their pre-created files: +*/ +if (inode->i_uid != current->fsuid) + goto close_fail;if (!file->f_op) goto close_fail;if (!file->f_op->write)
fs/ncpfs/mmap.c +0 -3
@@ -47,9 +47,6 @@ static struct page* ncp_file_mmap_nopage(struct vm_area_struct *area, pos = address - area->vm_start + (area->vm_pgoff <<PAGE_SHIFT ); count =PAGE_SIZE ; -if (address +PAGE_SIZE > area->vm_end) { - count = area->vm_end - address; - }/* what we can read in one go */ bufsize =NCP_SERVER (inode)->buffer_size;
include/asm-sparc64/hypervisor.h +4 -0
@@ -709,6 +709,10 @@ extern unsigned long sun4v_mmu_tsb_ctx0(unsigned long num_descriptions,*/ #define HV_FAST_MMU_DEMAP_ALL 0x24 +#ifndef __ASSEMBLY__ +extern void sun4v_mmu_demap_all (void ); +#endif +/* mmu_map_perm_addr() * TRAP: HV_FAST_TRAP * FUNCTION: HV_FAST_MMU_MAP_PERM_ADDR
include/linux/pci_ids.h +2 -0
@@ -2285,6 +2285,8 @@#define PCI_DEVICE_ID_INTEL_ICH9_4 0x2914#define PCI_DEVICE_ID_INTEL_ICH9_5 0x2919#define PCI_DEVICE_ID_INTEL_ICH9_6 0x2930 +#define PCI_DEVICE_ID_INTEL_ICH9_7 0x2916 +#define PCI_DEVICE_ID_INTEL_ICH9_8 0x2918#define PCI_DEVICE_ID_INTEL_82855PM_HB 0x3340#define PCI_DEVICE_ID_INTEL_82830_HB 0x3575#define PCI_DEVICE_ID_INTEL_82830_CGC 0x3577
kernel/relay.c +1 -0
@@ -91,6 +91,7 @@ int relay_mmap_buf(struct rchan_buf *buf, struct vm_area_struct *vma)return -EINVAL ; vma->vm_ops = &relay_file_mmap_ops; + vma->vm_flags |=VM_DONTEXPAND ; vma->vm_private_data = buf; buf->chan->cb->buf_mapped (buf, filp);
mm/mmap.c +1 -1
@@ -2157,7 +2157,7 @@ int install_special_mapping(struct mm_struct *mm, vma->vm_start = addr; vma->vm_end = addr + len; - vma->vm_flags = vm_flags | mm->def_flags; + vma->vm_flags = vm_flags | mm->def_flags |VM_DONTEXPAND ; vma->vm_page_prot = protection_map[vma->vm_flags &7 ]; vma->vm_ops = &special_mapping_vmops;
net/atm/mpc.c +7 -0
@@ -542,6 +542,13 @@ static int mpc_send_packet(struct sk_buff *skb, struct net_device *dev)if (eth->h_proto !=htons (ETH_P_IP )) goto non_ip;/* Multi-Protocol Over ATM :-) */ +/* Weed out funny packets (e.g., AF_PACKET or raw). */ +if (skb->len <ETH_HLEN +sizeof (struct iphdr )) + goto non_ip; +skb_set_network_header (skb,ETH_HLEN ); +if (skb->len <ETH_HLEN +ip_hdr (skb)->ihl *4 ||ip_hdr (skb)->ihl <5 ) + goto non_ip; +while (i < mpc->number_of_mps_macs) {if (!compare_ether_addr (eth->h_dest, (mpc->mps_macs + i*ETH_ALEN )))if (send_via_shortcut (skb, mpc) ==0 )/* try shortcut */
net/ax25/ax25_in.c +1 -1
@@ -124,7 +124,7 @@ int ax25_rx_iframe(ax25_cb *ax25, struct sk_buff *skb) }skb_pull (skb,1 );/* Remove PID */ -skb_reset_mac_header (skb); + skb->mac_header = skb->network_header;skb_reset_network_header (skb); skb->dev = ax25->ax25_dev->dev; skb->pkt_type =PACKET_HOST ;
net/ipv4/devinet.c +1 -1
@@ -1030,7 +1030,7 @@ static void inetdev_changename(struct net_device *dev, struct in_device *in_dev)memcpy (ifa->ifa_label, dev->name,IFNAMSIZ );if (named++ ==0 )continue ; - dot =strchr (ifa->ifa_label,':' ); + dot =strchr (old,':' );if (dot ==NULL ) {sprintf (old,":%d" , named); dot = old;
net/ipv4/ip_gre.c +1 -1
@@ -613,7 +613,7 @@ static int ipgre_rcv(struct sk_buff *skb) offset +=4 ; } -skb_reset_mac_header (skb); + skb->mac_header = skb->network_header;__pskb_pull (skb, offset);skb_reset_network_header (skb);skb_postpull_rcsum (skb,skb_transport_header (skb), offset);
net/ipv4/route.c +4 -4
@@ -2885,11 +2885,10 @@ int ip_rt_dump(struct sk_buff *skb, struct netlink_callback *cb)int idx, s_idx; s_h = cb->args[0 ]; +if (s_h <0 ) + s_h =0 ; s_idx = idx = cb->args[1 ]; -for (h =0 ; h <= rt_hash_mask; h++) { -if (h < s_h)continue ; -if (h > s_h) - s_idx =0 ; +for (h = s_h; h <= rt_hash_mask; h++) {rcu_read_lock_bh ();for (rt =rcu_dereference (rt_hash_table[h].chain), idx =0 ; rt; rt =rcu_dereference (rt->u.dst.rt_next), idx++) {
@@ -2906,6 +2905,7 @@ int ip_rt_dump(struct sk_buff *skb, struct netlink_callback *cb)dst_release (xchg (&skb->dst,NULL )); }rcu_read_unlock_bh (); + s_idx =0 ; } done:
net/irda/af_irda.c +0 -2
@@ -1115,8 +1115,6 @@ static int irda_create(struct socket *sock, int protocol) self->max_sdu_size_rx =TTP_SAR_UNBOUND ;break ;default : -IRDA_ERROR ("%s: protocol not supported!\n" , - __FUNCTION__);return -ESOCKTNOSUPPORT ; }break ;
net/key/af_key.c +12 -2
@@ -2777,12 +2777,22 @@ static struct sadb_msg *pfkey_get_base_msg(struct sk_buff *skb, int *errp)static inline int aalg_tmpl_set (struct xfrm_tmpl *t,struct xfrm_algo_desc *d) { -return t->aalgos & (1 << d->desc.sadb_alg_id); +unsigned int id = d->desc.sadb_alg_id; + +if (id >=sizeof (t->aalgos) *8 ) +return 0 ; + +return (t->aalgos >> id) &1 ; }static inline int ealg_tmpl_set (struct xfrm_tmpl *t,struct xfrm_algo_desc *d) { -return t->ealgos & (1 << d->desc.sadb_alg_id); +unsigned int id = d->desc.sadb_alg_id; + +if (id >=sizeof (t->ealgos) *8 ) +return 0 ; + +return (t->ealgos >> id) &1 ; }static int count_ah_combs (struct xfrm_tmpl *t)
net/netrom/nr_dev.c +1 -1
@@ -56,7 +56,7 @@ int nr_rx_ip(struct sk_buff *skb, struct net_device *dev)/* Spoof incoming device */ skb->dev = dev; -skb_reset_mac_header (skb); + skb->mac_header = skb->network_header;skb_reset_network_header (skb); skb->pkt_type =PACKET_HOST ;
net/x25/x25_forward.c +3 -2
@@ -118,13 +118,14 @@ int x25_forward_data(int lci, struct x25_neigh *from, struct sk_buff *skb) { goto out;if ( (skbn =pskb_copy (skb,GFP_ATOMIC )) ==NULL ){ - goto out; + goto output; }x25_transmit_link (skbn, nb); -x25_neigh_put (nb); rc =1 ; +output: +x25_neigh_put (nb); out:return rc; }
net/xfrm/xfrm_policy.c +6 -3
@@ -1479,8 +1479,9 @@ restart:if (sk && sk->sk_policy[1 ]) { policy =xfrm_sk_policy_lookup (sk,XFRM_POLICY_OUT , fl); + err =PTR_ERR (policy);if (IS_ERR (policy)) -return PTR_ERR (policy); + goto dropdst; }if (!policy) {
@@ -1491,8 +1492,9 @@ restart: policy =flow_cache_lookup (fl, dst_orig->ops->family, dir, xfrm_policy_lookup); + err =PTR_ERR (policy);if (IS_ERR (policy)) -return PTR_ERR (policy); + goto dropdst; }if (!policy)
@@ -1661,8 +1663,9 @@ restart:return 0 ; error: -dst_release (dst_orig);xfrm_pols_put (pols, npols); +dropdst: +dst_release (dst_orig); *dst_p =NULL ;return err; }
sound/oss/via82cxxx_audio.c +6 -8
@@ -2104,6 +2104,7 @@ static struct page * via_mm_nopage (struct vm_area_struct * vma, {struct via_info *card = vma->vm_private_data;struct via_channel *chan = &card->ch_out; +unsigned long max_bufs;struct page *dmapage;unsigned long pgoff;int rd, wr;
@@ -2127,14 +2128,11 @@ static struct page * via_mm_nopage (struct vm_area_struct * vma, rd = card->ch_in.is_mapped; wr = card->ch_out.is_mapped; -#ifndef VIA_NDEBUG - { -unsigned long max_bufs = chan->frag_number; -if (rd && wr) max_bufs *=2 ; -/* via_dsp_mmap() should ensure this */ -assert (pgoff < max_bufs); - } -#endif + max_bufs = chan->frag_number; +if (rd && wr) + max_bufs *=2 ; +if (pgoff >= max_bufs) +return NOPAGE_SIGBUS ;/* if full-duplex (read+write) and we have two sets of bufs, * then the playback buffers come first, sez soundcard.c */
sound/usb/usx2y/usX2Yhwdep.c +1 -1
@@ -88,7 +88,7 @@ static int snd_us428ctls_mmap(struct snd_hwdep * hw, struct file *filp, struct v us428->us428ctls_sharedmem->CtlSnapShotLast =-2 ; } area->vm_ops = &us428ctls_vm_ops; - area->vm_flags |=VM_RESERVED ; + area->vm_flags |=VM_RESERVED |VM_DONTEXPAND ; area->vm_private_data = hw->private_data;return 0 ; }
sound/usb/usx2y/usx2yhwdeppcm.c +1 -1
@@ -728,7 +728,7 @@ static int snd_usX2Y_hwdep_pcm_mmap(struct snd_hwdep * hw, struct file *filp, streturn -ENODEV ; } area->vm_ops = &snd_usX2Y_hwdep_pcm_vm_ops; - area->vm_flags |=VM_RESERVED ; + area->vm_flags |=VM_RESERVED |VM_DONTEXPAND ; area->vm_private_data = hw->private_data;return 0 ; }