From patchwork Thu Nov 9 02:00:01 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Github ODP bot X-Patchwork-Id: 118364 Delivered-To: patch@linaro.org Received: by 10.140.22.164 with SMTP id 33csp6014461qgn; Wed, 8 Nov 2017 18:01:37 -0800 (PST) X-Google-Smtp-Source: ABhQp+Swnc3Ii/WZ0sfEug7z5wLu+7l0DUTiWmg1KiEtUsSsT0eaG8jKewYS+ZB3DIphtdrJ6JCf X-Received: by 10.55.156.17 with SMTP id f17mr4015025qke.217.1510192896899; Wed, 08 Nov 2017 18:01:36 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1510192896; cv=none; d=google.com; s=arc-20160816; b=ytEm/ykctrGo3Kw4H2mjgMesgJaBaYVSh3zpVOQbw1c+6eoaAsFhcolyWn9eu+tPrm nrJYPAwEAoRL8LeGIACIHCf4jjHOQrAK1h/D9nMFQ/u5OnvGtyAz2+x+5iBpWlTkQuWx e0msfKBEJ7W2n6KiWJOAv6stqBqePeB6dVX8HrF1Pn2jE/j9C4QyVsFkRKZR7U+5/zQ8 b57BXxKvroJ/CWzOPn8PWq16d+k06KNwn8dwSPkka6N4UZOJlb+JJtz/rFNpEGikBphe 0hNRYlVKueoWnABETSWwE0FbiKGZPINnQ0Z3GsW60FBboX7j7qJXI48bG6OaJNQbNKC1 39nA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject:github-pr-num :references:in-reply-to:message-id:date:to:from:delivered-to :arc-authentication-results; bh=CXydMsaETdVu1UkdrHr3/nUexXLPXAcBnv8wtnZtP6k=; b=jYpuJHqhvPvkqeMw7qgki+AV5uoTBR9nlCjNNUHVu2e6R8xrB58sh4b0vj4/SIvTYy sqP/up5piE2Ea0+H5GVpcMyGE4ViKcQoqLNC/BTZcK1o2JxczPAAebzkYgBmuaP1mOPV oeEVofcThdwogxZAkTeXxIWZMf+LMhTc9mVSkaBY9ZLmojvRlUeRYIEM5k/SaBFjj9Il /JxXjWjAbV3FKVLO6Hi27kxeeR6eQqVihT78UjLbmWjvv65KyBl4aUA/bjX9c3PTKKtn jazyHFIaEjhtC2+Ze4pFxBMGRKLDECXXHfOSKa8WqSHtxwlfppd/qItXKdSFzsM7G3sb sR/A== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.197.127.237 as permitted sender) smtp.mailfrom=lng-odp-bounces@lists.linaro.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=yandex.ru Return-Path: Received: from lists.linaro.org (ec2-54-197-127-237.compute-1.amazonaws.com. [54.197.127.237]) by mx.google.com with ESMTP id y17si5325973qtk.145.2017.11.08.18.01.36; Wed, 08 Nov 2017 18:01:36 -0800 (PST) Received-SPF: pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.197.127.237 as permitted sender) client-ip=54.197.127.237; Authentication-Results: mx.google.com; spf=pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.197.127.237 as permitted sender) smtp.mailfrom=lng-odp-bounces@lists.linaro.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=yandex.ru Received: by lists.linaro.org (Postfix, from userid 109) id 917EE60631; Thu, 9 Nov 2017 02:01:36 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on ip-10-142-244-252 X-Spam-Level: X-Spam-Status: No, score=-5.4 required=5.0 tests=BAYES_00,FREEMAIL_FROM, RCVD_IN_DNSWL_LOW, RCVD_IN_MSPIKE_H2, URIBL_BLOCKED autolearn=disabled version=3.4.0 Received: from [127.0.0.1] (localhost [127.0.0.1]) by lists.linaro.org (Postfix) with ESMTP id 9862260634; Thu, 9 Nov 2017 02:00:23 +0000 (UTC) X-Original-To: lng-odp@lists.linaro.org Delivered-To: lng-odp@lists.linaro.org Received: by lists.linaro.org (Postfix, from userid 109) id BB6B960631; Thu, 9 Nov 2017 02:00:13 +0000 (UTC) Received: from forward104p.mail.yandex.net (forward104p.mail.yandex.net [77.88.28.107]) by lists.linaro.org (Postfix) with ESMTPS id 0544E60890 for ; Thu, 9 Nov 2017 02:00:11 +0000 (UTC) Received: from mxback5j.mail.yandex.net (mxback5j.mail.yandex.net [IPv6:2a02:6b8:0:1619::10e]) by forward104p.mail.yandex.net (Yandex) with ESMTP id 58C21183E8C for ; Thu, 9 Nov 2017 05:00:09 +0300 (MSK) Received: from smtp4j.mail.yandex.net (smtp4j.mail.yandex.net [2a02:6b8:0:1619::15:6]) by mxback5j.mail.yandex.net (nwsmtp/Yandex) with ESMTP id Q994oupUNX-09m83sYP; Thu, 09 Nov 2017 05:00:09 +0300 Received: by smtp4j.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id ftGesT1mbP-08Eqs9YC; Thu, 09 Nov 2017 05:00:08 +0300 (using TLSv1.2 with cipher ECDHE-RSA-AES128-SHA256 (128/128 bits)) (Client certificate not present) From: Github ODP bot To: lng-odp@lists.linaro.org Date: Thu, 9 Nov 2017 05:00:01 +0300 Message-Id: <1510192807-13538-3-git-send-email-odpbot@yandex.ru> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1510192807-13538-1-git-send-email-odpbot@yandex.ru> References: <1510192807-13538-1-git-send-email-odpbot@yandex.ru> Github-pr-num: 288 Subject: [lng-odp] [PATCH API-NEXT v2 2/8] linux-gen: ipsec: don't leak SA on creation error X-BeenThere: lng-odp@lists.linaro.org X-Mailman-Version: 2.1.16 Precedence: list List-Id: "The OpenDataPlane \(ODP\) List" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: lng-odp-bounces@lists.linaro.org Sender: "lng-odp" From: Dmitry Eremin-Solenikov Some paths during odp_ipsec_sa_create() can lead to SA leakage. Fix them by always releasing SA in error case. Signed-off-by: Dmitry Eremin-Solenikov --- /** Email created from pull request 288 (lumag:gmac) ** https://github.com/Linaro/odp/pull/288 ** Patch: https://github.com/Linaro/odp/pull/288.patch ** Base sha: d22c949cc466bf28de559855a1cb525740578137 ** Merge commit sha: d0ac0597cf696e17a40a8eba131ad379ba0fa08f **/ platform/linux-generic/odp_ipsec_sad.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/platform/linux-generic/odp_ipsec_sad.c b/platform/linux-generic/odp_ipsec_sad.c index 5d20bb66c..457b81d04 100644 --- a/platform/linux-generic/odp_ipsec_sad.c +++ b/platform/linux-generic/odp_ipsec_sad.c @@ -292,7 +292,7 @@ odp_ipsec_sa_t odp_ipsec_sa_create(const odp_ipsec_sa_param_t *param) ipsec_sa->icv_len = 16; break; default: - return ODP_IPSEC_SA_INVALID; + goto error; } switch (crypto_param.cipher_alg) { @@ -322,7 +322,7 @@ odp_ipsec_sa_t odp_ipsec_sa_create(const odp_ipsec_sa_param_t *param) crypto_param.iv.length = 12; break; default: - return ODP_IPSEC_SA_INVALID; + goto error; } if (1 == ipsec_sa->use_counter_iv &&