From patchwork Wed Nov 8 18:00:37 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: 118326 Delivered-To: patch@linaro.org Received: by 10.140.22.164 with SMTP id 33csp5621799qgn; Wed, 8 Nov 2017 10:24:49 -0800 (PST) X-Google-Smtp-Source: ABhQp+RfE9x3yIVcU+DWFTmepNUSNgAG6DrfZwhN19Ga5zPpIRz1EgeU2lpnNOo0aDXeEnZjJ5au X-Received: by 10.200.43.193 with SMTP id n1mr2395855qtn.101.1510165489235; Wed, 08 Nov 2017 10:24:49 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1510165489; cv=none; d=google.com; s=arc-20160816; b=0mhz2RFVEHZ5YkCTSNMBpe4f5tzSmTKPNB8yEB8BCN5NIWwUE3ZtlhB2LC5qqbyUCy XhMyp9Q36k0p6f+Try0u2aKpO5mvklX3kfkpWBc51LlvzLJHlP6jC1YBVE1gVKzufUaG WAX3TcLT7IALcty11LwWuYnAJMNMGPrALu/rvFxgf+NmwbsQEbSa9I7iINpv8oNKs2gv B6Y/U4tUPjNK27zfFCdosxmkH5cJRD//68cKuG64YC2AVhzPfj4Q0VwDtE/vkrFg0HzH qD4WdUH0bf1dd/RarUSZluhgiJp9iyAJISK//AlG6FGgXIZ1L1TMvHlApo6N/dqgAFmX NXMw== 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=C1mdcGPD+8Zdlbf22p31BRJGC5aCwUn56fudRRW7HhQ=; b=P79C44HI+PIyS4OT0sJYmpuz3x0wcitb1YrjW2fhEFtUauVMCtjCcgx1QVu8fB/Ui6 TuxUBqmUtTVGoXir2frtNLO3dpAf2SSdBrZwaGW5dBursWpMasIAvsiYmpEGC3QpwSgn izY4jihOL/IH5mRVxonr8WZp96qHbZGcEiRrthwg6TbPCWzmKmF6L+k9bjNKYoYwudd5 fjp0TxEMCC0W9ixpXAn/3gEKYhCiCfhmgJU8UjMFI9t/H9tpHJzzverqk/0w2BqD3NqN NEKbB7uyBLcSMvIR0cxGRntQ2yddJwWACT1xQ+nOy11WeZehHpFg8nlaStuiLYC7Si/k JsPg== 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 l129si4221160qkd.367.2017.11.08.10.24.48; Wed, 08 Nov 2017 10:24:49 -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 CBB3360C2F; Wed, 8 Nov 2017 18:24:48 +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=-2.6 required=5.0 tests=BAYES_00,FREEMAIL_FROM, RCVD_IN_DNSWL_LOW,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 90B4F615AA; Wed, 8 Nov 2017 18:04:17 +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 5F7E661204; Wed, 8 Nov 2017 18:04:11 +0000 (UTC) Received: from forward102j.mail.yandex.net (forward102j.mail.yandex.net [5.45.198.243]) by lists.linaro.org (Postfix) with ESMTPS id 5DAF560CDF for ; Wed, 8 Nov 2017 18:00:47 +0000 (UTC) Received: from mxback8g.mail.yandex.net (mxback8g.mail.yandex.net [IPv6:2a02:6b8:0:1472:2741:0:8b7:169]) by forward102j.mail.yandex.net (Yandex) with ESMTP id AA9505602442 for ; Wed, 8 Nov 2017 21:00:45 +0300 (MSK) Received: from smtp4j.mail.yandex.net (smtp4j.mail.yandex.net [2a02:6b8:0:1619::15:6]) by mxback8g.mail.yandex.net (nwsmtp/Yandex) with ESMTP id FqulPr0Pbx-0jpW3tI9; Wed, 08 Nov 2017 21:00:45 +0300 Received: by smtp4j.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id TTdbkiNdyn-0j18Vraa; Wed, 08 Nov 2017 21:00:45 +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: Wed, 8 Nov 2017 21:00:37 +0300 Message-Id: <1510164037-14458-17-git-send-email-odpbot@yandex.ru> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1510164037-14458-1-git-send-email-odpbot@yandex.ru> References: <1510164037-14458-1-git-send-email-odpbot@yandex.ru> Github-pr-num: 243 Subject: [lng-odp] [PATCH API-NEXT v7 16/16] 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 243 (lumag:ipsec-packet-impl-3) ** https://github.com/Linaro/odp/pull/243 ** Patch: https://github.com/Linaro/odp/pull/243.patch ** Base sha: d22c949cc466bf28de559855a1cb525740578137 ** Merge commit sha: b87a669d1d701c336b19a9dd4f07b920a87132ed **/ 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 6a17a9172..ec2bd27e1 100644 --- a/platform/linux-generic/odp_ipsec_sad.c +++ b/platform/linux-generic/odp_ipsec_sad.c @@ -310,7 +310,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) { @@ -340,7 +340,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 &&