Skip to contentSkip to conversation

Linux 2.6.13.5

DISCUSSION Greg KH 1 participant 3 messages Dec 15, 2005

Subsystems (6)
lore
Share & tools
lore

Greg KH

author
#0 lore raw

As mentioned before, since people had been wanting another old release, we (the -stable team) are announcing the release of the 2.6.13.5 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.13.4 and 2.6.13.5, as it is small enough to do so.

The updated 2.6.13.y git tree can be found at:
rsync://rsync.kernel.org/pub/scm/linux/kernel/git/gregkh/linux-2.6.13.y.git
and can be browsed at the normal kernel.org git web browser:
www.kernel.org/git/

thanks,

greg k-h

--------

 Makefile                           |    2 
 arch/s390/appldata/appldata_base.c |    7 +
 arch/sparc64/kernel/irq.c          |    1 
 include/linux/proc_fs.h            |    1 
 include/linux/sysctl.h             |    3 
 kernel/sysctl.c                    |  136 +++++++++++++++++++++++++++++--------
 net/bridge/br_if.c                 |    2 
 7 files changed, 119 insertions(+), 33 deletions(-)

Summary of changes from v2.6.13.4 to v2.6.13.5
==============================================

Al Viro:
CVE-2005-2709 sysctl unregistration oops

Greg Kroah-Hartman:

      Linux 2.6.13.5

Stephen Hemminger:
br: fix race on bridge del if

Sven Hartge:
Fix compile error in irq.c

author
#1 lore raw
Makefile +1 -1
index 5ce2147..004ecc4 100644
@@ -1,7 +1,7 @@
 VERSION = 2
 PATCHLEVEL = 6
 SUBLEVEL = 13
-EXTRAVERSION = .4
+EXTRAVERSION = .5
 NAME=Woozy Numbat
 
 # *DOCUMENTATION*
arch/s390/appldata/appldata_base.c +5 -2
index c9f2f60..dee6ab5 100644
@@ -592,12 +592,15 @@ int appldata_register_ops(struct appldat
  */
 void appldata_unregister_ops(struct appldata_ops *ops)
 {
+	void *table;
 	spin_lock(&appldata_ops_lock);
-	unregister_sysctl_table(ops->sysctl_header);
 	list_del(&ops->list);
-	kfree(ops->ctl_table);
+	/* at that point any incoming access will fail */
+	table = ops->ctl_table;
 	ops->ctl_table = NULL;
 	spin_unlock(&appldata_ops_lock);
+	unregister_sysctl_table(ops->sysctl_header);
+	kfree(table);
 	P_INFO("%s-ops unregistered!\n", ops->name);
 }
 /********************** module-ops management <END> **************************/
arch/sparc64/kernel/irq.c +1 -0
index c9b6916..233526b 100644
@@ -27,6 +27,7 @@
 #include <asm/atomic.h>
 #include <asm/system.h>
 #include <asm/irq.h>
+#include <asm/io.h>
 #include <asm/sbus.h>
 #include <asm/iommu.h>
 #include <asm/upa.h>
include/linux/proc_fs.h +1 -0
index 0563581..a7b0329 100644
@@ -66,6 +66,7 @@ struct proc_dir_entry {
 	write_proc_t *write_proc;
 	atomic_t count;		/* use count */
 	int deleted;		/* delete flag */
+	void *set;
 };
 
 struct kcore_list {
include/linux/sysctl.h +3 -0
index e82be96..3144ee5 100644
@@ -24,6 +24,7 @@
 #include <linux/compiler.h>
 
 struct file;
+struct completion;
 
 #define CTL_MAXNAME 10		/* how many path components do we allow in a
 				   call to sysctl?   In other words, what is
@@ -894,6 +895,8 @@ struct ctl_table_header
 {
 	ctl_table *ctl_table;
 	struct list_head ctl_entry;
+	int used;
+	struct completion *unregistering;
 };
 
 struct ctl_table_header * register_sysctl_table(ctl_table * table, 
kernel/sysctl.c +107 -29

225 lines not on this page · raw message

net/bridge/br_if.c +1 -1
index 91bb895..defcf6a 100644
@@ -79,7 +79,6 @@ static void destroy_nbp(struct net_bridg
 {
 	struct net_device *dev = p->dev;
 
-	dev->br_port = NULL;
 	p->br = NULL;
 	p->dev = NULL;
 	dev_put(dev);
@@ -100,6 +99,7 @@ static void del_nbp(struct net_bridge_po
 	struct net_bridge *br = p->br;
 	struct net_device *dev = p->dev;
 
+	dev->br_port = NULL;
 	dev_set_promiscuity(dev, -1);
 
 	spin_lock_bh(&br->lock);
author
#2 lore raw
In reply to Greg KH
Quoted 2 lines · Greg KH

Al Viro:
CVE-2005-2709 sysctl unregistration oops

Yes, for those of you paying attention, this patch wasn't in the review queue, but people asked for it to be included as it fixed a security problem. The patch came directly from the 2.6.14.y tree.

thanks,

greg k-h