[PATCH 3.16.y-ckt 035/130] packet: missing dev_put() in packet_do_bind()

From: Luis Henriques
Date: Fri Sep 04 2015 - 09:09:40 EST

3.16.7-ckt17 -stable review patch. If anyone has any objections, please let me know.


From: Lars Westerhoff <lars.westerhoff@xxxxxxxxx>

commit 158cd4af8dedbda0d612d448c724c715d0dda649 upstream.

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: 902fefb82ef7 ('packet: improve socket create/bind latency in some cases')
Signed-off-by: Lars Westerhoff <lars.westerhoff@xxxxxxxxx>
Signed-off-by: Dan Carpenter <dan.carpenter@xxxxxxxxxx>
Reviewed-by: Daniel Borkmann <dborkman@xxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
Signed-off-by: Luis Henriques <luis.henriques@xxxxxxxxxxxxx>
net/packet/af_packet.c | 8 +++-----
1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/net/packet/af_packet.c b/net/packet/af_packet.c
index fb0c09f85ff2..7dc6a05f09c8 100644
--- a/net/packet/af_packet.c
+++ b/net/packet/af_packet.c
@@ -2655,7 +2655,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;

@@ -2679,15 +2679,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;
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/