projects
/
unionfs-2.6.39.y.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
b8b7320
)
ppp: fix pptp double release_sock in pptp_bind()
author
Djalal Harouni
<tixxdz@opendz.org>
Tue, 6 Dec 2011 15:47:12 +0000
(15:47 +0000)
committer
Greg Kroah-Hartman
<gregkh@suse.de>
Fri, 6 Jan 2012 22:17:26 +0000
(14:17 -0800)
[ 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>
drivers/net/pptp.c
patch
|
blob
|
history
diff --git
a/drivers/net/pptp.c
b/drivers/net/pptp.c
index 89f829f5f7257fcacd54902d3963520ab5b47525..f8a6853b692ed3edf29e996739d70261988bc80b 100644
(file)
--- a/
drivers/net/pptp.c
+++ b/
drivers/net/pptp.c
@@
-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;