leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

bridge: ensure to unlock in error path in br_multicast_query().

Browse Source 
Signed-off-by: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
YOSHIFUJI Hideaki 2010-03-13 12:27:21 -08:00 committed by David S. Miller
parent c251c7f738
commit bec68ff163
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
net/bridge/br_multicast.c
View File

@ -823,6 +823,7 @@ static int br_multicast_query(struct net_bridge *br,
unsigned long max_delay; unsigned long max_delay;
unsigned long now = jiffies; unsigned long now = jiffies;
__be32 group; __be32 group;
int err = 0;
spin_lock(&br->multicast_lock); spin_lock(&br->multicast_lock);
if (!netif_running(br->dev) || if (!netif_running(br->dev) ||
@ -841,12 +842,14 @@ static int br_multicast_query(struct net_bridge *br,
group = 0; group = 0;
} }
} else { } else {
if (!pskb_may_pull(skb, sizeof(struct igmpv3_query))) if (!pskb_may_pull(skb, sizeof(struct igmpv3_query))) {
return -EINVAL; err = -EINVAL;
goto out;
}
ih3 = igmpv3_query_hdr(skb); ih3 = igmpv3_query_hdr(skb);
if (ih3->nsrcs) if (ih3->nsrcs)
return 0; goto out;
max_delay = ih3->code ? 1 : max_delay = ih3->code ? 1 :
IGMPV3_MRC(ih3->code) * (HZ / IGMP_TIMER_SCALE); IGMPV3_MRC(ih3->code) * (HZ / IGMP_TIMER_SCALE);
@ -876,7 +879,7 @@ static int br_multicast_query(struct net_bridge *br,
out: out:
spin_unlock(&br->multicast_lock); spin_unlock(&br->multicast_lock);
return 0; return err;
} }
static void br_multicast_leave_group(struct net_bridge *br, static void br_multicast_leave_group(struct net_bridge *br,