From patchwork Wed Dec 7 01:47:12 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Djalal Harouni X-Patchwork-Id: 129881 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id A43611007D2 for ; Wed, 7 Dec 2011 12:54:47 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754392Ab1LGBy1 (ORCPT ); Tue, 6 Dec 2011 20:54:27 -0500 Received: from numidia.opendz.org ([98.142.220.152]:45729 "EHLO numidia.opendz.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753496Ab1LGBy0 (ORCPT ); Tue, 6 Dec 2011 20:54:26 -0500 X-Greylist: delayed 609 seconds by postgrey-1.27 at vger.kernel.org; Tue, 06 Dec 2011 20:54:26 EST Received: from localhost (localhost [127.0.0.1]) by numidia.opendz.org (Postfix) with ESMTPSA id 9394D17B42AE; Wed, 7 Dec 2011 01:44:15 +0000 (UTC) Date: Wed, 7 Dec 2011 02:47:12 +0100 From: Djalal Harouni To: Dmitry Kozlov Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH] ppp: fix pptp double release_sock in pptp_bind() Message-ID: <20111207014712.GB25869@dztty> Mail-Followup-To: Dmitry Kozlov , netdev@vger.kernel.org, linux-kernel@vger.kernel.org MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.21 (2010-09-15) Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Signed-off-by: Djalal Harouni Acked-by: Eric Dumazet --- drivers/net/ppp/pptp.c | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-) diff --git a/drivers/net/ppp/pptp.c b/drivers/net/ppp/pptp.c index 89f829f..f8a6853 100644 --- a/drivers/net/ppp/pptp.c +++ b/drivers/net/ppp/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;