[kernel] r14567 - in dists/etch-security/linux-2.6/debian: . patches/bugfix/all patches/bugfix/mips patches/series
Dann Frazier
dannf at alioth.debian.org
Thu Nov 5 02:15:34 UTC 2009
Author: dannf
Date: Thu Nov 5 02:15:33 2009
New Revision: 14567
Log:
merge changes from etch branch to avoid another o-p-u update
Added:
dists/etch-security/linux-2.6/debian/patches/bugfix/all/bridge-fix-oops-in-port_carrier_check.patch
dists/etch-security/linux-2.6/debian/patches/bugfix/mips/inexistent-syscalls.patch
dists/etch-security/linux-2.6/debian/patches/series/25
dists/etch-security/linux-2.6/debian/patches/series/26etch1
- copied unchanged from r14566, dists/etch-security/linux-2.6/debian/patches/series/24etch5
Deleted:
dists/etch-security/linux-2.6/debian/patches/series/24etch5
Modified:
dists/etch-security/linux-2.6/debian/changelog
Modified: dists/etch-security/linux-2.6/debian/changelog
==============================================================================
--- dists/etch-security/linux-2.6/debian/changelog Thu Nov 5 02:04:05 2009 (r14566)
+++ dists/etch-security/linux-2.6/debian/changelog Thu Nov 5 02:15:33 2009 (r14567)
@@ -1,9 +1,25 @@
-linux-2.6 (2.6.18.dfsg.1-24etch5) UNRELEASED; urgency=high
+linux-2.6 (2.6.18.dfsg.1-26etch1) UNRELEASED; urgency=high
* [s390] Fix missing capability check in z90crypt driver (CVE-2009-1883)
-- dann frazier <dannf at debian.org> Tue, 15 Sep 2009 22:19:58 -0600
+linux-2.6 (2.6.18.dfsg.1-26) oldstable; urgency=high
+
+ * Merge changes from 2.6.18.dfsg.1-24etch2
+
+ -- dann frazier <dannf at debian.org> Wed, 20 May 2009 13:51:28 -0600
+
+linux-2.6 (2.6.18.dfsg.1-25) oldstable; urgency=high
+
+ [ Aurelien Jarno ]
+ * [mips/mipsel] Fix errno on inexistent syscalls. (Closes: #520034).
+
+ [ dann frazier ]
+ * bridge: Fix oops in port_carrier_check (closes: #529165)
+
+ -- dann fraizer <dannf at debian.org> Mon, 18 May 2009 23:52:52 -0600
+
linux-2.6 (2.6.18.dfsg.1-24etch4) oldstable-security; urgency=high
* [parisc] isa-eeprom - Fix loff_t usage (CVE-2009-2846)
Added: dists/etch-security/linux-2.6/debian/patches/bugfix/all/bridge-fix-oops-in-port_carrier_check.patch
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ dists/etch-security/linux-2.6/debian/patches/bugfix/all/bridge-fix-oops-in-port_carrier_check.patch Thu Nov 5 02:15:33 2009 (r14567)
@@ -0,0 +1,58 @@
+commit a10d567c89dfba90dde2e0515e25760fd74cde06
+Author: Jarek Poplawski <jarkao2 at o2.pl>
+Date: Tue Feb 13 12:35:26 2007 -0800
+
+ [BRIDGE] br_if: Fix oops in port_carrier_check
+
+ Signed-off-by: Jarek Poplawski <jarkao2 at o2.pl>
+ Acked-by: Stephen Hemminger <shemminger at linux-foundation.org>
+ Signed-off-by: David S. Miller <davem at davemloft.net>
+
+diff --git a/net/bridge/br_if.c b/net/bridge/br_if.c
+index f35c1a3..aff6a77 100644
+--- a/net/bridge/br_if.c
++++ b/net/bridge/br_if.c
+@@ -108,6 +108,7 @@ static void port_carrier_check(struct work_struct *work)
+ spin_unlock_bh(&br->lock);
+ }
+ done:
++ dev_put(dev);
+ rtnl_unlock();
+ }
+
+@@ -161,7 +162,8 @@ static void del_nbp(struct net_bridge_port *p)
+
+ dev_set_promiscuity(dev, -1);
+
+- cancel_delayed_work(&p->carrier_check);
++ if (cancel_delayed_work(&p->carrier_check))
++ dev_put(dev);
+
+ spin_lock_bh(&br->lock);
+ br_stp_disable_port(p);
+@@ -444,7 +446,9 @@ int br_add_if(struct net_bridge *br, struct net_device *dev)
+ spin_lock_bh(&br->lock);
+ br_stp_recalculate_bridge_id(br);
+ br_features_recompute(br);
+- schedule_delayed_work(&p->carrier_check, BR_PORT_DEBOUNCE);
++ if (schedule_delayed_work(&p->carrier_check, BR_PORT_DEBOUNCE))
++ dev_hold(dev);
++
+ spin_unlock_bh(&br->lock);
+
+ dev_set_mtu(br->dev, br_min_mtu(br));
+diff --git a/net/bridge/br_notify.c b/net/bridge/br_notify.c
+index 8cd3e42..3311c4e 100644
+--- a/net/bridge/br_notify.c
++++ b/net/bridge/br_notify.c
+@@ -56,7 +56,9 @@ static int br_device_event(struct notifier_block *unused, unsigned long event, v
+
+ case NETDEV_CHANGE:
+ if (br->dev->flags & IFF_UP)
+- schedule_delayed_work(&p->carrier_check, BR_PORT_DEBOUNCE);
++ if (schedule_delayed_work(&p->carrier_check,
++ BR_PORT_DEBOUNCE))
++ dev_hold(dev);
+ break;
+
+ case NETDEV_FEAT_CHANGE:
Added: dists/etch-security/linux-2.6/debian/patches/bugfix/mips/inexistent-syscalls.patch
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ dists/etch-security/linux-2.6/debian/patches/bugfix/mips/inexistent-syscalls.patch Thu Nov 5 02:15:33 2009 (r14567)
@@ -0,0 +1,83 @@
+commit bda8229bdd087167f463ad5e74299987924f8137
+Author: Atsushi Nemoto <anemo at mba.ocn.ne.jp>
+Date: Sat Oct 25 01:17:22 2008 +0900
+
+ MIPS: Set positive error number to errno on illegal_syscall
+
+ Signed-off-by: Atsushi Nemoto <anemo at mba.ocn.ne.jp>
+ Signed-off-by: Ralf Baechle <ralf at linux-mips.org>
+
+diff --git a/arch/mips/kernel/scall32-o32.S b/arch/mips/kernel/scall32-o32.S
+index 5e75a31..ffa23bd 100644
+--- a/arch/mips/kernel/scall32-o32.S
++++ b/arch/mips/kernel/scall32-o32.S
+@@ -180,7 +180,7 @@ bad_stack:
+ * The system call does not exist in this kernel
+ */
+ illegal_syscall:
+- li v0, -ENOSYS # error
++ li v0, ENOSYS # error
+ sw v0, PT_R2(sp)
+ li t0, 1 # set error flag
+ sw t0, PT_R7(sp)
+diff --git a/arch/mips/kernel/scall64-64.S b/arch/mips/kernel/scall64-64.S
+index 3d58204..a9e1716 100644
+--- a/arch/mips/kernel/scall64-64.S
++++ b/arch/mips/kernel/scall64-64.S
+@@ -117,7 +117,7 @@ syscall_trace_entry:
+
+ illegal_syscall:
+ /* This also isn't a 64-bit syscall, throw an error. */
+- li v0, -ENOSYS # error
++ li v0, ENOSYS # error
+ sd v0, PT_R2(sp)
+ li t0, 1 # set error flag
+ sd t0, PT_R7(sp)
+commit fb498e2570eedc6c9c3d165e370624dfc3aed97b
+Author: Atsushi Nemoto <anemo at mba.ocn.ne.jp>
+Date: Sat Oct 25 01:17:23 2008 +0900
+
+ MIPS: Set ENOSYS to errno on illegal system call number for syscall(2)
+
+ Signed-off-by: Atsushi Nemoto <anemo at mba.ocn.ne.jp>
+ Signed-off-by: Ralf Baechle <ralf at linux-mips.org>
+
+diff --git a/arch/mips/kernel/scall32-o32.S b/arch/mips/kernel/scall32-o32.S
+index ffa23bd..759f680 100644
+--- a/arch/mips/kernel/scall32-o32.S
++++ b/arch/mips/kernel/scall32-o32.S
+@@ -293,7 +293,7 @@ bad_alignment:
+ jr t2
+ /* Unreached */
+
+-einval: li v0, -EINVAL
++einval: li v0, -ENOSYS
+ jr ra
+ END(sys_syscall)
+
+commit c6cb4df96fa22d1174d6fb6dfc2c7501d7afaeea
+Author: David Daney <ddaney at caviumnetworks.com>
+Date: Fri Oct 31 11:23:09 2008 -0700
+
+ MIPS: Return ENOSYS from sys32_syscall on 64bit kernels like elsewhere.
+
+ When the o32 errno was changed to ENOSYS, we forgot to update the code
+ for 64bit kernels.
+
+ Signed-off-by: David Daney <ddaney at caviumnetworks.com>
+ Acked-by: Atsushi Nemoto <anemo at mba.ocn.ne.jp>
+ Signed-off-by: Ralf Baechle <ralf at linux-mips.org>
+
+diff --git a/arch/mips/kernel/scall64-o32.S b/arch/mips/kernel/scall64-o32.S
+index 3d55e3b..fefef4a 100644
+--- a/arch/mips/kernel/scall64-o32.S
++++ b/arch/mips/kernel/scall64-o32.S
+@@ -196,7 +196,7 @@ LEAF(sys32_syscall)
+ jr t2
+ /* Unreached */
+
+-einval: li v0, -EINVAL
++einval: li v0, -ENOSYS
+ jr ra
+ END(sys32_syscall)
+
Added: dists/etch-security/linux-2.6/debian/patches/series/25
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ dists/etch-security/linux-2.6/debian/patches/series/25 Thu Nov 5 02:15:33 2009 (r14567)
@@ -0,0 +1,2 @@
++ bugfix/mips/inexistent-syscalls.patch
++ bugfix/all/bridge-fix-oops-in-port_carrier_check.patch
Copied: dists/etch-security/linux-2.6/debian/patches/series/26etch1 (from r14566, dists/etch-security/linux-2.6/debian/patches/series/24etch5)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ dists/etch-security/linux-2.6/debian/patches/series/26etch1 Thu Nov 5 02:15:33 2009 (r14567, copy of r14566, dists/etch-security/linux-2.6/debian/patches/series/24etch5)
@@ -0,0 +1 @@
++ bugfix/s390/z90crypt-missing-cap-check.patch
More information about the Kernel-svn-changes
mailing list