From patchwork Mon Nov 13 14:00:28 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: 118782 Delivered-To: patch@linaro.org Received: by 10.140.22.164 with SMTP id 33csp1857216qgn; Mon, 13 Nov 2017 06:25:57 -0800 (PST) X-Google-Smtp-Source: AGs4zMbQls2JV73vpjGa1VmceB6v5G9k3h/+snCVRQj1TcMClVZHf6416xgTC62mmSTCL0B4Ougp X-Received: by 10.200.54.176 with SMTP id a45mr4722993qtc.176.1510583157154; Mon, 13 Nov 2017 06:25:57 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1510583157; cv=none; d=google.com; s=arc-20160816; b=0nLIgYY+fHpBvmiXhhtLiD+Gk/FY75V3sHT6FxGvmryvdiDLpVsCGtKbu+1GNpD1jR opted1mLizxLYwSEONKnJaO36DtP+QRknYu7kctVz3E9d2i6C20A0IE4TezphQEKesDf Fqp0oGhUEMPL4Fo+SjGfo9QErjhFpQolTTdP8a+4uxUIuEGoncEjaZxMIM3jfQ3IsFT1 +uJm0TLNzOTZWQm+2FJwKj0MLJFxxnnxuZwn8f8CXceLK/jBTrnuuiDZ9X3dTw1vs4/B HpIFYwDdWRgAG7S6nlPsFs/NsEDhF6Sal1tPv8UJktrTZ5fzd62w6ghKbn8EdvtVEy/f I4eg== 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=8bDAz050R9IF59FbGy/A9D0tqMi6qUcqnxLjZ0QeEDY=; b=R6eMu7r6vCVWWScPWfIk2omV/WSYhm6D89gkzLM8mNPzaUVkk5mUDcCbSP4cKW6ojp kk1d/eWVJYJTUrGAmQfbyAjeFd0jFflV0omqWTl9pDYzqHFDjS1VGlcqvP32g+qyC9X7 5AzOpvNUKZs0bQr8h5OlYQkjfYX1m2g+A8CvKOrSRiXTIDKCstwAm9Qm71f98rVLsPvs eZCrq/0kGIbPKrgBBKxjfBIR8AGSRHp2omBtoMiurDLzjwC8t0JvuCU3ArefqmOjlcA/ 2GSfb2BwI4a3pqScpJLGezr3H0CI1BUNCXitvTsSUX6ECZsVzU17I/fpocw/RKZ5+HOZ eV+Q== 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 x15si1166656qtc.234.2017.11.13.06.25.56; Mon, 13 Nov 2017 06:25:57 -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 C30EF6104B; Mon, 13 Nov 2017 14:25:56 +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 7A6B86164D; Mon, 13 Nov 2017 14:03:50 +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 37AEA6101A; Mon, 13 Nov 2017 14:03:36 +0000 (UTC) Received: from forward101p.mail.yandex.net (forward101p.mail.yandex.net [77.88.28.101]) by lists.linaro.org (Postfix) with ESMTPS id 470EB61010 for ; Mon, 13 Nov 2017 14:00:45 +0000 (UTC) Received: from mxback13j.mail.yandex.net (mxback13j.mail.yandex.net [IPv6:2a02:6b8:0:1619::88]) by forward101p.mail.yandex.net (Yandex) with ESMTP id 220FB6A82022 for ; Mon, 13 Nov 2017 17:00:44 +0300 (MSK) Received: from smtp2p.mail.yandex.net (smtp2p.mail.yandex.net [2a02:6b8:0:1472:2741:0:8b6:7]) by mxback13j.mail.yandex.net (nwsmtp/Yandex) with ESMTP id 4IlW9ZwpVJ-0ibenZQg; Mon, 13 Nov 2017 17:00:44 +0300 Received: by smtp2p.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id 955rfAmciQ-0hkqqwrh; Mon, 13 Nov 2017 17:00:43 +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 17:00:28 +0300 Message-Id: <1510581630-13993-15-git-send-email-odpbot@yandex.ru> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1510581630-13993-1-git-send-email-odpbot@yandex.ru> References: <1510581630-13993-1-git-send-email-odpbot@yandex.ru> Github-pr-num: 243 Subject: [lng-odp] [PATCH API-NEXT v16 14/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: a908a4dead95321e84d6a8a23de060051dcd8969 ** Merge commit sha: 845914564f2d99792452ac22a524279f44496a1d **/ 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 &&