Skip to contentSkip to conversation

ppp: fix pptp double release_sock in pptp_bind()

PATCH Applied Djalal Harouni 3 participants 3 messages Dec 7, 2011

Subsystems (2)
Networking Network drivers
lore
Share & tools
lore

Djalal Harouni

author
#0 lore raw

PATCH 1/1 ppp: fix pptp double release_sock in pptp_bind()

Signed-off-by Djalal Harouni <[email protected]>
---
 drivers/net/ppp/pptp.c |    4 +---
 1 files changed, 1 insertions(+), 3 deletions(-)
drivers/net/ppp/pptp.c +1 -3
index 89f829f..f8a6853 100644
@@ -423,10 +423,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;
Signature · 1 line
1.7.1
Acked-by on v1 1/1
#1 lore raw
Quoted 11 lines · Djalal Harouni
Signed-off-by Djalal Harouni <[email protected]>
---
 drivers/net/ppp/pptp.c |    4 +---
 1 files changed, 1 insertions(+), 3 deletions(-)
drivers/net/ppp/pptp.c +0 -0
index 89f829f..f8a6853 100644
@@ -423,10 +423,8 @@ static int pptp_bind(struct socket *sock, struct sockaddr *uservaddr,
 	lock_sock(sk);

drivers/net/ppp/pptp.c static int pptp_bind(struct socket *sock, struct sockaddr *uservaddr, · line 430

Quoted 10 lines
drivers/net/ppp/pptp.c +1 -3
 
 	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;

Nice catch !

Acked-by Eric Dumazet <[email protected]>