Skip to content

Commit

Permalink
packet: missing dev_put() in packet_do_bind()
Browse files Browse the repository at this point in the history
When binding a PF_PACKET socket, the use count of the bound interface is
always increased with dev_hold in dev_get_by_{index,name}.  However,
when rebound with the same protocol and device as in the previous bind
the use count of the interface was not decreased.  Ultimately, this
caused the deletion of the interface to fail with the following message:

unregister_netdevice: waiting for dummy0 to become free. Usage count = 1

This patch moves the dev_put out of the conditional part that was only
executed when either the protocol or device changed on a bind.

Fixes: 902fefb ('packet: improve socket create/bind latency in some cases')
Signed-off-by: Lars Westerhoff <lars.westerhoff@newtec.eu>
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Reviewed-by: Daniel Borkmann <dborkman@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
Lars Westerhoff authored and David S. Miller committed Jul 27, 2015
1 parent c5c62f1 commit 158cd4a
Showing 1 changed file with 3 additions and 5 deletions.
8 changes: 3 additions & 5 deletions net/packet/af_packet.c
Original file line number Diff line number Diff line change
Expand Up @@ -2784,7 +2784,7 @@ static int packet_release(struct socket *sock)
static int packet_do_bind(struct sock *sk, struct net_device *dev, __be16 proto)
{
struct packet_sock *po = pkt_sk(sk);
const struct net_device *dev_curr;
struct net_device *dev_curr;
__be16 proto_curr;
bool need_rehook;

Expand All @@ -2808,15 +2808,13 @@ static int packet_do_bind(struct sock *sk, struct net_device *dev, __be16 proto)

po->num = proto;
po->prot_hook.type = proto;

if (po->prot_hook.dev)
dev_put(po->prot_hook.dev);

po->prot_hook.dev = dev;

po->ifindex = dev ? dev->ifindex : 0;
packet_cached_dev_assign(po, dev);
}
if (dev_curr)
dev_put(dev_curr);

if (proto == 0 || !need_rehook)
goto out_unlock;
Expand Down

0 comments on commit 158cd4a

Please sign in to comment.