From patchwork Mon Nov 16 15:06:48 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Schultz X-Patchwork-Id: 545063 X-Patchwork-Delegate: pablo@netfilter.org Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.osmocom.org (tmp.osmocom.org [144.76.43.76]) by ozlabs.org (Postfix) with ESMTP id AAE3B14144D for ; Tue, 17 Nov 2015 02:07:33 +1100 (AEDT) Received: from lists.osmocom.org (lists.osmocom.org [144.76.43.76]) by lists.osmocom.org (Postfix) with ESMTP id 86D319D37; Mon, 16 Nov 2015 15:07:32 +0000 (UTC) X-Original-To: openbsc@lists.osmocom.org Delivered-To: openbsc@lists.osmocom.org Received: from mail.tpip.net (mail.tpip.net [92.43.49.48]) by lists.osmocom.org (Postfix) with ESMTP id C42AC9CE9 for ; Mon, 16 Nov 2015 15:07:28 +0000 (UTC) Received: from office.tpip.net (office.tpip.net [92.43.51.2]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by mail.tpip.net (Postfix) with ESMTPS id 1B4B94F41E; Mon, 16 Nov 2015 15:07:06 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by office.tpip.net (Postfix) with ESMTP id 583A6A2CA9; Mon, 16 Nov 2015 16:07:07 +0100 (CET) Received: from office.tpip.net ([127.0.0.1]) by localhost (office.tpip.net [127.0.0.1]) (amavisd-new, port 10032) with ESMTP id t49TUxYPuo4Z; Mon, 16 Nov 2015 16:07:07 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by office.tpip.net (Postfix) with ESMTP id 19B02A2CAA; Mon, 16 Nov 2015 16:07:07 +0100 (CET) X-Virus-Scanned: amavisd-new at tpip.net Received: from office.tpip.net ([127.0.0.1]) by localhost (office.tpip.net [127.0.0.1]) (amavisd-new, port 10026) with ESMTP id mabBaWeTmsi9; Mon, 16 Nov 2015 16:07:07 +0100 (CET) Received: from alice.tpip.org (unknown [192.168.13.53]) by office.tpip.net (Postfix) with ESMTPSA id AFA6EA2CAB; Mon, 16 Nov 2015 16:07:06 +0100 (CET) From: Andreas Schultz To: openbsc@lists.osmocom.org Subject: [PATCH 07/16] gtp: fix the order of error cases in gtp_encap_enable Date: Mon, 16 Nov 2015 16:06:48 +0100 Message-Id: <1447686417-3979-8-git-send-email-aschultz@tpip.net> X-Mailer: git-send-email 2.5.0 In-Reply-To: <1447686417-3979-1-git-send-email-aschultz@tpip.net> References: <1447686417-3979-1-git-send-email-aschultz@tpip.net> X-BeenThere: openbsc@lists.osmocom.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: Development of the OpenBSC GSM base station controller List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Pablo Neira Ayuso Errors-To: openbsc-bounces@lists.osmocom.org Sender: "OpenBSC" The ordering of the error case exit was wrong and would attempt to release the wrong socket. Signed-off-by: Andreas Schultz --- gtp.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gtp.c b/gtp.c index 4f5729e..61add82 100644 --- a/gtp.c +++ b/gtp.c @@ -967,10 +967,10 @@ static int gtp_encap_enable(struct net_device *dev, struct gtp_instance *gti, sk->sk_user_data = gti; return 0; -err1: - sockfd_put(sock0); err2: sockfd_put(sock1u); +err1: + sockfd_put(sock0); return err; }