Linux 2.6.14.2
Subsystems (10)
We (the -stable team) are announcing the release of the 2.6.14.2 kernel.
The diffstat and short summary of the fixes are below.
I'll also be replying to this message with a copy of the patch between 2.6.14.1 and 2.6.14.2, as it is small enough to do so.
The updated 2.6.14.y git tree can be found at:
rsync://rsync.kernel.org/pub/scm/linux/kernel/git/gregkh/linux-2.6.14.y.git
and can be browsed at the normal kernel.org git web browser:
www.kernel.org/git/
thanks,
greg k-h
--------
Makefile | 2 drivers/block/cfq-iosched.c | 4 - drivers/net/wireless/airo.c | 2 drivers/net/wireless/airo.h | 9 ++++ drivers/net/wireless/airo_cs.c | 6 -- drivers/net/wireless/prism54/islpci_eth.c | 7 --- drivers/usb/core/sysfs.c | 33 ++++++--------- drivers/usb/core/usb.c | 63 ++++++++++-------------------- fs/exec.c | 10 +++- fs/xfs/Kconfig | 2 include/asm-alpha/barrier.h | 2 kernel/ptrace.c | 2 kernel/signal.c | 2 net/core/datagram.c | 4 + net/ipv4/ipvs/ip_vs_core.c | 7 +-- net/ipv4/tcp_bic.c | 2 16 files changed, 73 insertions(+), 84 deletions(-)
Summary of changes from v2.6.14.1 to v2.6.14.2
==============================================
Adrian Bunk:
airo.c/airo_cs.c: correct prototypes
Dimitri Puzin:
fix XFS_QUOTA for modular XFS
Greg Kroah-Hartman:
USB: always export interface information for modalias Linux 2.6.14.2
Herbert Xu:
NET: Fix zero-size datagram reception
Ivan Kokshaysky:
fix alpha breakage
Jens Axboe:
Oops on suspend after on-the-fly switch to anticipatory i/o scheduler - PowerBook5, 4
Julian Anastasov:
ipvs: fix connection leak if expire_nodest_conn=1
Linus Torvalds:
Fix ptrace self-attach rule
Oleg Nesterov:
- fix signal->live leak in copy_process() fix de_thread() vs send_group_sigqueue() race
Roger While:
prism54 : Fix frame length
Stephen Hemminger:
tcp: BIC max increment too large
Makefile +1 -1
@@ -1,7 +1,7 @@ VERSION = 2 PATCHLEVEL = 6 SUBLEVEL = 14 -EXTRAVERSION = .1 +EXTRAVERSION = .2 NAME=Affluent Albatross # *DOCUMENTATION*
drivers/block/cfq-iosched.c +1 -3
@@ -2260,10 +2260,8 @@ static void cfq_put_cfqd(struct cfq_dataif (!atomic_dec_and_test (&cfqd->ref))return ; -blk_put_queue (q); -cfq_shutdown_timer_wq (cfqd); - q->elevator->elevator_data =NULL ; +blk_put_queue (q);mempool_destroy (cfqd->crq_pool);kfree (cfqd->crq_hash);
drivers/net/wireless/airo.c +2 -0
@@ -46,6 +46,8 @@#include <linux/pci.h> #include <asm/uaccess.h> +#include "airo.h" +#ifdef CONFIG_PCI static struct pci_device_id card_ids[] = { { 0x14b9, 1, PCI_ANY_ID, PCI_ANY_ID, },
drivers/net/wireless/airo.h new file +9 -0
@@ -0,0 +1,9 @@ +#ifndef _AIRO_H_ +#define _AIRO_H_ + +struct net_device *init_airo_card (unsigned short irq,int port,int is_pcmcia, +struct device *dmdev); +int reset_airo_card (struct net_device *dev); +void stop_airo_card (struct net_device *dev,int freeres); + +#endif /* _AIRO_H_ */
drivers/net/wireless/airo_cs.c +2 -4
@@ -42,6 +42,8 @@#include <asm/io.h> #include <asm/system.h> +#include "airo.h" +/* All the PCMCIA modules use PCMCIA_DEBUG to control debugging. If you do not define PCMCIA_DEBUG at all, all the debug code will be
@@ -78,10 +80,6 @@ MODULE_SUPPORTED_DEVICE("Aironet 4500, 4event handler. */ -struct net_device *init_airo_card (int ,int ,int ,struct device * ); -void stop_airo_card (struct net_device *,int ); -int reset_airo_card (struct net_device * ); -static void airo_config (dev_link_t *link);static void airo_release (dev_link_t *link); static int airo_event(event_t event, int priority,
drivers/net/wireless/prism54/islpci_eth.c +1 -6
@@ -97,12 +97,6 @@ islpci_eth_transmit(struct sk_buff *skb,/* lock the driver code */ spin_lock_irqsave (&priv->slock, flags); -/* determine the amount of fragments needed to store the frame */ - - frame_size = skb->len <ETH_ZLEN ?ETH_ZLEN : skb->len; -if (init_wds) - frame_size +=6 ; -/* check whether the destination queue has enough fragments for the frame */ curr_frag =le32_to_cpu (cb->driver_curr_frag[ISL38XX_CB_TX_DATA_LQ ]);if (unlikely (curr_frag - priv->free_data_tx >=ISL38XX_CB_TX_QSIZE )) {
@@ -213,6 +207,7 @@ islpci_eth_transmit(struct sk_buff *skb,/* store the skb address for future freeing */ priv->data_low_tx[index] = skb;/* set the proper fragment start address and size information */ + frame_size = skb->len; fragment->size =cpu_to_le16 (frame_size); fragment->flags =cpu_to_le16 (0 );/* set to 1 if more fragments */ fragment->address =cpu_to_le32 (pci_map_address);
drivers/usb/core/sysfs.c +13 -20
@@ -292,30 +292,23 @@ static ssize_t show_modalias(struct devi {struct usb_interface *intf;struct usb_device *udev; -int len; +struct usb_host_interface *alt; intf =to_usb_interface (dev); udev =interface_to_usbdev (intf); + alt = intf->cur_altsetting; - len =sprintf (buf,"usb:v%04Xp%04Xd%04Xdc%02Xdsc%02Xdp%02Xic" , -le16_to_cpu (udev->descriptor.idVendor), -le16_to_cpu (udev->descriptor.idProduct), -le16_to_cpu (udev->descriptor.bcdDevice), - udev->descriptor.bDeviceClass, - udev->descriptor.bDeviceSubClass, - udev->descriptor.bDeviceProtocol); - buf += len; - -if (udev->descriptor.bDeviceClass ==0 ) { -struct usb_host_interface *alt = intf->cur_altsetting; - -return len +sprintf (buf,"%02Xisc%02Xip%02X\n" , - alt->desc.bInterfaceClass, - alt->desc.bInterfaceSubClass, - alt->desc.bInterfaceProtocol); - }else { -return len +sprintf (buf,"*isc*ip*\n" ); - } +return sprintf (buf,"usb:v%04Xp%04Xd%04Xdc%02Xdsc%02Xdp%02X" +"ic%02Xisc%02Xip%02X\n" , +le16_to_cpu (udev->descriptor.idVendor), +le16_to_cpu (udev->descriptor.idProduct), +le16_to_cpu (udev->descriptor.bcdDevice), + udev->descriptor.bDeviceClass, + udev->descriptor.bDeviceSubClass, + udev->descriptor.bDeviceProtocol, + alt->desc.bInterfaceClass, + alt->desc.bInterfaceSubClass, + alt->desc.bInterfaceProtocol); } static DEVICE_ATTR(modalias, S_IRUGO, show_modalias, NULL);
drivers/usb/core/usb.c +23 -40
82 lines not on this page · raw message
fs/exec.c +7 -3
@@ -593,6 +593,7 @@ static inline int de_thread(struct task_struct signal_struct *sig = tsk->signal;struct sighand_struct *newsighand, *oldsighand = tsk->sighand;spinlock_t *lock = &oldsighand->siglock; +struct task_struct *leader =NULL ;int count;/*
@@ -668,7 +669,7 @@ static inline int de_thread(struct task_* and to assume its PID: */ if (!thread_group_leader (current)) { -struct task_struct *leader = current->group_leader, *parent; +struct task_struct *parent;struct dentry *proc_dentry1, *proc_dentry2;unsigned long exit_state, ptrace;
@@ -677,6 +678,7 @@ static inline int de_thread(struct task_* It should already be zombie at this point, most * of the time. */ + leader = current->group_leader;while (leader->exit_state !=EXIT_ZOMBIE )yield ();
@@ -736,7 +738,6 @@ static inline int de_thread(struct task_proc_pid_flush (proc_dentry2);BUG_ON (exit_state !=EXIT_ZOMBIE ); -release_task (leader); }/*
@@ -746,8 +747,11 @@ static inline int de_thread(struct task_ sig->flags =0 ; no_thread_group: -BUG_ON (atomic_read (&sig->count) !=1 );exit_itimers (sig); +if (leader) +release_task (leader); + +BUG_ON (atomic_read (&sig->count) !=1 );if (atomic_read (&oldsighand->count) ==1 ) {/*
fs/xfs/Kconfig +1 -1
@@ -24,7 +24,7 @@ config XFS_EXPORT default y config XFS_QUOTA - tristate "XFS Quota support" + bool "XFS Quota support" depends on XFS_FS help If you say Y here, you will be able to set limits for disk usage on
include/asm-alpha/barrier.h +2 -0
@@ -1,6 +1,8 @@#ifndef __BARRIER_H#define __BARRIER_H +#include <asm/compiler.h> +#define mb () \ __asm__ __volatile__("mb": : :"memory")
kernel/ptrace.c +1 -1
@@ -152,7 +152,7 @@ int ptrace_attach(struct task_struct *ta retval = -EPERM ;if (task->pid <=1 ) goto bad; -if (task == current) +if (task->tgid == current->tgid) goto bad;/* the same process cannot be attached many times */ if (task->ptrace &PT_PTRACED )
kernel/signal.c +2 -0
@@ -406,6 +406,8 @@ void __exit_signal(struct task_struct *tvoid exit_signal (struct task_struct *tsk) { +atomic_dec (&tsk->signal->live); +write_lock_irq (&tasklist_lock);__exit_signal (tsk);write_unlock_irq (&tasklist_lock);
net/core/datagram.c +4 -0
@@ -213,6 +213,10 @@ int skb_copy_datagram_iovec(const struct {int i, err, fraglen, end =0 ;struct sk_buff *next =skb_shinfo (skb)->frag_list; + +if (!len) +return 0 ; + next_skb: fraglen =skb_headlen (skb); i =-1 ;
net/ipv4/ipvs/ip_vs_core.c +3 -4
@@ -1009,11 +1009,10 @@ ip_vs_in(unsigned int hooknum, struct skif (sysctl_ip_vs_expire_nodest_conn) {/* try to expire the connection immediately */ ip_vs_conn_expire_now (cp); - }else { -/* don't restart its timer, and silently -drop the packet. */ -__ip_vs_conn_put (cp); } +/* don't restart its timer, and silently +drop the packet. */ +__ip_vs_conn_put (cp);return NF_DROP ; }
net/ipv4/tcp_bic.c +1 -1
@@ -27,7 +27,7 @@*/ static int fast_convergence =1 ; -static int max_increment =32 ; +static int max_increment =16 ;static int low_window =14 ;static int beta =819 ;/* = 819/1024 (BICTCP_BETA_SCALE) */ static int low_utilization_threshold =153 ;