From patchwork Mon Nov 13 02:00:17 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: 118705 Delivered-To: patch@linaro.org Received: by 10.140.22.164 with SMTP id 33csp1271352qgn; Sun, 12 Nov 2017 18:09:37 -0800 (PST) X-Google-Smtp-Source: AGs4zMa4DcjJNhubIAtCmWgsglbVjaV2njin/VH3iD1xzLCHlmSeUfSyF6GfwEcn/jweHRbSPXWP X-Received: by 10.200.43.26 with SMTP id 26mr12875716qtu.51.1510538977279; Sun, 12 Nov 2017 18:09:37 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1510538977; cv=none; d=google.com; s=arc-20160816; b=ZWDjkU0v/Sc6dxqVMVYGu0p3VJ2/6bFiJZ56/EbZxGNQnRH3OM+iKrkD856ILkoiDe GwGgkjqE6TZk6pjRvLyWSKA7zKmWZz4pV07KOTiTDQ+/VJEA5zN/LbK2G7ytg/bo0DWg lbowvkcRMXNXkaQZpE7y53QnyDFomf0aYvQwg34MX0KsnbWwwHIROdIS0CYiW3d3/RSO LIVv7nwfl30zj1JExOwGKAJGPQo6Dktsq1B9YKF/bBuH8tMdpiFMTKncJ4MxWW7JcfkN V2pad6f6ixveVteXr/+4IJzszvJE9CA5k31duYQKwPrDpvmmkSenFeLBupAKXdJypcpt vVvw== 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=VPrR4MH4PbUCh8DBTMk3wnpSSlGeYEvdeW7lN5Nt/Bw=; b=zNDxgrT4NuqkCXeiwuU9jQ6WpwG73kQLlIx3Mw08fWhUhEL/UXScPMNEqeRYAUaWUK ipICqyIMlVVKOuDI+WTm3hlhPnJ0rj3Kwbz4xAXGSnixYz4ZqIcRfcIe/lvc8037Qi+B bTRLxy4ZFxOV6abJ4G5Dk4uhmgqnobfpGMPH8QN6brSYVG8HgXxOvFX1z2+DQ7d5boP5 Yy3ep4M6Tny1o1WLESvI8UV8P35R8V9s/ASlpRqz5yLCdXmb+OvzVMI9m1LXAozatjDR LveNKfegY+m+AKpCd2HirJFnT+1YSBq93Z+ZTj/zAEznyyjUFQGRC08ttpERCautfF/3 1PIg== 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 e64si2466611qkc.73.2017.11.12.18.09.37; Sun, 12 Nov 2017 18:09:37 -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 F0E8760D37; Mon, 13 Nov 2017 02:09: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=-2.6 required=5.0 tests=BAYES_00,FREEMAIL_FROM, RCVD_IN_DNSWL_LOW,RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,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 536B660FFA; Mon, 13 Nov 2017 02:02:39 +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 915A060C2F; Mon, 13 Nov 2017 02:02:24 +0000 (UTC) Received: from forward105j.mail.yandex.net (forward105j.mail.yandex.net [5.45.198.248]) by lists.linaro.org (Postfix) with ESMTPS id 5942960C19 for ; Mon, 13 Nov 2017 02:00:28 +0000 (UTC) Received: from mxback19j.mail.yandex.net (mxback19j.mail.yandex.net [IPv6:2a02:6b8:0:1619::95]) by forward105j.mail.yandex.net (Yandex) with ESMTP id 50DCA18E4EF for ; Mon, 13 Nov 2017 05:00:27 +0300 (MSK) Received: from smtp3o.mail.yandex.net (smtp3o.mail.yandex.net [2a02:6b8:0:1a2d::27]) by mxback19j.mail.yandex.net (nwsmtp/Yandex) with ESMTP id 7ESuoCr9k5-0RZCEduS; Mon, 13 Nov 2017 05:00:27 +0300 Received: by smtp3o.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id uZeq9OjDfk-0Qvu2CP6; Mon, 13 Nov 2017 05:00:26 +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: Mon, 13 Nov 2017 05:00:17 +0300 Message-Id: <1510538419-566-13-git-send-email-odpbot@yandex.ru> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1510538419-566-1-git-send-email-odpbot@yandex.ru> References: <1510538419-566-1-git-send-email-odpbot@yandex.ru> Github-pr-num: 243 Subject: [lng-odp] [PATCH API-NEXT v15 12/14] 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: a908a4dead95321e84d6a8a23de060051dcd8969 ** Merge commit sha: 44a6636daa5f976c8aac76116e80e0c764352072 **/ 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 c30119249..425175692 100644 --- a/platform/linux-generic/odp_ipsec_sad.c +++ b/platform/linux-generic/odp_ipsec_sad.c @@ -296,7 +296,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) { @@ -329,7 +329,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 &&