Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

2011-12-30 13:04:14 -05:00
parent 8ade06c616 89307babf9
commit 7f8e3234c5
51 changed files with 356 additions and 172 deletions
--- a/net/packet/af_packet.c
+++ b/net/packet/af_packet.c
@@ -2453,8 +2453,12 @@ static int packet_do_bind(struct sock *sk, struct net_device *dev, __be16 protoc
 {
 	struct packet_sock *po = pkt_sk(sk);

-	if (po->fanout)
+	if (po->fanout) {
+		if (dev)
+			dev_put(dev);
+
 		return -EINVAL;
+	}

 	lock_sock(sk);