From: Djalal Harouni <tixxdz@opendz.org>
Date: Tue, 6 Dec 2011 15:47:12 +0000 (+0000)
Subject: ppp: fix pptp double release_sock in pptp_bind()
X-Git-Tag: v3.0.16~23
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=e2f377870311c6e2ecf77e1ed6bbcb175ce0dde9;p=users%2Fdwmw2%2Flinux.git

ppp: fix pptp double release_sock in pptp_bind()

[ Upstream commit a454daceb78844a09c08b6e2d8badcb76a5d73b9 ]

Signed-off-by: Djalal Harouni <tixxdz@opendz.org>
Acked-by: Eric Dumazet <eric.dumazet@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
---

diff --git a/drivers/net/pptp.c b/drivers/net/pptp.c
index 1286fe212dc45..4b3a68b69a674 100644
--- a/drivers/net/pptp.c
+++ b/drivers/net/pptp.c
@@ -418,10 +418,8 @@ static int pptp_bind(struct socket *sock, struct sockaddr *uservaddr,
 	lock_sock(sk);
 
 	opt->src_addr = sp->sa_addr.pptp;
-	if (add_chan(po)) {
-		release_sock(sk);
+	if (add_chan(po))
 		error = -EBUSY;
-	}
 
 	release_sock(sk);
 	return error;