Skip to content

Commit

Permalink
bridge: ensure to unlock in error path in br_multicast_query().
Browse files Browse the repository at this point in the history
Signed-off-by: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
YOSHIFUJI Hideaki authored and David S. Miller committed Mar 13, 2010
1 parent c251c7f commit bec68ff
Showing 1 changed file with 7 additions and 4 deletions.
11 changes: 7 additions & 4 deletions net/bridge/br_multicast.c
Original file line number Diff line number Diff line change
Expand Up @@ -823,6 +823,7 @@ static int br_multicast_query(struct net_bridge *br,
unsigned long max_delay;
unsigned long now = jiffies;
__be32 group;
int err = 0;

spin_lock(&br->multicast_lock);
if (!netif_running(br->dev) ||
Expand All @@ -841,12 +842,14 @@ static int br_multicast_query(struct net_bridge *br,
group = 0;
}
} else {
if (!pskb_may_pull(skb, sizeof(struct igmpv3_query)))
return -EINVAL;
if (!pskb_may_pull(skb, sizeof(struct igmpv3_query))) {
err = -EINVAL;
goto out;
}

ih3 = igmpv3_query_hdr(skb);
if (ih3->nsrcs)
return 0;
goto out;

max_delay = ih3->code ? 1 :
IGMPV3_MRC(ih3->code) * (HZ / IGMP_TIMER_SCALE);
Expand Down Expand Up @@ -876,7 +879,7 @@ static int br_multicast_query(struct net_bridge *br,

out:
spin_unlock(&br->multicast_lock);
return 0;
return err;
}

static void br_multicast_leave_group(struct net_bridge *br,
Expand Down

0 comments on commit bec68ff

Please sign in to comment.