From patchwork Tue Jul 2 15:24:04 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Taehee Yoo X-Patchwork-Id: 1126310 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="uP9+GkbB"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 45dShF41pmz9sND for ; Wed, 3 Jul 2019 01:24:13 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727060AbfGBPYM (ORCPT ); Tue, 2 Jul 2019 11:24:12 -0400 Received: from mail-pg1-f194.google.com ([209.85.215.194]:35179 "EHLO mail-pg1-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725780AbfGBPYL (ORCPT ); Tue, 2 Jul 2019 11:24:11 -0400 Received: by mail-pg1-f194.google.com with SMTP id s27so7853195pgl.2 for ; Tue, 02 Jul 2019 08:24:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=H5YVno4WCiXQA9eWbK1LzW9cfzXvcKQqHrSxyIbLeis=; b=uP9+GkbBlZ/FeAN0XdLlB89EUUqPpQ5JfsU9U2xLGHnnBo4HJRly73sA/RWzKMFItO Wxpnk62o4W1nKWps/ww7LI+G32Je3hhTIZ+EmgTUh4dRnCnFcXpJq90XN3MKnFi46t8r dcxxiXIDSim794fObnad9P7H41erD5Tk+TKc6F3zpGLRdlAr5muFPwN//p4obVaDgoXc r5mHKsHL2DYXeuUjLYuTcI25wkSrrB+uJUnZ5ZtUMjB5eqlKYy8nxsiSEyehpvUQsTDA ixMLWULl8qyLgF9VxIYvCuXfkBDIFUMe6xNP9BKIkh/3JlMnNYGYtV4vW3+xMa8fchSQ r/rQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=H5YVno4WCiXQA9eWbK1LzW9cfzXvcKQqHrSxyIbLeis=; b=qaWtAATbBzCYtvIfu6++dl8/Yhs8y8rZoDSqMCCyMq/odKLen/pOApDcc7P9ZgsVvv WCZtx1/vrGUahfRbcwHm/LQkk+5NtFC5G2aAmxzZhogjrcT81kDLas2MB+0RgHM9/Y0R QPiSV3ksVIpeqUAujm52Fxfm5h5wPorG5A12jQ7S7gJjzwWZWJcL89p8fiD7jpKo2Wcf 3lqXbrVWbB3EVhOMk4v3OLq83ospMaSSXEk8XFioCsrtZZE6tbu4KdU9oeOJYDRFGBQ7 cY96XPm0dbWN+1dVMqzyZPubbJtW2tIIgJ0R9+QeiA4RSMpKp8AT5kuVH5G4FPVmYVLq QCGg== X-Gm-Message-State: APjAAAVByfK2drNblLH7JvGvxpwr9jmBDoQKGZO1SqzoiypzCrY6X7CI hAI42civMmkAMA8IR9tvxh8= X-Google-Smtp-Source: APXvYqyylfXXBNTXrVGLKG2VV7I1hXPpSWCUk5AeP8svx2I4AaA2XJTxuHzhC8yPUX+4GuFLCixNNg== X-Received: by 2002:a63:6986:: with SMTP id e128mr32602107pgc.220.1562081050733; Tue, 02 Jul 2019 08:24:10 -0700 (PDT) Received: from ap-To-be-filled-by-O-E-M.8.8.8.8 ([14.33.120.60]) by smtp.gmail.com with ESMTPSA id d2sm15133462pgo.0.2019.07.02.08.24.08 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Tue, 02 Jul 2019 08:24:10 -0700 (PDT) From: Taehee Yoo To: davem@davemloft.net, pablo@netfilter.org, laforge@gnumonks.org, osmocom-net-gprs@lists.osmocom.org, netdev@vger.kernel.org Cc: ap420073@gmail.com Subject: [PATCH net 6/6] gtp: add missing gtp_encap_disable_sock() in gtp_encap_enable() Date: Wed, 3 Jul 2019 00:24:04 +0900 Message-Id: <20190702152404.23210-1-ap420073@gmail.com> X-Mailer: git-send-email 2.17.1 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org If an invalid role is sent from user space, gtp_encap_enable() will fail. Then, it should call gtp_encap_disable_sock() but current code doesn't. It makes memory leak. Fixes: 91ed81f9abc7 ("gtp: support SGSN-side tunnels") Signed-off-by: Taehee Yoo --- drivers/net/gtp.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/drivers/net/gtp.c b/drivers/net/gtp.c index b3ccac54e204..ecfe26215935 100644 --- a/drivers/net/gtp.c +++ b/drivers/net/gtp.c @@ -857,8 +857,13 @@ static int gtp_encap_enable(struct gtp_dev *gtp, struct nlattr *data[]) if (data[IFLA_GTP_ROLE]) { role = nla_get_u32(data[IFLA_GTP_ROLE]); - if (role > GTP_ROLE_SGSN) + if (role > GTP_ROLE_SGSN) { + if (sk0) + gtp_encap_disable_sock(sk0); + if (sk1u) + gtp_encap_disable_sock(sk1u); return -EINVAL; + } } gtp->sk0 = sk0;