r2723 - in trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian: . patches patches/series
Simon Horman
horms@costa.debian.org
Wed, 16 Mar 2005 07:46:07 +0100
Author: horms
Date: 2005-03-16 07:46:06 +0100 (Wed, 16 Mar 2005)
New Revision: 2723
Added:
trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/rcu-locking.dpatch
Modified:
trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/changelog
trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/radeon-race.dpatch
trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/series/2.6.8-15
Log:
Fix locking error in RCU. (Simon Horman) (closes: #280743)
Modified: trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/changelog
===================================================================
--- trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/changelog 2005-03-16 01:25:54 UTC (rev 2722)
+++ trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/changelog 2005-03-16 06:46:06 UTC (rev 2723)
@@ -3,8 +3,10 @@
* [Security] Fix race in radeon driver which can result
in local privelage escalation. (Simon Horman) (closes: #297203)
- -- Simon Horman <horms@debian.org> Tue, 15 Mar 2005 14:27:46 +0900
+ * Fix locking error in RCU. (Simon Horman) (closes: #280743)
+ -- Simon Horman <horms@debian.org> Wed, 16 Mar 2005 15:40:00 +0900
+
kernel-source-2.6.8 (2.6.8-14) unstable; urgency=high
* Backport more scsi-ioctl fixes: add CMD_WARNED, remove dulicate
Modified: trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/radeon-race.dpatch
===================================================================
--- trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/radeon-race.dpatch 2005-03-16 01:25:54 UTC (rev 2722)
+++ trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/radeon-race.dpatch 2005-03-16 06:46:06 UTC (rev 2723)
@@ -14,7 +14,7 @@
# URL: http://linux.bkbits.net:8080/linux-2.6/gnupatch@42088d17CO1mOAfgW4R46WRTm9gkwA
# inclusion: upstream
# descrition: drm: fix race condition in radeon driver
-# revision date: Tue, 15 Mar 2005 14:20:00 +0900
+# revision date: Wed, 16 Mar 2005 15:43:20 +0900
#
# S rset: ChangeSet|1.1982.56.1..1.1982.56.2
# I rset: drivers/char/drm/radeon_drv.h|1.38..1.39
@@ -444,7 +444,6 @@
RING_SPACE_TEST_WITH_RETURN( dev_priv );
VB_AGE_TEST_WITH_RETURN( dev_priv );
-+ debian/patches/series/2.6.8-15
+ if (cmdbuf.bufsz > 64*1024 || cmdbuf.bufsz<0) {
+ return DRM_ERR(EINVAL);
+ }
Added: trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/rcu-locking.dpatch
===================================================================
--- trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/rcu-locking.dpatch 2005-03-16 01:25:54 UTC (rev 2722)
+++ trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/rcu-locking.dpatch 2005-03-16 06:46:06 UTC (rev 2723)
@@ -0,0 +1,56 @@
+#! /bin/sh -e
+## <PATCHNAME>.dpatch by <PATCH_AUTHOR@EMAI>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Description: [VLAN]: Fix thinko in RCU locking.
+## DP: Patch author: avid S. Miller <davem@davemloft.net>
+## DP: Upstream status: backport
+
+. $(dirname $0)/DPATCH
+
+@DPATCH@
+# origin: davem (BitKeeper)
+# cset: 1.1832.61.273 (2.6) key=413fd715Y2zJdevtgrTGL-Uok-kbRA
+# URL: http://linux.bkbits.net:8080/linux-2.6/gnupatch@413fd715Y2zJdevtgrTGL-Uok-kbRA
+# inclusion: upstream
+# descrition: [VLAN]: Fix thinko in RCU locking.
+# revision date: Wed, 16 Mar 2005 15:38:04 +0900
+#
+# S rset: ChangeSet|1.1832.61.272..1.1832.61.273
+# I rset: net/8021q/vlan_dev.c|1.18..1.19
+#
+# Key:
+# S: Skipped ChangeSet file only
+# O: Original Followed by Updated
+# U: Updated Included with updated range of versions
+# I: Included Included verbatim
+# E: Excluded Excluded on request from user
+# D: Deleted Manually deleted by subsequent user edit
+# R: Revised Manually revised by subsequent user edit
+#
+#
+# This is a BitKeeper generated diff -Nru style patch.
+#
+# ChangeSet
+# 2004/09/08 21:07:49-07:00 davem@nuts.davemloft.net
+# [VLAN]: Fix thinko in RCU locking.
+#
+# Signed-off-by: David S. Miller <davem@davemloft.net>
+#
+# net/8021q/vlan_dev.c
+# 2004/09/08 21:07:19-07:00 davem@nuts.davemloft.net +1 -1
+# [VLAN]: Fix thinko in RCU locking.
+#
+#
+===== net/8021q/vlan_dev.c 1.18 vs 1.19 =====
+--- 1.18/net/8021q/vlan_dev.c 2004-08-10 08:35:29 +09:00
++++ 1.19/net/8021q/vlan_dev.c 2004-09-09 13:07:19 +09:00
+@@ -244,7 +244,7 @@ int vlan_skb_recv(struct sk_buff *skb, s
+ /* TODO: Add a more specific counter here. */
+ stats->rx_errors++;
+ }
+- rcu_read_lock();
++ rcu_read_unlock();
+ return 0;
+ }
+
Modified: trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/series/2.6.8-15
===================================================================
--- trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/series/2.6.8-15 2005-03-16 01:25:54 UTC (rev 2722)
+++ trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/series/2.6.8-15 2005-03-16 06:46:06 UTC (rev 2723)
@@ -1 +1,2 @@
+ radeon-race.dpatch
++ rcu-locking.dpatch