[PATCH] Fix multicast on VLAN interfaces

[PATCH] Fix multicast on VLAN interfaces

[Phil Oester]

[-- Attachment #1: Type: text/plain, Size: 377 bytes --]

In commit 56addd6eeeb4e11f5a0af7093ca078e0f29140e0 the VLAN multicast list
handling was reworked.  Unfortunately, a variable initialization was missed,
and multicast over vlan devices has been broken since 2.6.23-rc1 (apparently
not too many people use this).  Trivial fix below, which might be a candidate
for -stable.

Phil

Signed-off-by: Phil Oester <kernel@linuxace.com>


[-- Attachment #2: patch-mcast-vlan --]
[-- Type: text/plain, Size: 371 bytes --]

diff --git a/net/core/dev.c b/net/core/dev.c
index 908f07c..999af2e 100644
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -2905,6 +2905,7 @@ int __dev_addr_add(struct dev_addr_list **list, int *count,
 		return -ENOMEM;
 	memcpy(da->da_addr, addr, alen);
 	da->da_addrlen = alen;
+	da->da_synced = 0;
 	da->da_users = 1;
 	da->da_gusers = glbl ? 1 : 0;
 	da->next = *list;

Re: [PATCH] Fix multicast on VLAN interfaces

[Patrick McHardy]

Phil Oester wrote:
> In commit 56addd6eeeb4e11f5a0af7093ca078e0f29140e0 the VLAN multicast list
> handling was reworked.  Unfortunately, a variable initialization was missed,
> and multicast over vlan devices has been broken since 2.6.23-rc1 (apparently
> not too many people use this).  Trivial fix below, which might be a candidate
> for -stable.

Thanks Phil, a similar patch is already sitting in net-2.6.git.

Re: [PATCH] Fix multicast on VLAN interfaces

[David Miller]

From: Phil Oester <kernel@linuxace.com>
Date: Thu, 21 Feb 2008 14:05:42 -0800

> diff --git a/net/core/dev.c b/net/core/dev.c
> index 908f07c..999af2e 100644
> --- a/net/core/dev.c
> +++ b/net/core/dev.c
> @@ -2905,6 +2905,7 @@ int __dev_addr_add(struct dev_addr_list **list, int *count,
>  		return -ENOMEM;
>  	memcpy(da->da_addr, addr, alen);
>  	da->da_addrlen = alen;
> +	da->da_synced = 0;
>  	da->da_users = 1;
>  	da->da_gusers = glbl ? 1 : 0;
>  	da->next = *list;

"da" is kzalloc()'d, how can da->da_synced not be zero?

Re: [PATCH] Fix multicast on VLAN interfaces

[Phil Oester]

On Sat, Feb 23, 2008 at 08:00:18PM -0800, David Miller wrote:
> "da" is kzalloc()'d, how can da->da_synced not be zero?

Because it was originally kmalloc'd, not kzalloc'd.  It was
fixed about 2 days prior to my patch submission, here:

    http://marc.info/?l=linux-netdev&m=120343348811767&w=2

which I missed.

Phil