lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

af_packet: lock imbalance

Browse Source 
fanout_add() might return with fanout_mutex held.

Reduce indentation level while we are at it

Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Eric Dumazet
2011-07-07 06:41:29 -07:00
committed by David S. Miller
parent 68ac31918e
commit afe62c68cd
1 changed files with 32 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
net/packet/af_packet.c
View File

@@ -589,11 +589,14 @@ static int fanout_add(struct sock *sk, u16 id, u16 type_flags)
break; break;
} }
} }
err = -EINVAL;
if (match && match->defrag != defrag) if (match && match->defrag != defrag)
return -EINVAL; goto out;
if (!match) { if (!match) {
err = -ENOMEM;
match = kzalloc(sizeof(*match), GFP_KERNEL); match = kzalloc(sizeof(*match), GFP_KERNEL);
if (match) { if (!match)
goto out;
write_pnet(&match->net, sock_net(sk)); write_pnet(&match->net, sock_net(sk));
match->id = id; match->id = id;
match->type = type; match->type = type;
@@ -609,9 +612,6 @@ static int fanout_add(struct sock *sk, u16 id, u16 type_flags)
dev_add_pack(&match->prot_hook); dev_add_pack(&match->prot_hook);
list_add(&match->list, &fanout_list); list_add(&match->list, &fanout_list);
} }
}
err = -ENOMEM;
if (match) {
err = -EINVAL; err = -EINVAL;
if (match->type == type && if (match->type == type &&
match->prot_hook.type == po->prot_hook.type && match->prot_hook.type == po->prot_hook.type &&
@@ -625,7 +625,7 @@ static int fanout_add(struct sock *sk, u16 id, u16 type_flags)
err = 0; err = 0;
} }
} }
} out:
mutex_unlock(&fanout_mutex); mutex_unlock(&fanout_mutex);
return err; return err;
} }