diff options
Diffstat (limited to 'net')
-rw-r--r-- | net/packet/af_packet.c | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/net/packet/af_packet.c b/net/packet/af_packet.c index 7effa07c4491..9f1820e3c8b1 100644 --- a/net/packet/af_packet.c +++ b/net/packet/af_packet.c @@ -1429,9 +1429,6 @@ static int fanout_add(struct sock *sk, u16 id, u16 type_flags) return -EINVAL; } - if (!po->running) - return -EINVAL; - if (po->fanout) return -EALREADY; @@ -1469,7 +1466,10 @@ static int fanout_add(struct sock *sk, u16 id, u16 type_flags) list_add(&match->list, &fanout_list); } err = -EINVAL; - if (match->type == type && + + spin_lock(&po->bind_lock); + if (po->running && + match->type == type && match->prot_hook.type == po->prot_hook.type && match->prot_hook.dev == po->prot_hook.dev) { err = -ENOSPC; @@ -1481,6 +1481,13 @@ static int fanout_add(struct sock *sk, u16 id, u16 type_flags) err = 0; } } + spin_unlock(&po->bind_lock); + + if (err && !atomic_read(&match->sk_ref)) { + list_del(&match->list); + kfree(match); + } + out: mutex_unlock(&fanout_mutex); return err; |