Re: [PATCH] [NET]: da.s_net not copied but assigned to itself in aarp_rcv()

Re: [PATCH] [NET]: da.s_net not copied but assigned to itself in aarp_rcv()

[Arnaldo Carvalho de Melo]

Em Thu, Jan 14, 2010 at 09:32:11PM +0100, Roel Kluin escreveu:
> da.s_net was not copied but assigned to itself.
> 
> Signed-off-by: Roel Kluin <roel.kluin@gmail.com>

Looks right, must be there for ages...

Acked-by: Arnaldo Carvalho de Melo <acme@redhat.com>

> ---
> 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;
>  			}
>  

Re: [PATCH] [NET]: da.s_net not copied but assigned to itself in aarp_rcv()

[David Miller]

From: Arnaldo Carvalho de Melo <acme@ghostprotocols.net>
Date: Thu, 14 Jan 2010 19:00:01 -0200

> Em Thu, Jan 14, 2010 at 09:32:11PM +0100, Roel Kluin escreveu:
>> da.s_net was not copied but assigned to itself.
>> 
>> Signed-off-by: Roel Kluin <roel.kluin@gmail.com>
> 
> Looks right, must be there for ages...
> 
> Acked-by: Arnaldo Carvalho de Melo <acme@redhat.com>

Applied, please always CC: on networking patches.

Thanks.

Re: [PATCH] [NET]: da.s_net not copied but assigned to itself in aarp_rcv()

[Jonathan Nieder]

Hi Dave,

David Miller wrote:
>> Em Thu, Jan 14, 2010 at 09:32:11PM +0100, Roel Kluin escreveu:

>>> da.s_net was not copied but assigned to itself.
>>> 
>>> Signed-off-by: Roel Kluin <roel.kluin@gmail.com>
[...]
> Applied, please always CC: on networking patches.

Thanks.

Without this patch (commit 2a04cd4c7 aka v2.6.33-rc6~29^2~33), Mason
(cc-ed) is not able to use appletalk[1]:

| With Linux 2.6.32 as supplied with Debian Squeeze, Netatalk is unable
| to thrive. Connections made to afpd will open, but attempting to transfer
| files will take a very long time and/or eventually time out.
|
| I've noted this with both Netatalk as supplied with Squeeze and with
| Netatalk 2.2.1 built from the Wheezy source package, which I evidently
| need for AFP 3 support.
|
| Installing Linux 3.2 from backports, with no other changes to the system,
| allows afpd to work correctly.

Ben sent a copy of this patch to try against 2.6.32.y and it worked.
Would it be possible to include this in the 2.6.32.y-longterm tree?

Sincerely,
Jonathan

[1] http://bugs.debian.org/660902

[2.6.32.y] Re: [PATCH] appletalk:: da.s_net not copied but assigned to itself in aarp_rcv()

[Jonathan Nieder]

From: Roel Kluin <roel.kluin@gmail.com>
Date: Fri, 15 Jan 2010 01:49:28 -0800
Subject: 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@gmail.com>
Acked-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
---
(culling cc list)
Hi Willy,

Please consider

  2a04cd4c7d41 appletalk:: da.s_net not copied bu assigned to itself
               in aarp_rcv()

for application to the 2.6.32.y tree.

Without this patch, Mason (cc-ed) is not able to use appletalk[1]:

| With Linux 2.6.32 as supplied with Debian Squeeze, Netatalk is unable
| to thrive. Connections made to afpd will open, but attempting to transfer
| files will take a very long time and/or eventually time out.
|
| I've noted this with both Netatalk as supplied with Squeeze and with
| Netatalk 2.2.1 built from the Wheezy source package, which I evidently
| need for AFP 3 support.

Though this bug is very old.  Presumably no one noticed because no one
was using proxy-AARP.

The patch was merged upstream in 2.6.33-rc6.  Mason tested it against
Debian's 2.6.32.y-based kernel in March and found it to work, and the
patch has been part of Debian's stable kernel since then without
triggering any complaints.

Hope that helps,
Jonathan

[1] http://bugs.debian.org/660902

 net/appletalk/aarp.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net/appletalk/aarp.c b/net/appletalk/aarp.c
index 9d4adfd22757..f2b3b56aa779 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.10