summaryrefslogtreecommitdiff
path: root/drivers/net
diff options
context:
space:
mode:
authorDjalal Harouni <tixxdz@opendz.org>2011-12-06 15:47:12 +0000
committerRohan Somvanshi <rsomvanshi@nvidia.com>2012-01-11 10:21:42 -0800
commit565d99ef64bab4064f911e7898500ef34fc6a882 (patch)
tree1dfdb321f4a116353fb848c4ffa75da842072b9e /drivers/net
parent6967ee00117ab0ff1c2bc9c1d88d0781fd2bd1b8 (diff)
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> Change-Id: I9bf78b2e47083ebf3363c7017cbcda8bb9ceb30b Reviewed-on: http://git-master/r/74214 Reviewed-by: Varun Wadekar <vwadekar@nvidia.com> Tested-by: Varun Wadekar <vwadekar@nvidia.com>
Diffstat (limited to 'drivers/net')
-rw-r--r--drivers/net/pptp.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/net/pptp.c b/drivers/net/pptp.c
index 89f829f5f725..f8a6853b692e 100644
--- 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;