Linux 2.6.25.7
Subsystems (27)
We (the -stable team) are announcing the release of the 2.6.25.7 kernel.
It contains a number of assorted bugfixes all over the tree. Users are encouraged to update.
I'll also be replying to this message with a copy of the patch between 2.6.25.6 and 2.6.25.7
The updated 2.6.25.y git tree can be found at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-2.6.25.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.25.y.git;a=summarythanks,
greg k-h
--------
Documentation/cciss.txt | 5 + Makefile | 2 arch/x86/Kconfig | 23 +---- drivers/block/brd.c | 1 drivers/block/cciss.c | 21 +++-- drivers/char/pcmcia/ipwireless/hardware.c | 20 ++-- drivers/cpufreq/cpufreq.c | 2 drivers/infiniband/core/umem.c | 2 drivers/media/video/bt8xx/bttv-driver.c | 2 drivers/media/video/videobuf-core.c | 3 drivers/mmc/host/wbsd.c | 21 ++--- drivers/net/cassini.c | 11 +- drivers/net/forcedeth.c | 20 ++++ drivers/net/pppol2tp.c | 124 +++++++++++++++++++++++------- drivers/net/wireless/b43/main.c | 12 ++ drivers/serial/serial_core.c | 5 - drivers/serial/sunhv.c | 1 drivers/ssb/driver_pcicore.c | 4 drivers/video/hgafb.c | 26 +++--- drivers/video/modedb.c | 1 fs/cifs/cifsfs.c | 21 ++--- fs/ecryptfs/crypto.c | 2 fs/ecryptfs/file.c | 2 fs/ecryptfs/inode.c | 15 +-- fs/pipe.c | 3 include/asm-m68k/bitops.h | 46 ++++++++++- include/linux/pci_ids.h | 1 include/media/videobuf-core.h | 3 include/net/netlink.h | 11 +- init/Kconfig | 1 net/8021q/vlan.c | 4 net/ax25/ax25_subr.c | 11 -- net/bluetooth/rfcomm/core.c | 2 net/bluetooth/rfcomm/tty.c | 13 ++- net/can/raw.c | 21 ++--- net/core/dev.c | 2 net/ipv4/route.c | 2 net/ipv4/tcp_cong.c | 12 +- net/ipv4/tcp_input.c | 65 ++++++++++----- net/ipv4/tcp_output.c | 10 +- net/ipv6/route.c | 2 net/key/af_key.c | 2 net/mac80211/ieee80211_sta.c | 5 + net/sched/cls_api.c | 2 sound/pci/emu10k1/emu10k1_main.c | 15 +-- sound/pci/hda/patch_realtek.c | 1 46 files changed, 387 insertions(+), 193 deletions(-)
Al Viro (1):
double-free of inode on alloc_file() failure exit in create_write_pipe()
Aneesh Kumar K.V (1):
m68k: Add ext2_find_{first,next}_bit() for ext4Arjan van de Ven (3):
bluetooth: fix locking bug in the rfcomm socket cleanup handling
serial: fix enable_irq_wake/disable_irq_wake imbalance in serial_core.c
bttv: Fix a deadlock in the bttv driver
Ayaz Abdulla (1):
forcedeth: msi interrupts
Chris Wright (1):
CPUFREQ: Fix format string bug.
Chuck Ebbert (1):
mmc: wbsd: initialize tasklets before requesting interrupt
Cyrill Gorcunov (1):
ecryptfs: fix missed mutex_unlock
Dan Williams (1):
mac80211: send association event on IBSS create
Dave Young (1):
bluetooth: rfcomm_dev_state_change deadlock fix
David S. Miller (2):
sunhv: Fix locking in non-paged I/O case.
cassini: Only use chip checksum for ipv4 packets.
David Sterba (1):
ipwireless: Fix blocked sending
David Woodhouse (1):
net: Fix call to ->change_rx_flags(dev, IFF_MULTICAST) in dev_change_flags()
Geoff Levand (1):
fbdev: export symbol fb_mode_option
Greg Kroah-Hartman (1):
Linux 2.6.25.7
Herbert Xu (1):
ipsec: Use the correct ip_local_out function
Ilpo Järvinen (5):
tcp: fix skb vs fack_count out-of-sync condition
tcp FRTO: Fix fallback to conventional recovery
tcp FRTO: SACK variant is errorneously used with NewReno tcp FRTO: work-around inorder receivers
tcp: Fix inconsistency source (CA_Open only when !tcp_left_out(tp))
James Chapman (3):
l2tp: avoid skb truesize bug if headroom is increased
l2tp: Fix possible WARN_ON from socket code when UDP socket is closed
l2tp: Fix possible oops if transmitting or receiving when tunnel goes down
Jarek Poplawski (1):
ax25: Fix NULL pointer dereference and lockup.
Jaroslav Franek (1):
sound: emu10k1 - fix system hang with Audigy2 ZS Notebook PCMCIA card
John Heffner (2):
tcp: Allow send-limited cwnd to grow up to max_burst when gso disabled
tcp: Limit cwnd growth when deferring for GSO
Kazunori MIYAZAWA (1):
af_key: Fix selector family initialization.
Krzysztof Helt (1):
hgafb: resource management fix
Marcin Slusarz (1):
cifs: fix oops on mount when CONFIG_CIFS_DFS_UPCALL is enabled
Michael Buesch (2):
b43: Fix controller restart crash
ssb: Fix context assertion in ssb_pcicore_dev_irqvecs_enable
Michael Halcrow (1):
eCryptfs: protect crypt_stat->flags in ecryptfs_open()
Mike Miller (1):
cciss: add new hardware support
Miklos Szeredi (2):
ecryptfs: add missing lock around notify_change
ecryptfs: clean up (un)lock_parent
Nick Piggin (1):
Add 'rd' alias to new brd ramdisk driver
Patrick McHardy (2):
net_sched: cls_api: fix return value for non-existant classifiers
vlan: Correctly handle device notifications for layered VLAN devices
Roland Dreier (1):
IB/umem: Avoid sign problems when demoting npages to integer
Roman Zippel (1):
x86: fix recursive dependencies
Sam Ravnborg (2):
can: Fix copy_from_user() results interpretation
Kconfig: introduce ARCH_DEFCONFIG to DEFCONFIG_LIST
Sridhar Samudrala (1):
tcp: TCP connection times out if ICMP frag needed is delayed
Takashi Iwai (1):
ALSA: hda - Fix resume of auto-config mode with Realtek codecs
Thomas Graf (1):
netlink: Fix nla_parse_nested_compat() to call nla_parse() directly
Documentation/cciss.txt +5 -0
@@ -21,6 +21,11 @@ This driver is known to work with the following cards: * SA E200 * SA E200i * SA E500 + * SA P212 + * SA P410 + * SA P410i + * SA P411 + * SA P812 Detecting drive failures: -------------------------
Makefile +1 -1
@@ -1,7 +1,7 @@ VERSION = 2 PATCHLEVEL = 6 SUBLEVEL = 25 -EXTRAVERSION = .6 +EXTRAVERSION = .7 NAME = Funky Weasel is Jiggy wit it # *DOCUMENTATION*
arch/x86/Kconfig +7 -16
@@ -24,17 +24,10 @@ config X86 select HAVE_KRETPROBES select HAVE_KVM if ((X86_32 && !X86_VOYAGER && !X86_VISWS && !X86_NUMAQ) || X86_64) -config DEFCONFIG_LIST +config ARCH_DEFCONFIG string - depends on X86_32 - option defconfig_list - default "arch/x86/configs/i386_defconfig" - -config DEFCONFIG_LIST - string - depends on X86_64 - option defconfig_list - default "arch/x86/configs/x86_64_defconfig" + default "arch/x86/configs/i386_defconfig" if X86_32 + default "arch/x86/configs/x86_64_defconfig" if X86_64 config GENERIC_LOCKBREAK
@@ -253,8 +246,7 @@ config X86_ELAN config X86_VOYAGER bool "Voyager (NCR)" - depends on X86_32 - select SMP if !BROKEN + depends on X86_32 && (SMP || BROKEN) help Voyager is an MCA-based 32-way capable SMP architecture proprietary to NCR Corp. Machine classes 345x/35xx/4100/51xx are Voyager-based.
@@ -266,9 +258,8 @@ config X86_VOYAGER config X86_NUMAQ bool "NUMAQ (IBM/Sequent)" - select SMP + depends on SMP && X86_32 select NUMA - depends on X86_32 help This option is used for getting Linux to run on a (IBM/Sequent) NUMA multiquad box. This changes the way that processors are bootstrapped,
@@ -339,7 +330,7 @@ config X86_RDC321X config X86_VSMP bool "Support for ScaleMP vSMP" - depends on X86_64 && PCI + depends on X86_64 help Support for ScaleMP vSMP systems. Say 'Y' here if this kernel is supposed to run on these EM64T-based machines. Only choose this option
@@ -1391,7 +1382,7 @@ endmenu menu "Bus options (PCI etc.)" config PCI - bool "PCI support" if !X86_VISWS + bool "PCI support" if !X86_VISWS && !X86_VSMP depends on !X86_VOYAGER default y select ARCH_SUPPORTS_MSI if (X86_LOCAL_APIC && X86_IO_APIC)
drivers/block/brd.c +1 -0
@@ -392,6 +392,7 @@ module_param(rd_size, int, 0);MODULE_PARM_DESC (rd_size,"Size of each RAM disk in kbytes." );MODULE_LICENSE ("GPL" );MODULE_ALIAS_BLOCKDEV_MAJOR (RAMDISK_MAJOR ); +MODULE_ALIAS ("rd" );#ifndef MODULE /* Legacy boot options - nonmodular */
drivers/block/cciss.c +16 -5
@@ -53,15 +53,16 @@#include <linux/scatterlist.h> #define CCISS_DRIVER_VERSION (maj,min,submin) ((maj<<16)|(min<<8)|(submin)) -#define DRIVER_NAME "HP CISS Driver (v 3.6.14)" -#define DRIVER_VERSION CCISS_DRIVER_VERSION(3,6,14) +#define DRIVER_NAME "HP CISS Driver (v 3.6.20)" +#define DRIVER_VERSION CCISS_DRIVER_VERSION(3, 6, 20)/* Embedded module documentation macros - see modules.h */ MODULE_AUTHOR ("Hewlett-Packard Company" ); -MODULE_DESCRIPTION ("Driver for HP Controller SA5xxx SA6xxx version 3.6.14" ); +MODULE_DESCRIPTION ("Driver for HP Smart Array Controllers" );MODULE_SUPPORTED_DEVICE ("HP SA5i SA5i+ SA532 SA5300 SA5312 SA641 SA642 SA6400" -" SA6i P600 P800 P400 P400i E200 E200i E500" ); -MODULE_VERSION ("3.6.14" ); +" SA6i P600 P800 P400 P400i E200 E200i E500 P700m" +" Smart Array G2 Series SAS/SATA Controllers" ); +MODULE_VERSION ("3.6.20" );MODULE_LICENSE ("GPL" );#include "cciss_cmd.h"
@@ -90,6 +91,11 @@ static const struct pci_device_id cciss_pci_device_id[] = { {PCI_VENDOR_ID_HP, PCI_DEVICE_ID_HP_CISSD, 0x103C, 0x3215}, {PCI_VENDOR_ID_HP, PCI_DEVICE_ID_HP_CISSC, 0x103C, 0x3237}, {PCI_VENDOR_ID_HP, PCI_DEVICE_ID_HP_CISSC, 0x103C, 0x323D}, + {PCI_VENDOR_ID_HP, PCI_DEVICE_ID_HP_CISSE, 0x103C, 0x3241}, + {PCI_VENDOR_ID_HP, PCI_DEVICE_ID_HP_CISSE, 0x103C, 0x3243}, + {PCI_VENDOR_ID_HP, PCI_DEVICE_ID_HP_CISSE, 0x103C, 0x3245}, + {PCI_VENDOR_ID_HP, PCI_DEVICE_ID_HP_CISSE, 0x103C, 0x3247}, + {PCI_VENDOR_ID_HP, PCI_DEVICE_ID_HP_CISSE, 0x103C, 0x3249}, {PCI_VENDOR_ID_HP, PCI_ANY_ID, PCI_ANY_ID, PCI_ANY_ID, PCI_CLASS_STORAGE_RAID << 8, 0xffff << 8, 0}, {0,}
@@ -123,6 +129,11 @@ static struct board_type products[] = { {0x3215103C, "Smart Array E200i", &SA5_access, 120}, {0x3237103C, "Smart Array E500", &SA5_access, 512}, {0x323D103C, "Smart Array P700m", &SA5_access, 512}, + {0x3241103C, "Smart Array P212", &SA5_access, 384}, + {0x3243103C, "Smart Array P410", &SA5_access, 384}, + {0x3245103C, "Smart Array P410i", &SA5_access, 384}, + {0x3247103C, "Smart Array P411", &SA5_access, 384}, + {0x3249103C, "Smart Array P812", &SA5_access, 384}, {0xFFFF103C, "Unknown Smart Array", &SA5_access, 120}, };
drivers/char/pcmcia/ipwireless/hardware.c +12 -8
@@ -251,10 +251,11 @@ struct ipw_hardware {int init_loops;struct timer_list setup_timer; +/* Flag if hw is ready to send next packet */ int tx_ready; -struct list_head tx_queue[NL_NUM_OF_PRIORITIES ]; -/* True if any packets are queued for transmission */ +/* Count of pending packets to be sent */ int tx_queued; +struct list_head tx_queue[NL_NUM_OF_PRIORITIES ];int rx_bytes_queued;struct list_head rx_queue;
@@ -430,6 +431,8 @@ static int do_send_fragment(struct ipw_hardware *hw, const unsigned char *data,spin_lock_irqsave (&hw->spinlock, flags); + hw->tx_ready =0 ; +if (hw->hw_version ==HW_VERSION_1 ) {outw ((unsigned short ) length, hw->base_port +IODWR );
@@ -518,6 +521,7 @@ static int do_send_packet(struct ipw_hardware *hw, struct ipw_tx_packet *packet)spin_lock_irqsave (&hw->spinlock, flags);list_add (&packet->queue, &hw->tx_queue[0 ]); + hw->tx_queued++;spin_unlock_irqrestore (&hw->spinlock, flags); }else {if (packet->packet_callback)
@@ -975,12 +979,10 @@ static int send_pending_packet(struct ipw_hardware *hw, int priority_limit)unsigned long flags;spin_lock_irqsave (&hw->spinlock, flags); -if (hw->tx_queued && hw->tx_ready !=0 ) { +if (hw->tx_queued && hw->tx_ready) {int priority;struct ipw_tx_packet *packet =NULL ; - hw->tx_ready--; -/* Pick a packet */ for (priority =0 ; priority < priority_limit; priority++) {if (!list_empty (&hw->tx_queue[priority])) {
@@ -989,6 +991,7 @@ static int send_pending_packet(struct ipw_hardware *hw, int priority_limit) struct ipw_tx_packet, queue); + hw->tx_queued--;list_del (&packet->queue);break ;
@@ -999,6 +1002,7 @@ static int send_pending_packet(struct ipw_hardware *hw, int priority_limit)spin_unlock_irqrestore (&hw->spinlock, flags);return 0 ; } +spin_unlock_irqrestore (&hw->spinlock, flags);/* Send */
@@ -1089,7 +1093,7 @@ static irqreturn_t ipwireless_handle_v1_interrupt(int irq,if (irqn &IR_TXINTR ) { ack |=IR_TXINTR ;spin_lock_irqsave (&hw->spinlock, flags); - hw->tx_ready++; + hw->tx_ready =1 ;spin_unlock_irqrestore (&hw->spinlock, flags); }/* Received data */
@@ -1196,7 +1200,7 @@ static irqreturn_t ipwireless_handle_v2_v3_interrupt(int irq,if (memrxdone &MEMRX_RX_DONE ) {writew (0 , &hw->memory_info_regs->memreg_rx_done);spin_lock_irqsave (&hw->spinlock, flags); - hw->tx_ready++; + hw->tx_ready =1 ;spin_unlock_irqrestore (&hw->spinlock, flags); tx =1 ; }
@@ -1260,7 +1264,7 @@ static void send_packet(struct ipw_hardware *hw, int priority,spin_lock_irqsave (&hw->spinlock, flags);list_add_tail (&packet->queue, &hw->tx_queue[priority]); - hw->tx_queued =1 ; + hw->tx_queued++;spin_unlock_irqrestore (&hw->spinlock, flags);flush_packets_to_hw (hw);
drivers/cpufreq/cpufreq.c +1 -1
@@ -410,7 +410,7 @@ static int cpufreq_parse_governor (char *str_governor, unsigned int *policy,int ret;mutex_unlock (&cpufreq_governor_mutex); - ret =request_module (name); + ret =request_module ("%s" , name);mutex_lock (&cpufreq_governor_mutex);if (ret ==0 )
drivers/infiniband/core/umem.c +1 -1
@@ -144,7 +144,7 @@ struct ib_umem *ib_umem_get(struct ib_ucontext *context, unsigned long addr, ret =0 ;while (npages) { ret =get_user_pages (current, current->mm, cur_base, -min_t (int, npages, + min_t(unsigned long, npages,PAGE_SIZE /sizeof (struct page *)),1 , !umem->writable, page_list, vma_list);
drivers/media/video/bt8xx/bttv-driver.c +1 -1
@@ -2613,7 +2613,7 @@ static int vidiocgmbuf(struct file *file, void *priv, struct video_mbuf *mbuf)struct bttv_fh *fh = priv;mutex_lock (&fh->cap.vb_lock); - retval =videobuf_mmap_setup (&fh->cap, gbuffers, gbufsize, + retval =__videobuf_mmap_setup (&fh->cap, gbuffers, gbufsize,V4L2_MEMORY_MMAP );if (retval <0 ) {mutex_unlock (&fh->cap.vb_lock);
drivers/media/video/videobuf-core.c +2 -1
@@ -335,7 +335,7 @@ int videobuf_mmap_free(struct videobuf_queue *q) }/* Locking: Caller holds q->vb_lock */ -static int __videobuf_mmap_setup (struct videobuf_queue *q, +int __videobuf_mmap_setup (struct videobuf_queue *q,unsigned int bcount,unsigned int bsize,enum v4l2_memory memory) {
@@ -1093,6 +1093,7 @@ EXPORT_SYMBOL_GPL(videobuf_read_stream);EXPORT_SYMBOL_GPL (videobuf_read_one);EXPORT_SYMBOL_GPL (videobuf_poll_stream); +EXPORT_SYMBOL_GPL (__videobuf_mmap_setup);EXPORT_SYMBOL_GPL (videobuf_mmap_setup);EXPORT_SYMBOL_GPL (videobuf_mmap_free);EXPORT_SYMBOL_GPL (videobuf_mmap_mapper);
drivers/mmc/host/wbsd.c +10 -11
@@ -1457,17 +1457,7 @@ static int __devinit wbsd_request_irq(struct wbsd_host *host, int irq)int ret;/* -* Allocate interrupt. -*/ - - ret =request_irq (irq, wbsd_irq,IRQF_SHARED ,DRIVER_NAME , host); -if (ret) -return ret; - - host->irq = irq; - -/* -* Set up tasklets. +* Set up tasklets. Must be done before requesting interrupt. */ tasklet_init (&host->card_tasklet, wbsd_tasklet_card, (unsigned long )host);
@@ -1480,6 +1470,15 @@ static int __devinit wbsd_request_irq(struct wbsd_host *host, int irq)tasklet_init (&host->finish_tasklet, wbsd_tasklet_finish, (unsigned long )host); +/* +* Allocate interrupt. +*/ + ret =request_irq (irq, wbsd_irq,IRQF_SHARED ,DRIVER_NAME , host); +if (ret) +return ret; + + host->irq = irq; +return 0 ; }
drivers/net/cassini.c +7 -4
@@ -142,8 +142,8 @@#define DRV_MODULE_NAME "cassini"#define PFX DRV_MODULE_NAME ": " -#define DRV_MODULE_VERSION "1.5" -#define DRV_MODULE_RELDATE "4 Jan 2008" +#define DRV_MODULE_VERSION "1.6" +#define DRV_MODULE_RELDATE "21 May 2008"#define CAS_DEF_MSG_ENABLE \ (NETIF_MSG_DRV | \
@@ -2140,9 +2140,12 @@ end_copy_pkt:if (addr)cas_page_unmap (addr); } - skb->csum =csum_unfold (~csum); - skb->ip_summed =CHECKSUM_COMPLETE ; skb->protocol =eth_type_trans (skb, cp->dev); +if (skb->protocol ==htons (ETH_P_IP )) { + skb->csum =csum_unfold (~csum); + skb->ip_summed =CHECKSUM_COMPLETE ; + }else + skb->ip_summed =CHECKSUM_NONE ;return len; }
drivers/net/forcedeth.c +20 -0
@@ -3111,6 +3111,20 @@ static void nv_link_irq(struct net_device *dev)dprintk (KERN_DEBUG "%s: link change notification done.\n" , dev->name); } +static void nv_msi_workaround (struct fe_priv *np) +{ + +/* Need to toggle the msi irq mask within the ethernet device, +* otherwise, future interrupts will not be detected. +*/ +if (np->msi_flags &NV_MSI_ENABLED ) { +u8 __iomem *base = np->base; + +writel (0 , base + NvRegMSIIrqMask); +writel (NVREG_MSI_VECTOR_0_ENABLED , base + NvRegMSIIrqMask); + } +} +static irqreturn_t nv_nic_irq (int foo,void *data) {struct net_device *dev = (struct net_device *) data;
@@ -3133,6 +3147,8 @@ static irqreturn_t nv_nic_irq(int foo, void *data)if (!(events & np->irqmask))break ; +nv_msi_workaround (np); +spin_lock (&np->lock);nv_tx_done (dev);spin_unlock (&np->lock);
@@ -3248,6 +3264,8 @@ static irqreturn_t nv_nic_irq_optimized(int foo, void *data)if (!(events & np->irqmask))break ; +nv_msi_workaround (np); +spin_lock (&np->lock);nv_tx_done_optimized (dev,TX_WORK_PER_LOOP );spin_unlock (&np->lock);
@@ -3588,6 +3606,8 @@ static irqreturn_t nv_nic_irq_test(int foo, void *data)if (!(events &NVREG_IRQ_TIMER ))return IRQ_RETVAL (0 ); +nv_msi_workaround (np); +spin_lock (&np->lock); np->intr_test =1 ;spin_unlock (&np->lock);
drivers/net/pppol2tp.c +96 -28
319 lines not on this page · raw message
drivers/net/wireless/b43/main.c +10 -2
@@ -3818,7 +3818,9 @@ static void b43_chip_reset(struct work_struct *work) goto out; } } - out: +out: +if (err) + wl->current_dev =NULL ;/* Failed to init the dev. */ mutex_unlock (&wl->mutex);if (err)b43err (wl,"Controller restart FAILED\n" );
@@ -3967,9 +3969,11 @@ static void b43_one_core_detach(struct ssb_device *dev)struct b43_wldev *wldev;struct b43_wl *wl; +/* Do not cancel ieee80211-workqueue based work here. +* See comment in b43_remove(). */ + wldev =ssb_get_drvdata (dev); wl = wldev->wl; -cancel_work_sync (&wldev->restart_work);b43_debugfs_remove_device (wldev);b43_wireless_core_detach (wldev);list_del (&wldev->list);
@@ -4152,6 +4156,10 @@ static void b43_remove(struct ssb_device *dev)struct b43_wl *wl =ssb_get_devtypedata (dev);struct b43_wldev *wldev =ssb_get_drvdata (dev); +/* We must cancel any work here before unregistering from ieee80211, +* as the ieee80211 unreg will destroy the workqueue. */ +cancel_work_sync (&wldev->restart_work); +B43_WARN_ON (!wl);if (wl->current_dev == wldev)ieee80211_unregister_hw (wl->hw);
drivers/serial/serial_core.c +4 -1
@@ -2022,6 +2022,8 @@ int uart_suspend_port(struct uart_driver *drv, struct uart_port *port)int uart_resume_port (struct uart_driver *drv,struct uart_port *port) {struct uart_state *state = drv->state + port->line; +struct device *tty_dev; +struct uart_match match = {port, drv};mutex_lock (&state->mutex);
@@ -2031,7 +2033,8 @@ int uart_resume_port(struct uart_driver *drv, struct uart_port *port)return 0 ; } -if (!port->suspended) { + tty_dev =device_find_child (port->dev, &match, serial_match_port); +if (!port->suspended &&device_may_wakeup (tty_dev)) {disable_irq_wake (port->irq);mutex_unlock (&state->mutex);return 0 ;
drivers/serial/sunhv.c +0 -1
@@ -499,7 +499,6 @@ static void sunhv_console_write_bychar(struct console *con, const char *s, unsig }else spin_lock (&port->lock); -spin_lock_irqsave (&port->lock, flags);for (i =0 ; i < n; i++) {if (*s =='\n' )sunhv_console_putchar (port,'\r' );
drivers/ssb/driver_pcicore.c +2 -2
@@ -519,12 +519,12 @@ int ssb_pcicore_dev_irqvecs_enable(struct ssb_pcicore *pc,int err =0 ;u32 tmp; -might_sleep (); -if (!pdev) goto out; bus = pdev->bus; +might_sleep_if (pdev->id.coreid !=SSB_DEV_PCI ); +/* Enable interrupts for this device. */ if (bus->host_pci && ((pdev->id.revision >=6 ) || (pdev->id.coreid ==SSB_DEV_PCIE ))) {
drivers/video/hgafb.c +15 -11
@@ -279,7 +279,7 @@ static void hga_blank(int blank_mode)static int __init hga_card_detect (void ) { -int count=0 ; +int count =0 ;void __iomem *p, *q;unsigned short p_save, q_save;
@@ -303,20 +303,18 @@ static int __init hga_card_detect(void)writew (0x55aa , p);if (readw (p) ==0x55aa ) count++;writew (p_save, p); -if (count !=2 ) { -return 0 ; - } +if (count !=2 ) + goto error;/* Ok, there is definitely a card registering at the correct * memory location, so now we do an I/O port test. */ -if (!test_hga_b (0x66 ,0x0f )) {/* cursor low register */ -return 0 ; - } -if (!test_hga_b (0x99 ,0x0f )) {/* cursor low register */ -return 0 ; - } +if (!test_hga_b (0x66 ,0x0f ))/* cursor low register */ + goto error; + +if (!test_hga_b (0x99 ,0x0f ))/* cursor low register */ + goto error;/* See if the card is a Hercules, by checking whether the vsync * bit of the status register is changing. This test lasts for
@@ -331,7 +329,7 @@ static int __init hga_card_detect(void) }if (p_save == q_save) -return 0 ; + goto error;switch (inb_p (HGA_STATUS_PORT ) &0x70 ) {case 0x10 :
@@ -348,6 +346,12 @@ static int __init hga_card_detect(void)break ; }return 1 ; +error: +if (release_io_ports) +release_region (0x3b0 ,12 ); +if (release_io_port) +release_region (0x3bf ,1 ); +return 0 ; }/**
drivers/video/modedb.c +1 -0
@@ -28,6 +28,7 @@#endif const char *fb_mode_option; +EXPORT_SYMBOL_GPL (fb_mode_option);/* * Standard video mode definitions (taken from XFree86)
fs/cifs/cifsfs.c +10 -11
@@ -97,9 +97,6 @@ cifs_read_super(struct super_block *sb, void *data, {struct inode *inode;struct cifs_sb_info *cifs_sb; -#ifdef CONFIG_CIFS_DFS_UPCALL -int len; -#endif int rc =0 ;/* BB should we make this contingent on mount parm? */
@@ -117,15 +114,17 @@ cifs_read_super(struct super_block *sb, void *data,* complex operation (mount), and in case of fail * just exit instead of doing mount and attempting * undo it if this copy fails?*/ - len =strlen (data); - cifs_sb->mountdata =kzalloc (len +1 ,GFP_KERNEL ); -if (cifs_sb->mountdata ==NULL ) { -kfree (sb->s_fs_info); - sb->s_fs_info =NULL ; -return -ENOMEM ; +if (data) { +int len =strlen (data); + cifs_sb->mountdata =kzalloc (len +1 ,GFP_KERNEL ); +if (cifs_sb->mountdata ==NULL ) { +kfree (sb->s_fs_info); + sb->s_fs_info =NULL ; +return -ENOMEM ; + } +strncpy (cifs_sb->mountdata, data, len +1 ); + cifs_sb->mountdata[len] ='\0' ; } -strncpy (cifs_sb->mountdata, data, len +1 ); - cifs_sb->mountdata[len] ='\0' ;#endif rc =cifs_mount (sb, cifs_sb, data, devname);
fs/ecryptfs/crypto.c +1 -1
@@ -1907,9 +1907,9 @@ int ecryptfs_get_tfm_and_mutex_for_cipher_name(struct crypto_blkcipher **tfm, goto out; } } -mutex_unlock (&key_tfm_list_mutex); (*tfm) = key_tfm->key_tfm; (*tfm_mutex) = &key_tfm->key_tfm_mutex; out: +mutex_unlock (&key_tfm_list_mutex);return rc; }
fs/ecryptfs/file.c +2 -0
@@ -195,7 +195,9 @@ static int ecryptfs_open(struct inode *inode, struct file *file) file, ecryptfs_inode_to_private(inode)->lower_file);if (S_ISDIR (ecryptfs_dentry->d_inode->i_mode)) {ecryptfs_printk (KERN_DEBUG ,"This is a directory\n" ); +mutex_lock (&crypt_stat->cs_mutex); crypt_stat->flags &= ~(ECRYPTFS_ENCRYPTED ); +mutex_unlock (&crypt_stat->cs_mutex); rc =0 ; goto out; }
fs/ecryptfs/inode.c +6 -9
@@ -37,17 +37,11 @@ static struct dentry *lock_parent(struct dentry *dentry) {struct dentry *dir; - dir =dget (dentry->d_parent); + dir =dget_parent (dentry);mutex_lock_nested (&(dir->d_inode->i_mutex),I_MUTEX_PARENT );return dir; } -static void unlock_parent (struct dentry *dentry) -{ -mutex_unlock (&(dentry->d_parent->d_inode->i_mutex)); -dput (dentry->d_parent); -} -static void unlock_dir (struct dentry *dir) {mutex_unlock (&dir->d_inode->i_mutex);
@@ -426,8 +420,9 @@ static int ecryptfs_unlink(struct inode *dir, struct dentry *dentry)int rc =0 ;struct dentry *lower_dentry =ecryptfs_dentry_to_lower (dentry);struct inode *lower_dir_inode =ecryptfs_inode_to_lower (dir); +struct dentry *lower_dir_dentry; -lock_parent (lower_dentry); + lower_dir_dentry =lock_parent (lower_dentry); rc =vfs_unlink (lower_dir_inode, lower_dentry);if (rc) {printk (KERN_ERR "Error in vfs_unlink; rc = [%d]\n" , rc);
@@ -439,7 +434,7 @@ static int ecryptfs_unlink(struct inode *dir, struct dentry *dentry) dentry->d_inode->i_ctime = dir->i_ctime;d_drop (dentry); out_unlock: -unlock_parent (lower_dentry); +unlock_dir (lower_dir_dentry);return rc; }
@@ -908,7 +903,9 @@ static int ecryptfs_setattr(struct dentry *dentry, struct iattr *ia)if (ia->ia_valid & (ATTR_KILL_SUID |ATTR_KILL_SGID )) ia->ia_valid &= ~ATTR_MODE ; +mutex_lock (&lower_dentry->d_inode->i_mutex); rc =notify_change (lower_dentry, ia); +mutex_unlock (&lower_dentry->d_inode->i_mutex); out:fsstack_copy_attr_all (inode, lower_inode,NULL );return rc;
fs/pipe.c +3 -0
@@ -988,7 +988,10 @@ struct file *create_write_pipe(void)return f; err_dentry: +free_pipe_info (inode);dput (dentry); +return ERR_PTR (err); + err_inode:free_pipe_info (inode);iput (inode);
include/asm-m68k/bitops.h +44 -2
52 lines not on this page · raw message
include/linux/pci_ids.h +1 -0
@@ -716,6 +716,7 @@#define PCI_DEVICE_ID_HP_CISSA 0x3220#define PCI_DEVICE_ID_HP_CISSC 0x3230#define PCI_DEVICE_ID_HP_CISSD 0x3238 +#define PCI_DEVICE_ID_HP_CISSE 0x323a#define PCI_DEVICE_ID_HP_ZX2_IOC 0x4031#define PCI_VENDOR_ID_PCTECH 0x1042
include/media/videobuf-core.h +3 -0
@@ -227,6 +227,9 @@ unsigned int videobuf_poll_stream(struct file *file,int videobuf_mmap_setup (struct videobuf_queue *q,unsigned int bcount,unsigned int bsize,enum v4l2_memory memory); +int __videobuf_mmap_setup (struct videobuf_queue *q, +unsigned int bcount,unsigned int bsize, +enum v4l2_memory memory);int videobuf_mmap_free (struct videobuf_queue *q);int videobuf_mmap_mapper (struct videobuf_queue *q,struct vm_area_struct *vma);
include/net/netlink.h +6 -5
@@ -772,12 +772,13 @@ static inline int __nla_parse_nested_compat(struct nlattr *tb[], int maxtype,const struct nla_policy *policy, int len) { - if (nla_len(nla) < len) + int nested_len = nla_len(nla) - NLA_ALIGN(len); + +if (nested_len <0 )return -1 ; - if (nla_len(nla) >= NLA_ALIGN(len) + sizeof(struct nlattr)) - return nla_parse_nested(tb, maxtype, - nla_data(nla) + NLA_ALIGN(len), - policy); +if (nested_len >=nla_attr_size (0 )) +return nla_parse (tb, maxtype,nla_data (nla) +NLA_ALIGN (len), + nested_len, policy);memset (tb,0 ,sizeof (struct nlattr *) * (maxtype +1 ));return 0 ; }
init/Kconfig +1 -0
@@ -13,6 +13,7 @@ config DEFCONFIG_LIST default "/lib/modules/$UNAME_RELEASE/.config" default "/etc/kernel-config" default "/boot/config-$UNAME_RELEASE" + default "$ARCH_DEFCONFIG" default "arch/$ARCH/defconfig" menu "General setup"
net/8021q/vlan.c +1 -3
@@ -397,10 +397,8 @@ static int vlan_device_event(struct notifier_block *unused, unsigned long event,if (dev->nd_net != &init_net)return NOTIFY_DONE ; -if (is_vlan_dev (dev)) { +if (is_vlan_dev (dev))__vlan_device_event (dev, event); - goto out; - } grp =__vlan_find_group (dev->ifindex);if (!grp)
net/ax25/ax25_subr.c +3 -8
@@ -64,20 +64,15 @@ void ax25_frames_acked(ax25_cb *ax25, unsigned short nr)void ax25_requeue_frames (ax25_cb *ax25) { -struct sk_buff *skb, *skb_prev =NULL ; +struct sk_buff *skb;/* * Requeue all the un-ack-ed frames on the output queue to be picked * up by ax25_kick called from the timer. This arrangement handles the * possibility of an empty output queue. */ -while ((skb =skb_dequeue (&ax25->ack_queue)) !=NULL ) { -if (skb_prev ==NULL ) -skb_queue_head (&ax25->write_queue, skb); -else -skb_append (skb_prev, skb, &ax25->write_queue); - skb_prev = skb; - } +while ((skb =skb_dequeue_tail (&ax25->ack_queue)) !=NULL ) +skb_queue_head (&ax25->write_queue, skb); }/*
net/bluetooth/rfcomm/core.c +1 -1
@@ -423,8 +423,8 @@ static int __rfcomm_dlc_close(struct rfcomm_dlc *d, int err)rfcomm_dlc_lock (d); d->state =BT_CLOSED ; -rfcomm_dlc_unlock (d); d->state_change (d, err); +rfcomm_dlc_unlock (d);skb_queue_purge (&d->tx_queue);rfcomm_dlc_unlink (d);
net/bluetooth/rfcomm/tty.c +12 -1
@@ -566,11 +566,22 @@ static void rfcomm_dev_state_change(struct rfcomm_dlc *dlc, int err)if (dlc->state ==BT_CLOSED ) {if (!dev->tty) {if (test_bit (RFCOMM_RELEASE_ONHUP , &dev->flags)) { -if (rfcomm_dev_get (dev->id) ==NULL ) +/* Drop DLC lock here to avoid deadlock +* 1. rfcomm_dev_get will take rfcomm_dev_lock +* but in rfcomm_dev_add there's lock order: +* rfcomm_dev_lock -> dlc lock +* 2. rfcomm_dev_put will deadlock if it's +* the last reference +*/ +rfcomm_dlc_unlock (dlc); +if (rfcomm_dev_get (dev->id) ==NULL ) { +rfcomm_dlc_lock (dlc);return ; + }rfcomm_dev_del (dev);rfcomm_dev_put (dev); +rfcomm_dlc_lock (dlc); } }else tty_hangup (dev->tty);
net/can/raw.c +10 -11
@@ -435,15 +435,13 @@ static int raw_setsockopt(struct socket *sock, int level, int optname,if (!filter)return -ENOMEM ; - err =copy_from_user (filter, optval, optlen); -if (err) { +if (copy_from_user (filter, optval, optlen)) {kfree (filter); -return err; +return -EFAULT ; } }else if (count ==1 ) { - err =copy_from_user (&sfilter, optval, optlen); -if (err) -return err; +if (copy_from_user (&sfilter, optval, optlen)) +return -EFAULT ; }lock_sock (sk);
@@ -493,9 +491,8 @@ static int raw_setsockopt(struct socket *sock, int level, int optname,if (optlen !=sizeof (err_mask))return -EINVAL ; - err =copy_from_user (&err_mask, optval, optlen); -if (err) -return err; +if (copy_from_user (&err_mask, optval, optlen)) +return -EFAULT ; err_mask &=CAN_ERR_MASK ;
@@ -531,7 +528,8 @@ static int raw_setsockopt(struct socket *sock, int level, int optname,if (optlen !=sizeof (ro->loopback))return -EINVAL ; - err =copy_from_user (&ro->loopback, optval, optlen); +if (copy_from_user (&ro->loopback, optval, optlen)) +return -EFAULT ;break ;
@@ -539,7 +537,8 @@ static int raw_setsockopt(struct socket *sock, int level, int optname,if (optlen !=sizeof (ro->recv_own_msgs))return -EINVAL ; - err =copy_from_user (&ro->recv_own_msgs, optval, optlen); +if (copy_from_user (&ro->recv_own_msgs, optval, optlen)) +return -EFAULT ;break ;
net/core/dev.c +1 -1
@@ -3132,7 +3132,7 @@ int dev_change_flags(struct net_device *dev, unsigned flags)* Load in the correct multicast list now the flags have changed. */ -if (dev->change_rx_flags && (dev->flags ^ flags) &IFF_MULTICAST ) +if (dev->change_rx_flags && (old_flags ^ flags) &IFF_MULTICAST ) dev->change_rx_flags (dev,IFF_MULTICAST );dev_set_rx_mode (dev);
net/ipv4/route.c +1 -1
@@ -162,7 +162,7 @@ static struct dst_ops ipv4_dst_ops = { .negative_advice = ipv4_negative_advice, .link_failure = ipv4_link_failure, .update_pmtu = ip_rt_update_pmtu, - .local_out = ip_local_out, + .local_out = __ip_local_out, .entry_size = sizeof(struct rtable), .entries = ATOMIC_INIT(0), };
net/ipv4/tcp_cong.c +5 -7
@@ -285,14 +285,12 @@ int tcp_is_cwnd_limited(const struct sock *sk, u32 in_flight)if (in_flight >= tp->snd_cwnd)return 1 ; -if (!sk_can_gso (sk)) -return 0 ; - left = tp->snd_cwnd - in_flight; -if (sysctl_tcp_tso_win_divisor) -return left * sysctl_tcp_tso_win_divisor < tp->snd_cwnd; -else -return left <=tcp_max_burst (tp); +if (sk_can_gso (sk) && + left * sysctl_tcp_tso_win_divisor < tp->snd_cwnd && + left * tp->mss_cache <65536 ) +return 1 ; +return left <=tcp_max_burst (tp); }EXPORT_SYMBOL_GPL (tcp_is_cwnd_limited);
net/ipv4/tcp_input.c +42 -23
138 lines not on this page · raw message
net/ipv4/tcp_output.c +6 -4
@@ -1836,7 +1836,7 @@ int tcp_retransmit_skb(struct sock *sk, struct sk_buff *skb) {struct tcp_sock *tp =tcp_sk (sk);struct inet_connection_sock *icsk =inet_csk (sk); -unsigned int cur_mss =tcp_current_mss (sk,0 ); +unsigned int cur_mss;int err;/* Inconslusive MTU probe */
@@ -1858,6 +1858,11 @@ int tcp_retransmit_skb(struct sock *sk, struct sk_buff *skb)return -ENOMEM ; } +if (inet_csk (sk)->icsk_af_ops->rebuild_header (sk)) +return -EHOSTUNREACH ;/* Routing failure or similar. */ + + cur_mss =tcp_current_mss (sk,0 ); +/* If receiver has shrunk his window, and skb is out of * new window, do not retransmit it. The exception is the * case, when window is shrunk to zero. In this case
@@ -1884,9 +1889,6 @@ int tcp_retransmit_skb(struct sock *sk, struct sk_buff *skb) (sysctl_tcp_retrans_collapse != 0))tcp_retrans_try_collapse (sk, skb, cur_mss); -if (inet_csk (sk)->icsk_af_ops->rebuild_header (sk)) -return -EHOSTUNREACH ;/* Routing failure or similar. */ -/* Some Solaris stacks overoptimize and ignore the FIN on a * retransmit when old data is attached. So strip it off * since it is cheap to do so and saves bytes on the network.
net/ipv6/route.c +1 -1
@@ -105,7 +105,7 @@ static struct dst_ops ip6_dst_ops = { .negative_advice = ip6_negative_advice, .link_failure = ip6_link_failure, .update_pmtu = ip6_rt_update_pmtu, - .local_out = ip6_local_out, + .local_out = __ip6_local_out, .entry_size = sizeof(struct rt6_info), .entries = ATOMIC_INIT(0), };
net/key/af_key.c +1 -1
@@ -1219,7 +1219,7 @@ static struct xfrm_state * pfkey_msg2xfrm_state(struct sadb_msg *hdr, x->sel.prefixlen_s = addr->sadb_address_prefixlen; } -if (x->props.mode ==XFRM_MODE_TRANSPORT ) +if (!x->sel.family) x->sel.family = x->props.family;if (ext_hdrs[SADB_X_EXT_NAT_T_TYPE -1 ]) {
net/mac80211/ieee80211_sta.c +5 -0
@@ -2723,6 +2723,7 @@ static int ieee80211_sta_join_ibss(struct net_device *dev,struct rate_selection ratesel;u8 *pos;struct ieee80211_sub_if_data *sdata; +union iwreq_data wrqu;/* Remove possible STA entries from other IBSS networks. */ sta_info_flush (local,NULL );
@@ -2863,6 +2864,10 @@ static int ieee80211_sta_join_ibss(struct net_device *dev,ieee80211_rx_bss_put (dev, bss); +memset (&wrqu,0 ,sizeof (wrqu)); +memcpy (wrqu.ap_addr.sa_data, bss->bssid,ETH_ALEN ); +wireless_send_event (dev,SIOCGIWAP , &wrqu,NULL ); +return res; }
net/sched/cls_api.c +1 -1
@@ -220,7 +220,7 @@ replay: tp =kzalloc (sizeof (*tp),GFP_KERNEL );if (tp ==NULL ) goto errout; - err = -EINVAL ; + err = -ENOENT ; tp_ops =tcf_proto_lookup_ops (tca[TCA_KIND ]);if (tp_ops ==NULL ) {#ifdef CONFIG_KMOD
sound/pci/emu10k1/emu10k1_main.c +8 -7
@@ -1817,13 +1817,6 @@ int __devinit snd_emu10k1_create(struct snd_card *card, } emu->port =pci_resource_start (pci,0 ); -if (request_irq (pci->irq, snd_emu10k1_interrupt,IRQF_SHARED , -"EMU10K1" , emu)) { - err = -EBUSY ; - goto error; - } - emu->irq = pci->irq; - emu->max_cache_pages = max_cache_bytes >>PAGE_SHIFT ;if (snd_dma_alloc_pages (SNDRV_DMA_TYPE_DEV ,snd_dma_pci_data (pci),32 *1024 , &emu->ptb_pages) <0 ) {
@@ -1886,6 +1879,14 @@ int __devinit snd_emu10k1_create(struct snd_card *card, emu->fx8010.etram_pages.area =NULL ; emu->fx8010.etram_pages.bytes =0 ; +/* irq handler must be registered after I/O ports are activated */ +if (request_irq (pci->irq, snd_emu10k1_interrupt,IRQF_SHARED , +"EMU10K1" , emu)) { + err = -EBUSY ; + goto error; + } + emu->irq = pci->irq; +/* * Init to 0x02109204 : * Clock accuracy = 0 (1000ppm)
sound/pci/hda/patch_realtek.c +0 -1
@@ -940,7 +940,6 @@ do_sku:AC_VERB_SET_UNSOLICITED_ENABLE , AC_USRSP_EN | ALC880_HP_EVENT); spec->unsol_event = alc_sku_unsol_event; - spec->init_hook = alc_sku_automute; }/*
Quoted 7 lines · Greg KH
We (the -stable team) are announcing the release of the 2.6.25.7 kernel.
It contains a number of assorted bugfixes all over the tree. Users are encouraged to update.
I'll also be replying to this message with a copy of the patch between 2.6.25.6 and 2.6.25.7
ppc
CC drivers/macintosh/mediabay.odrivers/macintosh/mediabay.c: In function 'check_media_bay':drivers/macintosh/mediabay.c:427: error: 'struct media_bay_info' has no member named 'cd_index'
make[2]: *** [drivers/macintosh/mediabay.o] Error 1
There was a patch to fix this somewhere I think.
Signature · 2 lines
Arkadiusz Miśkiewicz PLD/Linux Team arekm / maven.pl http://ftp.pld-linux.org/