Linux 2.6.26.4
Subsystems (30)
We (the -stable team) are announcing the release of the 2.6.26.4 kernel.
It contains lots of bugfixes, all over the map. Any users of the 2.6.26 kernel series should upgrade to this version. For details on the fixes, see the changelog entries and the diffstat below.
I'll also be replying to this message with a copy of the patch between 2.6.26.3 and 2.6.26.4
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.26.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.26.y.git;a=summarythanks,
greg k-h
------------
Makefile | 2 arch/sparc64/mm/init.c | 30 ++++++++--- arch/x86/kernel/cpu/cyrix.c | 18 ------ arch/x86/kernel/cpu/mtrr/generic.c | 20 ++++++- arch/x86/kvm/paging_tmpl.h | 2 crypto/authenc.c | 10 ++- drivers/ata/sata_mv.c | 34 +++---------- drivers/char/random.c | 19 +++---- drivers/misc/eeepc-laptop.c | 2 drivers/net/atlx/atl1.c | 1 drivers/net/forcedeth.c | 4 - drivers/net/r8169.c | 2 drivers/net/tg3.c | 53 ++++++++++++++------ drivers/net/tg3.h | 3 + drivers/pci/search.c | 2 drivers/rtc/rtc-lib.c | 5 + drivers/s390/block/dasd_eckd.h | 2 drivers/serial/8250.c | 16 ++++-- drivers/serial/8250.h | 1 drivers/usb/class/cdc-acm.c | 2 drivers/video/fb_defio.c | 19 +++++++ drivers/video/fbmem.c | 4 + fs/binfmt_misc.c | 4 - fs/bio.c | 48 ++++++++++++------ fs/cifs/file.c | 4 + fs/cramfs/inode.c | 84 ++++++++++++++------------------ fs/nfsd/nfs4acl.c | 2 include/linux/Kbuild | 1 include/linux/fb.h | 3 + include/linux/mroute.h | 25 ++++++++- include/linux/pim.h | 45 ----------------- include/net/addrconf.h | 3 - include/net/ip6_route.h | 1 mm/page_alloc.c | 7 ++ net/ax25/sysctl_net_ax25.c | 14 +---- net/ipv4/udp.c | 6 +- net/ipv6/addrconf.c | 3 - net/ipv6/fib6_rules.c | 3 - net/ipv6/ip6_fib.c | 1 net/ipv6/ip6_output.c | 2 net/ipv6/ndisc.c | 2 net/ipv6/route.c | 13 +++-- net/ipv6/udp.c | 6 +- net/ipv6/xfrm6_policy.c | 4 + net/sched/act_api.c | 5 - net/sched/sch_htb.c | 20 ++++--- net/sched/sch_prio.c | 16 ++++-- net/sched/sch_tbf.c | 11 ---- net/sctp/auth.c | 7 ++ net/sctp/endpointola.c | 4 - net/sctp/ipv6.c | 3 - net/sctp/socket.c | 96 ++++++++++++++++++++++++++++--------- net/sunrpc/sysctl.c | 18 +----- net/xfrm/xfrm_state.c | 32 ++++++++---- sound/pci/oxygen/oxygen_mixer.c | 5 + 55 files changed, 438 insertions(+), 311 deletions(-)
Adam Litke (1):
mm: make setup_zone_migrate_reserve() aware of overlapping nodes
Al Viro (1):
cramfs: fix named-pipe handling
Alexey Dobriyan (1):
USB: cdc-acm: don't unlock acm->mutex on error path
Andrew Morton (1):
drivers/char/random.c: fix a race which can lead to a bogus BUG()
Avi Kivity (1):
KVM: MMU: Fix torn shadow pte
Ayaz Abdulla (1):
forcedeth: fix checksum flag
Brian Haley (2):
ipv6: Fix OOPS, ip -f inet6 route get fec0::1, linux-2.6.26, ip6_route_output, rt6_fill_node+0x175
netns: Add network namespace argument to rt6_fill_node() and ipv6_dev_get_saddr()
Clemens Ladisch (1):
ALSA: oxygen: prevent muting of nonexistent AC97 controls
Cyrill Gorcunov (1):
sunrpc: fix possible overrun on read of /proc/sys/sunrpc/transports
David S. Miller (5):
pkt_sched: Fix return value corruption in HTB and TBF.
net: Unbreak userspace which includes linux/mroute.h
ipsec: Fix deadlock in xfrm_state management.
sparc64: Fix overshoot in nid_range().
sparc64: Fix cmdline_memory_size handling bugs.
FUJITA Tomonori (2):
bio: fix __bio_copy_iov() handling of bio->bv_len
bio: fix bio_copy_kern() handling of bio->bv_lenFrancois Romieu (1):
r8169: balance pci_map / pci_unmap pair
Greg Kroah-Hartman (2):
PCI: fix reference leak in pci_get_dev_by_id() Linux 2.6.26.4
Herbert Xu (2):
udp: Drop socket lock for encapsulated packets
crypto: authenc - Avoid using clobbered request pointer
Ian Campbell (1):
fbdefio: add set_page_dirty handler to deferred IO FB
Ingo Molnar (1):
x86: work around MTRR mask setting, v2
J. Bruce Fields (1):
nfsd: fix buffer overrun decoding NFSv4 acl
Jamal Hadi Salim (1):
pkt_sched: Fix actions referencing
Jan Altenberg (1):
rtc_time_to_tm: fix signed/unsigned arithmetic
Jay Cliburn (1):
atl1: disable TSO by default
Jeff Layton (1):
cifs: fix O_APPEND on directio mounts
Matt Carlson (1):
tg3: Fix firmware event timeouts
Matthew Garrett (1):
eeepc-laptop: fix use after free
Pavel Emelyanov (1):
binfmt_misc: fix false -ENOEXEC when coupled with other binary handlers
Ralf Baechle (1):
AX.25: Fix sysctl registration if !CONFIG_AX25_DAMA_SLAVE
Samuel Sieb (1):
x86: fix "kernel won't boot on a Cyrix MediaGXm (Geode)"
Stefan Weinhuber (1):
S390 dasd: fix data size for PSF/PRSSD command
Tejun Heo (1):
sata_mv: don't issue two DMA commands concurrently
Thomas Graf (1):
sch_prio: Fix nla_parse_nested_compat() regression
Vlad Yasevich (4):
sctp: fix potential panics in the SCTP-AUTH API.
sctp: add verification checks to SCTP_AUTH_KEY option
sctp: correct bounds check in sctp_setsockopt_auth_key
sctp: fix random memory dereference with SCTP_HMAC_IDENT option.
Will Newton (1):
8250: improve workaround for UARTs that don't re-assert THRE correctly
Yinghai Lu (1):
x86: work around MTRR mask setting
Makefile +1 -1
@@ -1,7 +1,7 @@ VERSION = 2 PATCHLEVEL = 6 SUBLEVEL = 26 -EXTRAVERSION = .3 +EXTRAVERSION = .4 NAME = Rotary Wombat # *DOCUMENTATION*
arch/sparc64/mm/init.c +22 -8
@@ -842,6 +842,9 @@ static unsigned long nid_range(unsigned long start, unsigned long end, start += PAGE_SIZE; } +if (start > end) + start = end; +return start; }#else
@@ -1769,8 +1772,7 @@ void __init paging_init(void)find_ramdisk (phys_base); -if (cmdline_memory_size) -lmb_enforce_memory_limit (phys_base + cmdline_memory_size); +lmb_enforce_memory_limit (cmdline_memory_size);lmb_analyze ();lmb_dump_all ();
@@ -2007,6 +2009,15 @@ void __init mem_init(void)void free_initmem (void ) {unsigned long addr, initend; +int do_free =1 ; + +/* If the physical memory maps were trimmed by kernel command +* line options, don't even try freeing this initmem stuff up. +* The kernel image could have been in the trimmed out region +* and if so the freeing below will free invalid page structs. +*/ +if (cmdline_memory_size) + do_free =0 ;/* * The init section is aligned to 8k in vmlinux.lds. Page align for >8k pagesizes.
@@ -2021,13 +2032,16 @@ void free_initmem(void) ((unsigned long )__va (kern_base)) - ((unsigned long) KERNBASE));memset ((void *)addr,POISON_FREE_INITMEM ,PAGE_SIZE ); - p =virt_to_page (page); -ClearPageReserved (p); -init_page_count (p); -__free_page (p); - num_physpages++; - totalram_pages++; +if (do_free) { + p =virt_to_page (page); + +ClearPageReserved (p); +init_page_count (p); +__free_page (p); + num_physpages++; + totalram_pages++; + } } }
arch/x86/kernel/cpu/cyrix.c +0 -18
@@ -134,23 +134,6 @@ static void __cpuinit set_cx86_memwb(void)setCx86 (CX86_CCR2 ,getCx86 (CX86_CCR2 ) |0x14 ); } -static void __cpuinit set_cx86_inc (void ) -{ -unsigned char ccr3; - -printk (KERN_INFO "Enable Incrementor on Cyrix/NSC processor.\n" ); - - ccr3 =getCx86 (CX86_CCR3 ); -setCx86 (CX86_CCR3 , (ccr3 &0x0f ) |0x10 );/* enable MAPEN */ -/* PCR1 -- Performance Control */ -/* Incrementor on, whatever that is */ -setCx86 (CX86_PCR1 ,getCx86 (CX86_PCR1 ) |0x02 ); -/* PCR0 -- Performance Control */ -/* Incrementor Margin 10 */ -setCx86 (CX86_PCR0 ,getCx86 (CX86_PCR0 ) |0x04 ); -setCx86 (CX86_CCR3 , ccr3);/* disable MAPEN */ -} -/* * Configure later MediaGX and/or Geode processor. */
@@ -174,7 +157,6 @@ static void __cpuinit geode_configure(void)set_cx86_memwb ();set_cx86_reorder (); -set_cx86_inc ();local_irq_restore (flags); }
arch/x86/kernel/cpu/mtrr/generic.c +18 -2
@@ -365,6 +365,7 @@ static void generic_get_mtrr(unsigned int reg, unsigned long *base, unsigned long *size, mtrr_type *type) { unsigned int mask_lo, mask_hi, base_lo, base_hi; +unsigned int tmp, hi;rdmsr (MTRRphysMask_MSR (reg), mask_lo, mask_hi);if ((mask_lo &0x800 ) ==0 ) {
@@ -378,8 +379,23 @@ static void generic_get_mtrr(unsigned int reg, unsigned long *base,rdmsr (MTRRphysBase_MSR (reg), base_lo, base_hi);/* Work out the shifted address mask. */ - mask_lo = size_or_mask | mask_hi << (32 -PAGE_SHIFT ) - | mask_lo >>PAGE_SHIFT ; + tmp = mask_hi << (32 -PAGE_SHIFT ) | mask_lo >>PAGE_SHIFT ; + mask_lo = size_or_mask | tmp; +/* Expand tmp with high bits to all 1s*/ + hi =fls (tmp); +if (hi >0 ) { + tmp |= ~((1 <<(hi -1 )) -1 ); + +if (tmp != mask_lo) { +static int once =1 ; + +if (once) { +printk (KERN_INFO "mtrr: your BIOS has set up an incorrect mask, fixing it up.\n" ); + once =0 ; + } + mask_lo = tmp; + } + }/* This works correctly if size is a power of two, i.e. a contiguous range. */
arch/x86/kvm/paging_tmpl.h +1 -1
@@ -343,7 +343,7 @@ static u64 *FNAME(fetch)(struct kvm_vcpu *vcpu, gva_t addr, shadow_addr =__pa (shadow_page->spt); shadow_pte = shadow_addr |PT_PRESENT_MASK |PT_ACCESSED_MASK |PT_WRITABLE_MASK |PT_USER_MASK ; - *shadow_ent = shadow_pte; +set_shadow_pte (shadow_ent, shadow_pte); } mmu_set_spte(vcpu, shadow_ent, access, walker->pte_access & access,
crypto/authenc.c +6 -4
@@ -174,8 +174,9 @@ static int crypto_authenc_genicv(struct aead_request *req, u8 *iv,static void crypto_authenc_encrypt_done (struct crypto_async_request *req,int err) { +struct aead_request *areq = req->data; +if (!err) { -struct aead_request *areq = req->data;struct crypto_aead *authenc =crypto_aead_reqtfm (areq);struct crypto_authenc_ctx *ctx =crypto_aead_ctx (authenc);struct ablkcipher_request *abreq =aead_request_ctx (areq);
@@ -185,7 +186,7 @@ static void crypto_authenc_encrypt_done(struct crypto_async_request *req, err =crypto_authenc_genicv (areq, iv,0 ); } -aead_request_complete (req->data, err); +aead_request_complete (areq, err); }static int crypto_authenc_encrypt (struct aead_request *req)
@@ -216,14 +217,15 @@ static int crypto_authenc_encrypt(struct aead_request *req)static void crypto_authenc_givencrypt_done (struct crypto_async_request *req,int err) { +struct aead_request *areq = req->data; +if (!err) { -struct aead_request *areq = req->data;struct skcipher_givcrypt_request *greq =aead_request_ctx (areq); err =crypto_authenc_genicv (areq, greq->giv,0 ); } -aead_request_complete (req->data, err); +aead_request_complete (areq, err); }static int crypto_authenc_givencrypt (struct aead_givcrypt_request *req)
drivers/ata/sata_mv.c +10 -24
@@ -1134,30 +1134,16 @@ static int mv_qc_defer(struct ata_queued_cmd *qc)if (ap->nr_active_links ==0 )return 0 ; -if (pp->pp_flags &MV_PP_FLAG_EDMA_EN ) { -/* -* The port is operating in host queuing mode (EDMA). -* It can accomodate a new qc if the qc protocol -* is compatible with the current host queue mode. -*/ -if (pp->pp_flags &MV_PP_FLAG_NCQ_EN ) { -/* -* The host queue (EDMA) is in NCQ mode. -* If the new qc is also an NCQ command, -* then allow the new qc. -*/ -if (qc->tf.protocol ==ATA_PROT_NCQ ) -return 0 ; - }else { -/* -* The host queue (EDMA) is in non-NCQ, DMA mode. -* If the new qc is also a non-NCQ, DMA command, -* then allow the new qc. -*/ -if (qc->tf.protocol ==ATA_PROT_DMA ) -return 0 ; - } - } +/* +* The port is operating in host queuing mode (EDMA) with NCQ +* enabled, allow multiple NCQ commands. EDMA also allows +* queueing multiple DMA commands but libata core currently +* doesn't allow it. +*/ +if ((pp->pp_flags &MV_PP_FLAG_EDMA_EN ) && + (pp->pp_flags &MV_PP_FLAG_NCQ_EN ) &&ata_is_ncq (qc->tf.protocol)) +return 0 ; +return ATA_DEFER_PORT ; }
drivers/char/random.c +10 -9
@@ -406,7 +406,7 @@ struct entropy_store {/* read-write data: */ spinlock_t lock;unsigned add_ptr; -int entropy_count; +int entropy_count;/* Must at no time exceed ->POOLBITS! */ int input_rotate; };
@@ -519,6 +519,7 @@ static void mix_pool_bytes(struct entropy_store *r, const void *in, int bytes)static void credit_entropy_bits (struct entropy_store *r,int nbits) {unsigned long flags; +int entropy_count;if (!nbits)return ;
@@ -526,20 +527,20 @@ static void credit_entropy_bits(struct entropy_store *r, int nbits)spin_lock_irqsave (&r->lock, flags);DEBUG_ENT ("added %d entropy credits to %s\n" , nbits, r->name); - r->entropy_count += nbits; -if (r->entropy_count <0 ) { + entropy_count = r->entropy_count; + entropy_count += nbits; +if (entropy_count <0 ) {DEBUG_ENT ("negative entropy/overflow\n" ); - r->entropy_count =0 ; - }else if (r->entropy_count > r->poolinfo->POOLBITS) - r->entropy_count = r->poolinfo->POOLBITS; + entropy_count =0 ; + }else if (entropy_count > r->poolinfo->POOLBITS) + entropy_count = r->poolinfo->POOLBITS; + r->entropy_count = entropy_count;/* should we wake readers? */ -if (r == &input_pool && - r->entropy_count >= random_read_wakeup_thresh) { +if (r == &input_pool && entropy_count >= random_read_wakeup_thresh) {wake_up_interruptible (&random_read_wait);kill_fasync (&fasync,SIGIO ,POLL_IN ); } -spin_unlock_irqrestore (&r->lock, flags); }
drivers/misc/eeepc-laptop.c +1 -1
@@ -553,9 +553,9 @@ static void eeepc_hwmon_exit(void) hwmon = eeepc_hwmon_device;if (!hwmon)return ; -hwmon_device_unregister (hwmon);sysfs_remove_group (&hwmon->kobj, &hwmon_attribute_group); +hwmon_device_unregister (hwmon); eeepc_hwmon_device =NULL ; }
drivers/net/atlx/atl1.c +0 -1
@@ -3019,7 +3019,6 @@ static int __devinit atl1_probe(struct pci_dev *pdev, netdev->features =NETIF_F_HW_CSUM ; netdev->features |=NETIF_F_SG ; netdev->features |= (NETIF_F_HW_VLAN_TX |NETIF_F_HW_VLAN_RX ); - netdev->features |=NETIF_F_TSO ; netdev->features |=NETIF_F_LLTX ;/*
drivers/net/forcedeth.c +2 -2
@@ -5420,7 +5420,7 @@ static int __devinit nv_probe(struct pci_dev *pci_dev, const struct pci_device_iif (id->driver_data &DEV_HAS_CHECKSUM ) { np->rx_csum =1 ; np->txrxctl_bits |=NVREG_TXRXCTL_RXCHECK ; - dev->features |=NETIF_F_HW_CSUM |NETIF_F_SG ; + dev->features |=NETIF_F_IP_CSUM |NETIF_F_SG ; dev->features |=NETIF_F_TSO ; }
@@ -5728,7 +5728,7 @@ static int __devinit nv_probe(struct pci_dev *pci_dev, const struct pci_device_i dev_printk(KERN_INFO, &pci_dev->dev, "%s%s%s%s%s%s%s%s%s%sdesc-v%u\n", dev->features & NETIF_F_HIGHDMA ? "highdma " : "", - dev->features & (NETIF_F_HW_CSUM | NETIF_F_SG) ? + dev->features & (NETIF_F_IP_CSUM | NETIF_F_SG) ? "csum " : "", dev->features & (NETIF_F_HW_VLAN_RX | NETIF_F_HW_VLAN_TX) ? "vlan " : "",
drivers/net/r8169.c +1 -1
@@ -2822,7 +2822,7 @@ static int rtl8169_rx_interrupt(struct net_device *dev, pkt_size, PCI_DMA_FROMDEVICE);rtl8169_mark_to_asic (desc, tp->rx_buf_sz); }else { -pci_unmap_single (pdev, addr, pkt_size, +pci_unmap_single (pdev, addr, tp->rx_buf_sz,PCI_DMA_FROMDEVICE ); tp->Rx_skbuff[entry] =NULL ; }
drivers/net/tg3.c +37 -16
99 lines not on this page · raw message
drivers/net/tg3.h +3 -0
@@ -2404,7 +2404,10 @@ struct tg3 {struct tg3_ethtool_stats estats;struct tg3_ethtool_stats estats_prev; +union {unsigned long phy_crc_errors; +unsigned long last_event_jiffies; + };u32 rx_offset;u32 tg3_flags;
drivers/pci/search.c +2 -0
@@ -280,6 +280,8 @@ static struct pci_dev *pci_get_dev_by_id(const struct pci_device_id *id, match_pci_dev_by_id);if (dev) pdev =to_pci_dev (dev); +if (from) +pci_dev_put (from);return pdev; }
drivers/rtc/rtc-lib.c +3 -2
@@ -51,10 +51,11 @@ EXPORT_SYMBOL(rtc_year_days);*/ void rtc_time_to_tm (unsigned long time,struct rtc_time *tm) { -unsigned int days, month, year; +unsigned int month, year; +int days; days = time /86400 ; - time -= days *86400 ; + time -= (unsigned int ) days *86400 ;/* day of the week, 1970-01-01 was a Thursday */ tm->tm_wday = (days +4 ) %7 ;
drivers/s390/block/dasd_eckd.h +1 -1
@@ -379,7 +379,7 @@ struct dasd_psf_prssd_data {unsigned char flags;unsigned char reserved[4 ];unsigned char suborder; -unsigned char varies[9 ]; +unsigned char varies[5 ]; } __attribute__ ((packed));/*
drivers/serial/8250.c +12 -4
@@ -1895,15 +1895,23 @@ static int serial8250_startup(struct uart_port *port)* kick the UART on a regular basis. */ if (!(iir1 &UART_IIR_NO_INT ) && (iir &UART_IIR_NO_INT )) { + up->bugs |=UART_BUG_THRE ;pr_debug ("ttyS%d - using backup timer\n" , port->line); - up->timer.function = serial8250_backup_timeout; - up->timer.data = (unsigned long )up; -mod_timer (&up->timer, jiffies + -poll_timeout (up->port.timeout) +HZ /5 ); } }/* +* The above check will only give an accurate result the first time +* the port is opened so this value needs to be preserved. +*/ +if (up->bugs &UART_BUG_THRE ) { + up->timer.function = serial8250_backup_timeout; + up->timer.data = (unsigned long )up; +mod_timer (&up->timer, jiffies + +poll_timeout (up->port.timeout) +HZ /5 ); + } + +/* * If the "interrupt" for this port doesn't correspond with any * hardware interrupt, we use a timer-based system. The original * driver used to do this with IRQ0.
drivers/serial/8250.h +1 -0
@@ -49,6 +49,7 @@ struct serial8250_config {#define UART_BUG_QUOT (1 << 0)/* UART has buggy quot LSB */ #define UART_BUG_TXEN (1 << 1)/* UART has buggy TX IIR status */ #define UART_BUG_NOMSR (1 << 2)/* UART has buggy MSR status bits (Au1x00) */ +#define UART_BUG_THRE (1 << 3)/* UART has buggy THRE reassertion */ #define PROBE_RSA (1 << 0)#define PROBE_ANY (~0)
drivers/usb/class/cdc-acm.c +1 -1
@@ -525,8 +525,8 @@ static int acm_tty_open(struct tty_struct *tty, struct file *filp)tasklet_schedule (&acm->urb_task); done: -err_out:mutex_unlock (&acm->mutex); +err_out:mutex_unlock (&open_mutex);return rv;
drivers/video/fb_defio.c +19 -0
@@ -114,6 +114,17 @@ static struct vm_operations_struct fb_deferred_io_vm_ops = { .page_mkwrite = fb_deferred_io_mkwrite, }; +static int fb_deferred_io_set_page_dirty (struct page *page) +{ +if (!PageDirty (page)) +SetPageDirty (page); +return 0 ; +} + +static const struct address_space_operations fb_deferred_io_aops = { + .set_page_dirty = fb_deferred_io_set_page_dirty, +}; +static int fb_deferred_io_mmap (struct fb_info *info,struct vm_area_struct *vma) { vma->vm_ops = &fb_deferred_io_vm_ops;
@@ -163,6 +174,14 @@ void fb_deferred_io_init(struct fb_info *info) }EXPORT_SYMBOL_GPL (fb_deferred_io_init); +void fb_deferred_io_open (struct fb_info *info, +struct inode *inode, +struct file *file) +{ + file->f_mapping->a_ops = &fb_deferred_io_aops; +} +EXPORT_SYMBOL_GPL (fb_deferred_io_open); +void fb_deferred_io_cleanup (struct fb_info *info) {void *screen_base = (void __force *) info->screen_base;
drivers/video/fbmem.c +4 -0
@@ -1340,6 +1340,10 @@ fb_open(struct inode *inode, struct file *file)if (res)module_put (info->fbops->owner); } +#ifdef CONFIG_FB_DEFERRED_IO +if (info->fbdefio) +fb_deferred_io_open (info, inode, file); +#endif return res; }
fs/binfmt_misc.c +2 -2
@@ -119,8 +119,6 @@ static int load_misc_binary(struct linux_binprm *bprm, struct pt_regs *regs)if (bprm->misc_bang) goto _ret; - bprm->misc_bang =1 ; -/* to keep locking time low, we copy the interpreter string */ read_lock (&entries_lock); fmt =check_file (bprm);
@@ -198,6 +196,8 @@ static int load_misc_binary(struct linux_binprm *bprm, struct pt_regs *regs)if (retval <0 ) goto _error; + bprm->misc_bang =1 ; + retval =search_binary_handler (bprm, regs);if (retval <0 ) goto _error;
fs/bio.c +33 -15
133 lines not on this page · raw message
fs/cifs/file.c +4 -0
@@ -832,6 +832,10 @@ ssize_t cifs_user_write(struct file *file, const char __user *write_data,return -EBADF ; open_file = (struct cifsFileInfo *) file->private_data; + rc =generic_write_checks (file, poffset, &write_size,0 ); +if (rc) +return rc; + xid =GetXid ();if (*poffset > file->f_path.dentry->d_inode->i_size)
fs/cramfs/inode.c +38 -46
114 lines not on this page · raw message
fs/nfsd/nfs4acl.c +1 -1
@@ -443,7 +443,7 @@ init_state(struct posix_acl_state *state, int cnt)* enough space for either: */ alloc =sizeof (struct posix_ace_state_array ) - + cnt*sizeof (struct posix_ace_state ); + + cnt*sizeof (struct posix_user_ace_state ); state->users =kzalloc (alloc,GFP_KERNEL );if (!state->users)return -ENOMEM ;
include/linux/Kbuild +0 -1
@@ -293,7 +293,6 @@ unifdef-y += parport.h unifdef-y += patchkey.h unifdef-y += pci.h unifdef-y += personality.h -unifdef-y += pim.h unifdef-y += pktcdvd.h unifdef-y += pmu.h unifdef-y += poll.h
include/linux/fb.h +3 -0
@@ -973,6 +973,9 @@ static inline void __fb_pad_aligned_buffer(u8 *dst, u32 d_pitch,/* drivers/video/fb_defio.c */ extern void fb_deferred_io_init (struct fb_info *info); +extern void fb_deferred_io_open (struct fb_info *info, +struct inode *inode, +struct file *file);extern void fb_deferred_io_cleanup (struct fb_info *info);extern int fb_deferred_io_fsync (struct file *file,struct dentry *dentry,int datasync);
include/linux/mroute.h +21 -4
@@ -2,11 +2,7 @@#define __LINUX_MROUTE_H#include <linux/sockios.h> -#include <linux/types.h> -#ifdef __KERNEL__#include <linux/in.h> -#endif -#include <linux/pim.h> /* * Based on the MROUTING 3.5 defines primarily to keep
@@ -214,6 +210,27 @@ struct mfc_cache#define IGMPMSG_WHOLEPKT 3/* For PIM Register processing */ #ifdef __KERNEL__ + +#define PIM_V1_VERSION __constant_htonl(0x10000000) +#define PIM_V1_REGISTER 1 + +#define PIM_VERSION 2 +#define PIM_REGISTER 1 + +#define PIM_NULL_REGISTER __constant_htonl(0x40000000) + +/* PIMv2 register message header layout (ietf-draft-idmr-pimvsm-v2-00.ps */ + +struct pimreghdr +{ +__u8 type; +__u8 reserved; +__be16 csum; +__be32 flags; +}; + +extern int pim_rcv_v1 (struct sk_buff *); +struct rtmsg ;extern int ipmr_get_route (struct sk_buff *skb,struct rtmsg *rtm,int nowait);#endif
include/linux/pim.h deleted +0 -45
45 lines not on this page · raw message
include/net/addrconf.h +2 -1
@@ -80,7 +80,8 @@ extern struct inet6_ifaddr *ipv6_get_ifaddr(struct net *net,struct net_device *dev, int strict); -extern int ipv6_dev_get_saddr (struct net_device *dev, +extern int ipv6_dev_get_saddr (struct net *net, +struct net_device *dev,const struct in6_addr *daddr,unsigned int srcprefs,struct in6_addr *saddr);
include/net/ip6_route.h +1 -0
@@ -112,6 +112,7 @@ struct rt6_rtnl_dump_arg {struct sk_buff *skb;struct netlink_callback *cb; +struct net *net; };extern int rt6_dump_route (struct rt6_info *rt,void *p_arg);
mm/page_alloc.c +7 -0
@@ -693,6 +693,9 @@ int move_freepages(struct zone *zone,#endif for (page = start_page; page <= end_page;) { +/* Make sure we are not inadvertently changing nodes */ +VM_BUG_ON (page_to_nid (page) !=zone_to_nid (zone)); +if (!pfn_valid_within (page_to_pfn (page))) { page++;continue ;
@@ -2475,6 +2478,10 @@ static void setup_zone_migrate_reserve(struct zone *zone)continue ; page =pfn_to_page (pfn); +/* Watch out for overlapping nodes */ +if (page_to_nid (page) !=zone_to_nid (zone)) +continue ; +/* Blocks with reserved pages will never free, skip them. */ if (PageReserved (page))continue ;
net/ax25/sysctl_net_ax25.c +4 -10
@@ -36,6 +36,7 @@ static struct ctl_path ax25_path[] = { { .procname = "ax25", .ctl_name = NET_AX25, }, { } }; +static const ctl_table ax25_param_table[] = { { .ctl_name =NET_AX25_IP_DEFAULT_MODE ,
@@ -167,6 +168,7 @@ static const ctl_table ax25_param_table[] = { .extra1 = &min_proto, .extra2 = &max_proto }, +#ifdef CONFIG_AX25_DAMA_SLAVE { .ctl_name = NET_AX25_DAMA_SLAVE_TIMEOUT, .procname = "dama_slave_timeout",
@@ -177,6 +179,8 @@ static const ctl_table ax25_param_table[] = { .extra1 = &min_ds_timeout, .extra2 = &max_ds_timeout }, +#endif + { .ctl_name = 0 } /* that's all, folks! */ };
@@ -210,16 +214,6 @@ void ax25_register_sysctl(void) ax25_table[n].procname = ax25_dev->dev->name; ax25_table[n].mode =0555 ; -#ifndef CONFIG_AX25_DAMA_SLAVE -/* -* We do not wish to have a representation of this parameter -* in /proc/sys/ when configured *not* to include the -* AX.25 DAMA slave code, do we? -*/ - - child[AX25_VALUES_DS_TIMEOUT ].procname =NULL ; -#endif - child[AX25_MAX_VALUES ].ctl_name =0 ;/* just in case... */ for (k =0 ; k <AX25_MAX_VALUES ; k++)
net/ipv4/udp.c +4 -2
@@ -988,7 +988,9 @@ int udp_queue_rcv_skb(struct sock * sk, struct sk_buff *skb) up->encap_rcv != NULL) {int ret; +bh_unlock_sock (sk); ret = (*up->encap_rcv)(sk, skb); +bh_lock_sock (sk);if (ret <=0 ) {UDP_INC_STATS_BH (UDP_MIB_INDATAGRAMS , is_udplite);
@@ -1087,7 +1089,7 @@ static int __udp4_lib_mcast_deliver(struct sk_buff *skb,if (skb1) {int ret =0 ; -bh_lock_sock_nested (sk); +bh_lock_sock (sk);if (!sock_owned_by_user (sk)) ret =udp_queue_rcv_skb (sk, skb1);else
@@ -1187,7 +1189,7 @@ int __udp4_lib_rcv(struct sk_buff *skb, struct hlist_head udptable[],if (sk !=NULL ) {int ret =0 ; -bh_lock_sock_nested (sk); +bh_lock_sock (sk);if (!sock_owned_by_user (sk)) ret =udp_queue_rcv_skb (sk, skb);else
net/ipv6/addrconf.c +1 -2
@@ -1076,13 +1076,12 @@ out:return ret; } -int ipv6_dev_get_saddr (struct net_device *dst_dev, +int ipv6_dev_get_saddr (struct net *net,struct net_device *dst_dev,const struct in6_addr *daddr,unsigned int prefs,struct in6_addr *saddr) {struct ipv6_saddr_score scores[2 ], *score = &scores[0 ], *hiscore = &scores[1 ]; -struct net *net =dev_net (dst_dev);struct ipv6_saddr_dst dst;struct net_device *dev;int dst_type;
net/ipv6/fib6_rules.c +2 -1
@@ -93,7 +93,8 @@ static int fib6_rule_action(struct fib_rule *rule, struct flowi *flp,if (flags &RT6_LOOKUP_F_SRCPREF_COA ) srcprefs |=IPV6_PREFER_SRC_COA ; -if (ipv6_dev_get_saddr (ip6_dst_idev (&rt->u.dst)->dev, +if (ipv6_dev_get_saddr (net, +ip6_dst_idev (&rt->u.dst)->dev, &flp->fl6_dst, srcprefs, &saddr)) goto again;
net/ipv6/ip6_fib.c +1 -0
@@ -380,6 +380,7 @@ static int inet6_dump_fib(struct sk_buff *skb, struct netlink_callback *cb) arg.skb = skb; arg.cb = cb; + arg.net = net; w->args = &arg;for (h = s_h; h <FIB_TABLE_HASHSZ ; h++, s_e =0 ) {
net/ipv6/ip6_output.c +1 -1
@@ -925,7 +925,7 @@ static int ip6_dst_lookup_tail(struct sock *sk, goto out_err_release;if (ipv6_addr_any (&fl->fl6_src)) { - err =ipv6_dev_get_saddr (ip6_dst_idev (*dst)->dev, + err =ipv6_dev_get_saddr (net,ip6_dst_idev (*dst)->dev, &fl->fl6_dst, sk ?inet6_sk (sk)->srcprefs :0 , &fl->fl6_src);
net/ipv6/ndisc.c +1 -1
@@ -549,7 +549,7 @@ static void ndisc_send_na(struct net_device *dev, struct neighbour *neigh, override =0 ;in6_ifa_put (ifp); }else { -if (ipv6_dev_get_saddr (dev, daddr, +if (ipv6_dev_get_saddr (dev_net (dev), dev, daddr,inet6_sk (dev_net (dev)->ipv6.ndisc_sk)->srcprefs, &tmpaddr))return ;
net/ipv6/route.c +8 -5
@@ -2098,7 +2098,8 @@ static inline size_t rt6_nlmsg_size(void) +nla_total_size (sizeof (struct rta_cacheinfo )); } -static int rt6_fill_node (struct sk_buff *skb,struct rt6_info *rt, +static int rt6_fill_node (struct net *net, +struct sk_buff *skb,struct rt6_info *rt,struct in6_addr *dst,struct in6_addr *src,int iif,int type,u32 pid,u32 seq,int prefix,int nowait,unsigned int flags)
@@ -2179,8 +2180,9 @@ static int rt6_fill_node(struct sk_buff *skb, struct rt6_info *rt,#endif NLA_PUT_U32 (skb,RTA_IIF , iif); }else if (dst) { +struct inet6_dev *idev =ip6_dst_idev (&rt->u.dst);struct in6_addr saddr_buf; -if (ipv6_dev_get_saddr (ip6_dst_idev (&rt->u.dst)->dev, +if (ipv6_dev_get_saddr (net, idev ? idev->dev :NULL , dst,0 , &saddr_buf) ==0 )NLA_PUT (skb,RTA_PREFSRC ,16 , &saddr_buf); }
@@ -2225,7 +2227,8 @@ int rt6_dump_route(struct rt6_info *rt, void *p_arg) }else prefix =0 ; -return rt6_fill_node (arg->skb, rt,NULL ,NULL ,0 ,RTM_NEWROUTE , +return rt6_fill_node (arg->net, + arg->skb, rt,NULL ,NULL ,0 ,RTM_NEWROUTE ,NETLINK_CB (arg->cb->skb).pid, arg->cb->nlh->nlmsg_seq, prefix,0 ,NLM_F_MULTI ); }
@@ -2291,7 +2294,7 @@ static int inet6_rtm_getroute(struct sk_buff *in_skb, struct nlmsghdr* nlh, void rt = (struct rt6_info *)ip6_route_output (net,NULL , &fl); skb->dst = &rt->u.dst; - err =rt6_fill_node (skb, rt, &fl.fl6_dst, &fl.fl6_src, iif, + err =rt6_fill_node (net, skb, rt, &fl.fl6_dst, &fl.fl6_src, iif,RTM_NEWROUTE ,NETLINK_CB (in_skb).pid, nlh->nlmsg_seq,0 ,0 ,0 );if (err <0 ) {
@@ -2318,7 +2321,7 @@ void inet6_rt_notify(int event, struct rt6_info *rt, struct nl_info *info)if (skb ==NULL ) goto errout; - err =rt6_fill_node (skb, rt,NULL ,NULL ,0 , + err =rt6_fill_node (net, skb, rt,NULL ,NULL ,0 , event, info->pid, seq,0 ,0 ,0 );if (err <0 ) {/* -EMSGSIZE implies BUG in rt6_nlmsg_size() */
net/ipv6/udp.c +3 -3
@@ -376,7 +376,7 @@ static int __udp6_lib_mcast_deliver(struct sk_buff *skb, struct in6_addr *saddr, uh->source, saddr, dif))) {struct sk_buff *buff =skb_clone (skb,GFP_ATOMIC );if (buff) { -bh_lock_sock_nested (sk2); +bh_lock_sock (sk2);if (!sock_owned_by_user (sk2))udpv6_queue_rcv_skb (sk2, buff);else
@@ -384,7 +384,7 @@ static int __udp6_lib_mcast_deliver(struct sk_buff *skb, struct in6_addr *saddr,bh_unlock_sock (sk2); } } -bh_lock_sock_nested (sk); +bh_lock_sock (sk);if (!sock_owned_by_user (sk))udpv6_queue_rcv_skb (sk, skb);else
@@ -502,7 +502,7 @@ int __udp6_lib_rcv(struct sk_buff *skb, struct hlist_head udptable[],/* deliver */ -bh_lock_sock_nested (sk); +bh_lock_sock (sk);if (!sock_owned_by_user (sk))udpv6_queue_rcv_skb (sk, skb);else
net/ipv6/xfrm6_policy.c +3 -1
@@ -52,12 +52,14 @@ static struct dst_entry *xfrm6_dst_lookup(int tos, xfrm_address_t *saddr,static int xfrm6_get_saddr (xfrm_address_t *saddr,xfrm_address_t *daddr) {struct dst_entry *dst; +struct net_device *dev; dst =xfrm6_dst_lookup (0 ,NULL , daddr);if (IS_ERR (dst))return -EHOSTUNREACH ; -ipv6_dev_get_saddr (ip6_dst_idev (dst)->dev, + dev =ip6_dst_idev (dst)->dev; +ipv6_dev_get_saddr (dev_net (dev), dev, (struct in6_addr *)&daddr->a6,0 , (struct in6_addr *)&saddr->a6);dst_release (dst);
net/sched/act_api.c +2 -3
@@ -205,10 +205,9 @@ struct tcf_common *tcf_hash_check(u32 index, struct tc_action *a, int bind, {struct tcf_common *p =NULL ;if (index && (p =tcf_hash_lookup (index, hinfo)) !=NULL ) { -if (bind) { +if (bind) p->tcfc_bindcnt++; - p->tcfc_refcnt++; - } + p->tcfc_refcnt++; a->priv = p; }return p;
net/sched/sch_htb.c +12 -8
@@ -595,11 +595,13 @@ static int htb_enqueue(struct sk_buff *skb, struct Qdisc *sch)kfree_skb (skb);return ret;#endif - }else if (cl->un.leaf.q->enqueue (skb, cl->un.leaf.q) != + }else if ((ret = cl->un.leaf.q->enqueue (skb, cl->un.leaf.q)) !=NET_XMIT_SUCCESS ) { - sch->qstats.drops++; - cl->qstats.drops++; -return NET_XMIT_DROP ; +if (ret ==NET_XMIT_DROP ) { + sch->qstats.drops++; + cl->qstats.drops++; + } +return ret; }else { cl->bstats.packets +=skb_is_gso (skb)?skb_shinfo (skb)->gso_segs:1 ;
@@ -639,11 +641,13 @@ static int htb_requeue(struct sk_buff *skb, struct Qdisc *sch)kfree_skb (skb);return ret;#endif - }else if (cl->un.leaf.q->ops->requeue (skb, cl->un.leaf.q) != + }else if ((ret = cl->un.leaf.q->ops->requeue (skb, cl->un.leaf.q)) !=NET_XMIT_SUCCESS ) { - sch->qstats.drops++; - cl->qstats.drops++; -return NET_XMIT_DROP ; +if (ret ==NET_XMIT_DROP ) { + sch->qstats.drops++; + cl->qstats.drops++; + } +return ret; }else htb_activate (q, cl);
net/sched/sch_prio.c +11 -5
@@ -228,14 +228,20 @@ static int prio_tune(struct Qdisc *sch, struct nlattr *opt) {struct prio_sched_data *q =qdisc_priv (sch);struct tc_prio_qopt *qopt; -struct nlattr *tb[TCA_PRIO_MAX +1 ]; +struct nlattr *tb[TCA_PRIO_MAX +1 ] = {0 };int err;int i; - err =nla_parse_nested_compat (tb,TCA_PRIO_MAX , opt,NULL , qopt, -sizeof (*qopt)); -if (err <0 ) -return err; + qopt =nla_data (opt); +if (nla_len (opt) <sizeof (*qopt)) +return -1 ; + +if (nla_len (opt) >=sizeof (*qopt) +sizeof (struct nlattr )) { + err =nla_parse_nested (tb,TCA_PRIO_MAX , + (struct nlattr *) (qopt +1 ),NULL ); +if (err <0 ) +return err; + } q->bands = qopt->bands;/* If we're multiqueue, make sure the number of incoming bands
net/sched/sch_tbf.c +2 -9
@@ -123,15 +123,8 @@ static int tbf_enqueue(struct sk_buff *skb, struct Qdisc* sch)struct tbf_sched_data *q =qdisc_priv (sch);int ret; -if (skb->len > q->max_size) { - sch->qstats.drops++; -#ifdef CONFIG_NET_CLS_ACT - if (sch->reshape_fail == NULL || sch->reshape_fail(skb, sch)) -#endif -kfree_skb (skb); - -return NET_XMIT_DROP ; - } +if (skb->len > q->max_size) +return qdisc_reshape_fail (skb, sch);if ((ret = q->qdisc->enqueue (skb, q->qdisc)) !=0 ) { sch->qstats.drops++;
net/sctp/auth.c +7 -0
@@ -80,6 +80,10 @@ static struct sctp_auth_bytes *sctp_auth_create_key(__u32 key_len, gfp_t gfp) {struct sctp_auth_bytes *key; +/* Verify that we are not going to overflow INT_MAX */ +if ((INT_MAX - key_len) <sizeof (struct sctp_auth_bytes )) +return NULL ; +/* Allocate the shared key */ key =kmalloc (sizeof (struct sctp_auth_bytes ) + key_len, gfp);if (!key)
@@ -782,6 +786,9 @@ int sctp_auth_ep_set_hmacs(struct sctp_endpoint *ep,for (i =0 ; i < hmacs->shmac_num_idents; i++) { id = hmacs->shmac_idents[i]; +if (id >SCTP_AUTH_HMAC_ID_MAX ) +return -EOPNOTSUPP ; +if (SCTP_AUTH_HMAC_ID_SHA1 == id) has_sha1 =1 ;
net/sctp/endpointola.c +2 -2
@@ -103,6 +103,7 @@ static struct sctp_endpoint *sctp_endpoint_init(struct sctp_endpoint *ep,/* Initialize the CHUNKS parameter */ auth_chunks->param_hdr.type =SCTP_PARAM_CHUNKS ; + auth_chunks->param_hdr.length =htons (sizeof (sctp_paramhdr_t));/* If the Add-IP functionality is enabled, we must * authenticate, ASCONF and ASCONF-ACK chunks
@@ -110,8 +111,7 @@ static struct sctp_endpoint *sctp_endpoint_init(struct sctp_endpoint *ep,if (sctp_addip_enable) { auth_chunks->chunks[0 ] =SCTP_CID_ASCONF ; auth_chunks->chunks[1 ] =SCTP_CID_ASCONF_ACK ; - auth_chunks->param_hdr.length = -htons (sizeof (sctp_paramhdr_t) +2 ); + auth_chunks->param_hdr.length +=htons (2 ); } }
net/sctp/ipv6.c +2 -1
@@ -317,7 +317,8 @@ static void sctp_v6_get_saddr(struct sctp_sock *sk, __func__, asoc, dst, NIP6(daddr->v6.sin6_addr));if (!asoc) { -ipv6_dev_get_saddr (dst ?ip6_dst_idev (dst)->dev :NULL , +ipv6_dev_get_saddr (sock_net (sctp_opt2sk (sk)), + dst ?ip6_dst_idev (dst)->dev :NULL , &daddr->v6.sin6_addr,inet6_sk (&sk->inet.sk)->srcprefs, &saddr->v6.sin6_addr);
net/sctp/socket.c +74 -22
214 lines not on this page · raw message
net/sunrpc/sysctl.c +4 -14
@@ -60,24 +60,14 @@ static int proc_do_xprt(ctl_table *table, int write, struct file *file, void __user *buffer, size_t *lenp, loff_t *ppos) { char tmpbuf[256]; -int len; +size_t len; +if ((*ppos && !write) || !*lenp) { *lenp =0 ;return 0 ; } -if (write) -return -EINVAL ; -else { - len =svc_print_xprts (tmpbuf,sizeof (tmpbuf)); -if (!access_ok (VERIFY_WRITE , buffer, len)) -return -EFAULT ; - -if (__copy_to_user (buffer, tmpbuf, len)) -return -EFAULT ; - } - *lenp -= len; - *ppos += len; -return 0 ; + len =svc_print_xprts (tmpbuf,sizeof (tmpbuf)); +return simple_read_from_buffer (buffer, *lenp, ppos, tmpbuf, len); } static int
net/xfrm/xfrm_state.c +23 -9
@@ -780,11 +780,13 @@ xfrm_state_find(xfrm_address_t *daddr, xfrm_address_t *saddr, {unsigned int h;struct hlist_node *entry; -struct xfrm_state *x, *x0; +struct xfrm_state *x, *x0, *to_put;int acquire_in_progress =0 ;int error =0 ;struct xfrm_state *best =NULL ; + to_put =NULL ; +spin_lock_bh (&xfrm_state_lock); h =xfrm_dst_hash (daddr, saddr, tmpl->reqid, family);hlist_for_each_entry (x, entry, xfrm_state_bydst+h, bydst) {
@@ -833,7 +835,7 @@ xfrm_state_find(xfrm_address_t *daddr, xfrm_address_t *saddr,if (tmpl->id.spi && (x0 =__xfrm_state_lookup (daddr, tmpl->id.spi, tmpl->id.proto, family)) !=NULL ) { -xfrm_state_put (x0); + to_put = x0; error = -EEXIST ; goto out; }
@@ -849,7 +851,7 @@ xfrm_state_find(xfrm_address_t *daddr, xfrm_address_t *saddr, error =security_xfrm_state_alloc_acquire (x, pol->security, fl->secid);if (error) { x->km.state =XFRM_STATE_DEAD ; -xfrm_state_put (x); + to_put = x; x =NULL ; goto out; }
@@ -870,7 +872,7 @@ xfrm_state_find(xfrm_address_t *daddr, xfrm_address_t *saddr,xfrm_hash_grow_check (x->bydst.next !=NULL ); }else { x->km.state =XFRM_STATE_DEAD ; -xfrm_state_put (x); + to_put = x; x =NULL ; error = -ESRCH ; }
@@ -881,6 +883,8 @@ out:else *err = acquire_in_progress ? -EAGAIN : error;spin_unlock_bh (&xfrm_state_lock); +if (to_put) +xfrm_state_put (to_put);return x; }
@@ -1067,18 +1071,20 @@ static struct xfrm_state *__xfrm_find_acq_byseq(u32 seq);int xfrm_state_add (struct xfrm_state *x) { -struct xfrm_state *x1; +struct xfrm_state *x1, *to_put;int family;int err;int use_spi =xfrm_id_proto_match (x->id.proto,IPSEC_PROTO_ANY ); family = x->props.family; + to_put =NULL ; +spin_lock_bh (&xfrm_state_lock); x1 =__xfrm_state_locate (x, use_spi, family);if (x1) { -xfrm_state_put (x1); + to_put = x1; x1 =NULL ; err = -EEXIST ; goto out;
@@ -1088,7 +1094,7 @@ int xfrm_state_add(struct xfrm_state *x) x1 =__xfrm_find_acq_byseq (x->km.seq);if (x1 && ((x1->id.proto != x->id.proto) ||xfrm_addr_cmp (&x1->id.daddr, &x->id.daddr, family))) { -xfrm_state_put (x1); + to_put = x1; x1 =NULL ; } }
@@ -1110,6 +1116,9 @@ out:xfrm_state_put (x1); } +if (to_put) +xfrm_state_put (to_put); +return err; }EXPORT_SYMBOL (xfrm_state_add);
@@ -1269,10 +1278,12 @@ EXPORT_SYMBOL(xfrm_state_migrate);int xfrm_state_update (struct xfrm_state *x) { -struct xfrm_state *x1; +struct xfrm_state *x1, *to_put;int err;int use_spi =xfrm_id_proto_match (x->id.proto,IPSEC_PROTO_ANY ); + to_put =NULL ; +spin_lock_bh (&xfrm_state_lock); x1 =__xfrm_state_locate (x, use_spi, x->props.family);
@@ -1281,7 +1292,7 @@ int xfrm_state_update(struct xfrm_state *x) goto out;if (xfrm_state_kern (x1)) { -xfrm_state_put (x1); + to_put = x1; err = -EEXIST ; goto out; }
@@ -1295,6 +1306,9 @@ int xfrm_state_update(struct xfrm_state *x) out:spin_unlock_bh (&xfrm_state_lock); +if (to_put) +xfrm_state_put (to_put); +if (err)return err;
sound/pci/oxygen/oxygen_mixer.c +4 -1
@@ -512,9 +512,12 @@ static int ac97_switch_get(struct snd_kcontrol *ctl,static void mute_ac97_ctl (struct oxygen *chip,unsigned int control) { -unsigned int priv_idx = chip->controls[control]->private_value &0xff ; +unsigned int priv_idx;u16 value; +if (!chip->controls[control]) +return ; + priv_idx = chip->controls[control]->private_value &0xff ; value =oxygen_read_ac97 (chip,0 , priv_idx);if (!(value &0x8000 )) {oxygen_write_ac97 (chip,0 , priv_idx, value |0x8000 );
Quoted 10 lines · On Mon, 8 Sep 2008 07:36:25 -0700 Greg KH wrote:
We (the -stable team) are announcing the release of the 2.6.26.4 kernel.
It contains lots of bugfixes, all over the map. Any users of the 2.6.26 kernel series should upgrade to this version. For details on the fixes, see the changelog entries and the diffstat below.
I'll also be replying to this message with a copy of the patch between 2.6.26.3 and 2.6.26.4
Quoted 6 lines
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.26.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.26.y.git;a=summaryinclude/linux/pim.h | 45 -----------------
That file is still used by ./net/ipv6/ip6mr.c:#include <linux/pim.h> so there are build errors...
net/ipv6/ip6mr.c:48:23: error: linux/pim.h: No such file or directory net/ipv6/ip6mr.c:354: error: dereferencing pointer to incomplete type net/ipv6/ip6mr.c:358: error: dereferencing pointer to incomplete type net/ipv6/ip6mr.c:358: error: 'PIM_VERSION' undeclared (first use in this function) net/ipv6/ip6mr.c:358: error: (Each undeclared identifier is reported only once net/ipv6/ip6mr.c:358: error: for each function it appears in.) net/ipv6/ip6mr.c:358: error: 'PIM_REGISTER' undeclared (first use in this function) net/ipv6/ip6mr.c:359: error: dereferencing pointer to incomplete type net/ipv6/ip6mr.c:359: error: 'PIM_NULL_REGISTER' undeclared (first use in this function) net/ipv6/ip6mr.c:360: error: dereferencing pointer to incomplete type net/ipv6/ip6mr.c:366: error: dereferencing pointer to incomplete type net/ipv6/ip6mr.c:370: error: dereferencing pointer to incomplete type make[2]: *** [net/ipv6/ip6mr.o] Error 1
---
~Randy
Linux Plumbers Conference, 17-19 September 2008, Portland, Oregon USA
http://linuxplumbersconf.org/
Quoted 17 lines · Randy Dunlap
Quoted 14 lines · On Mon, 8 Sep 2008 07:36:25 -0700 Greg KH wrote:
We (the -stable team) are announcing the release of the 2.6.26.4 kernel.
It contains lots of bugfixes, all over the map. Any users of the 2.6.26 kernel series should upgrade to this version. For details on the fixes, see the changelog entries and the diffstat below.
I'll also be replying to this message with a copy of the patch between 2.6.26.3 and 2.6.26.4
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.26.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.26.y.git;a=summary
Quoted 4 lines
Quoted 1 line
include/linux/pim.h | 45 -----------------That file is still used by ./net/ipv6/ip6mr.c:#include <
linux/pim.h> so there are build errors...
Crap, I messed up, David sent me the fixed patch and I forgot it.
I'll go do a new release in a few hours...
thanks,
greg k-h
Quoted 18 lines · Greg KH
Quoted 17 lines · Randy Dunlap
Quoted 14 lines · On Mon, 8 Sep 2008 07:36:25 -0700 Greg KH wrote:
We (the -stable team) are announcing the release of the 2.6.26.4 kernel.
It contains lots of bugfixes, all over the map. Any users of the 2.6.26 kernel series should upgrade to this version. For details on the fixes, see the changelog entries and the diffstat below.
I'll also be replying to this message with a copy of the patch between 2.6.26.3 and 2.6.26.4
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.26.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.26.y.git;a=summary
Quoted 6 lines
Quoted 4 lines
Quoted 1 line
include/linux/pim.h | 45 -----------------That file is still used by ./net/ipv6/ip6mr.c:#include <
linux/pim.h> so there are build errors...Crap, I messed up, David sent me the fixed patch and I forgot it.
Randy, does the patch below fix the problem? It's an interdiff between what I applied and what David sent me as the correct patch.
thanks,
greg k-h
-------------
include/linux/mroute.h +4 -21
@@ -2,7 +2,10 @@#define __LINUX_MROUTE_H#include <linux/sockios.h> +#include <linux/types.h> +#ifdef __KERNEL__#include <linux/in.h> +#endif /* * Based on the MROUTING 3.5 defines primarily to keep
@@ -126,6 +129,7 @@*/ #ifdef __KERNEL__ +#include <linux/pim.h> #include <net/sock.h> #ifdef CONFIG_IP_MROUTE
@@ -210,27 +214,6 @@#define IGMPMSG_WHOLEPKT 3/* For PIM Register processing */ #ifdef __KERNEL__ - -#define PIM_V1_VERSION __constant_htonl(0x10000000) -#define PIM_V1_REGISTER 1 - -#define PIM_VERSION 2 -#define PIM_REGISTER 1 - -#define PIM_NULL_REGISTER __constant_htonl(0x40000000) - -/* PIMv2 register message header layout (ietf-draft-idmr-pimvsm-v2-00.ps */ - -struct pimreghdr -{ -__u8 type; -__u8 reserved; -__be16 csum; -__be32 flags; -}; - -extern int pim_rcv_v1 (struct sk_buff *); -struct rtmsg ;extern int ipmr_get_route (struct sk_buff *skb,struct rtmsg *rtm,int nowait);#endif
include/linux/pim.h new file +27 -0
@@ -0,0 +1,27 @@ +#ifndef __LINUX_PIM_H +#define __LINUX_PIM_H + +#include <asm/byteorder.h> + +/* Message types - V1 */ +#define PIM_V1_VERSION __constant_htonl(0x10000000) +#define PIM_V1_REGISTER 1 + +/* Message types - V2 */ +#define PIM_VERSION 2 +#define PIM_REGISTER 1 + +#define PIM_NULL_REGISTER __constant_htonl(0x40000000) + +/* PIMv2 register message header layout (ietf-draft-idmr-pimvsm-v2-00.ps */ +struct pimreghdr +{ +__u8 type; +__u8 reserved; +__be16 csum; +__be32 flags; +}; + +struct sk_buff ; +extern int pim_rcv_v1 (struct sk_buff *); +#endif
only in patch2:
unchanged:
include/linux/mroute6.h +1 -0
@@ -115,6 +115,7 @@ struct sioc_mif_req6#ifdef __KERNEL__ +#include <linux/pim.h> #include <linux/skbuff.h> /* for struct sk_buff_head */ #ifdef CONFIG_IPV6_MROUTE
Quoted 21 lines · On Mon, 8 Sep 2008 09:38:01 -0700 Greg KH wrote:
Quoted 20 lines · Greg KH
Quoted 19 lines · Randy Dunlap
Quoted 16 lines · On Mon, 8 Sep 2008 07:36:25 -0700 Greg KH wrote:
We (the -stable team) are announcing the release of the 2.6.26.4 kernel.
It contains lots of bugfixes, all over the map. Any users of the 2.6.26 kernel series should upgrade to this version. For details on the fixes, see the changelog entries and the diffstat below.
I'll also be replying to this message with a copy of the patch between 2.6.26.3 and 2.6.26.4
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.26.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.26.y.git;a=summaryinclude/linux/pim.h | 45 -----------------
Quoted 7 lines
Quoted 4 lines
Quoted 2 lines
That file is still used by ./net/ipv6/ip6mr.c:#include <
linux/pim.h> so there are build errors...Crap, I messed up, David sent me the fixed patch and I forgot it.
Randy, does the patch below fix the problem? It's an interdiff between what I applied and what David sent me as the correct patch.
Yes, that fixes the build error. Thanks.
Quoted 92 lines
thanks,
greg k-h
-------------
diff -u
b/include/linux/mroute.hb/include/linux/mroute.hinclude/linux/mroute.h +4
-21@@ -2,7 +2,10 @@#define __LINUX_MROUTE_H#include <linux/sockios.h> +#include <linux/types.h> +#ifdef __KERNEL__#include <linux/in.h> +#endif /* * Based on the MROUTING 3.5 defines primarily to keep @@ -126,6 +129,7 @@*/ #ifdef __KERNEL__ +#include <linux/pim.h> #include <net/sock.h> #ifdef CONFIG_IP_MROUTE @@ -210,27 +214,6 @@#define IGMPMSG_WHOLEPKT 3/* For PIM Register processing */ #ifdef __KERNEL__ - -#define PIM_V1_VERSION __constant_htonl(0x10000000) -#define PIM_V1_REGISTER 1 - -#define PIM_VERSION 2 -#define PIM_REGISTER 1 - -#define PIM_NULL_REGISTER __constant_htonl(0x40000000) - -/* PIMv2 register message header layout (ietf-draft-idmr-pimvsm-v2-00.ps */ - -struct pimreghdr -{ -__u8 type; -__u8 reserved; -__be16 csum; -__be32 flags; -}; - -extern int pim_rcv_v1 (struct sk_buff *); -struct rtmsg ;extern int ipmr_get_route (struct sk_buff *skb,struct rtmsg *rtm,int nowait);#endif diff -u
/dev/nullb/include/linux/pim.hinclude/linux/pim.h new file +27
-0@@ -0,0 +1,27 @@ +#ifndef __LINUX_PIM_H +#define __LINUX_PIM_H + +#include <asm/byteorder.h> + +/* Message types - V1 */ +#define PIM_V1_VERSION __constant_htonl(0x10000000) +#define PIM_V1_REGISTER 1 + +/* Message types - V2 */ +#define PIM_VERSION 2 +#define PIM_REGISTER 1 + +#define PIM_NULL_REGISTER __constant_htonl(0x40000000) + +/* PIMv2 register message header layout (ietf-draft-idmr-pimvsm-v2-00.ps */ +struct pimreghdr +{ +__u8 type; +__u8 reserved; +__be16 csum; +__be32 flags; +}; + +struct sk_buff ; +extern int pim_rcv_v1 (struct sk_buff *); +#endif only in patch2:
unchanged:
include/linux/mroute6.h struct sioc_mif_req6
Quoted 8 lines
include/linux/mroute6.h +1
-1@@ -115,6 +115,7 @@ struct sioc_mif_req6#ifdef __KERNEL__ +#include <linux/pim.h> #include <linux/skbuff.h> /* for struct sk_buff_head */ #ifdef CONFIG_IPV6_MROUTE --
---
~Randy
Linux Plumbers Conference, 17-19 September 2008, Portland, Oregon USA
http://linuxplumbersconf.org/
David Miller
maintainerFrom: Randy Dunlap <[email protected]>
Date: Mon, 8 Sep 2008 09:56:08 -0700
Quoted 26 lines · On Mon, 8 Sep 2008 09:38:01 -0700 Greg KH wrote:
Quoted 25 lines · Greg KH
Quoted 23 lines · Randy Dunlap
Quoted 21 lines · On Mon, 8 Sep 2008 07:36:25 -0700 Greg KH wrote:
Quoted 11 lines
We (the -stable team) are announcing the release of the 2.6.26.4 kernel.
It contains lots of bugfixes, all over the map. Any users of the 2.6.26 kernel series should upgrade to this version. For details on the fixes, see the changelog entries and the diffstat below.
I'll also be replying to this message with a copy of the patch between 2.6.26.3 and 2.6.26.4
Quoted 6 lines
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.26.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.26.y.git;a=summaryinclude/linux/pim.h | 45 -----------------That file is still used by ./net/ipv6/ip6mr.c:#include <
linux/pim.h> so there are build errors...
Quoted 6 lines
Quoted 4 lines
Quoted 1 line
Crap, I messed up, David sent me the fixed patch and I forgot it.
Randy, does the patch below fix the problem? It's an interdiff between what I applied and what David sent me as the correct patch.
Yes, that fixes the build error. Thanks.
Sorry for creating such a confusing situation Greg :)