[kernel] r18768 - in dists/squeeze/linux-2.6/debian: . patches/bugfix/all patches/series

[Ben Hutchings]

Author: benh
Date: Sat Mar  3 18:18:09 2012
New Revision: 18768

Log:
appletalk: da.s_net not copied but assigned to itself in aarp_rcv() (Closes: #660902)

Added:
   dists/squeeze/linux-2.6/debian/patches/bugfix/all/appletalk-da.s_net-not-copied-but-assigned-to-itself.patch
Modified:
   dists/squeeze/linux-2.6/debian/changelog
   dists/squeeze/linux-2.6/debian/patches/series/42

Modified: dists/squeeze/linux-2.6/debian/changelog
==============================================================================
--- dists/squeeze/linux-2.6/debian/changelog	Sat Mar  3 15:18:42 2012	(r18767)
+++ dists/squeeze/linux-2.6/debian/changelog	Sat Mar  3 18:18:09 2012	(r18768)
@@ -28,6 +28,8 @@
     For the complete list of changes, see:
      http://www.kernel.org/pub/linux/kernel/v2.6/longterm/v2.6.32/ChangeLog-2.6.32.57
     and the bug report which this closes: #659629.
+  * appletalk: da.s_net not copied but assigned to itself in aarp_rcv()
+    (Closes: #660902)
 
  -- Uwe Kleine-König <u.kleine-koenig at pengutronix.de>  Mon, 16 Jan 2012 16:47:21 +0100
 

Added: dists/squeeze/linux-2.6/debian/patches/bugfix/all/appletalk-da.s_net-not-copied-but-assigned-to-itself.patch
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/squeeze/linux-2.6/debian/patches/bugfix/all/appletalk-da.s_net-not-copied-but-assigned-to-itself.patch	Sat Mar  3 18:18:09 2012	(r18768)
@@ -0,0 +1,32 @@
+From: Roel Kluin <roel.kluin at gmail.com>
+Date: Fri, 15 Jan 2010 01:49:28 -0800
+Subject: [PATCH] appletalk:: da.s_net not copied but assigned to itself in
+ aarp_rcv()
+
+commit 2a04cd4c7d41c4549764734dcf5a883d304e3229 upstream.
+
+da.s_net was not copied but assigned to itself.
+
+Signed-off-by: Roel Kluin <roel.kluin at gmail.com>
+Acked-by: Arnaldo Carvalho de Melo <acme at redhat.com>
+Signed-off-by: David S. Miller <davem at davemloft.net>
+---
+ net/appletalk/aarp.c |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/net/appletalk/aarp.c b/net/appletalk/aarp.c
+index 9d4adfd..f2b3b56 100644
+--- a/net/appletalk/aarp.c
++++ b/net/appletalk/aarp.c
+@@ -819,7 +819,7 @@ static int aarp_rcv(struct sk_buff *skb, struct net_device *dev,
+ 				ma = &ifa->address;
+ 			else { /* We need to make a copy of the entry. */
+ 				da.s_node = sa.s_node;
+-				da.s_net = da.s_net;
++				da.s_net = sa.s_net;
+ 				ma = &da;
+ 			}
+ 
+-- 
+1.7.9.1
+

Modified: dists/squeeze/linux-2.6/debian/patches/series/42
==============================================================================
--- dists/squeeze/linux-2.6/debian/patches/series/42	Sat Mar  3 15:18:42 2012	(r18767)
+++ dists/squeeze/linux-2.6/debian/patches/series/42	Sat Mar  3 18:18:09 2012	(r18768)
@@ -7,3 +7,4 @@
 + bugfix/all/stable/2.6.32.55.patch
 + bugfix/all/stable/2.6.32.56.patch
 + bugfix/all/stable/2.6.32.57.patch
++ bugfix/all/appletalk-da.s_net-not-copied-but-assigned-to-itself.patch