From patchwork Sun Nov 12 12: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: 118637 Delivered-To: patch@linaro.org Received: by 10.140.22.164 with SMTP id 33csp674914qgn; Sun, 12 Nov 2017 04:01:56 -0800 (PST) X-Google-Smtp-Source: AGs4zMYkyfh0snrJ2XlIxxl+ShsUIH57lTiB0k1iTp299caeiIUWynX27YhAAoPKFiGIx9ngoxWJ X-Received: by 10.200.44.77 with SMTP id e13mr9702778qta.238.1510488116220; Sun, 12 Nov 2017 04:01:56 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1510488116; cv=none; d=google.com; s=arc-20160816; b=Qw8qOTS8GSoGLiASobOCf/HEwftLkpPDYPC1wzAEuyiMpAAJs5+o3WowSM3FTfnClO dLwmXOoDqVK2ZXi1ku+YU/jY5/jLDY+SWmiQo8yTfkp8qPcS7mqVHjeUZQKF/aDLiwYT PuXcDCwQMZebkYizPENbvHukFCPm1k+mvj2EvwshE9cfnjnaWEtNdP/fHOGVaDnhlU50 lLdm/qEBKe2eQUQZO/CbCPP5sdQNgSv10VEW2ODFyF61PZvOarXAf0G5f7VAjGGgMbIv R1HnnbMMMU2AR+lYnUVudIAv5sG/IBJn2YnHRlU7Fw5FcTcTNOngw7adlEPKn9JPzw8N QDTw== 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=xYpiognmQjPriYHuDr7FbqVjpBhV1+V8Ad6pPVx0UEU=; b=IzfNwJ8y/kEMpOJ0iHhMc8Jaq1vTz6NrgFMjbV9hHX+LXD3nbZW+DuPsc7/hnLmAXj bKMqW5pR7RcJ9O/MHzo+US5qUheQb4Hy5U9mC82QVesP4G6RhVwzVcKVlfq8BpevDbLX gBDxqWeiEpp0OGmldNZzVd2AcO8rR/HKtF+K1d2/QbJPzLPFl/PVXQQognGkbFDuC9uT A1NfhXneQU46zaoIJ15gQI2K9HTnr0FwxI3TMEwAlj/J63Rj5GSHMJLeyhgXFSnLyZc1 y14xm55RbWvZ6d2x/TCD01I6zrrkd2TAVHyeR/3Aq6ke1FCSSi+VZqLGxTIqh69N8XAH s+jg== 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 h30si4861815qtc.231.2017.11.12.04.01.55; Sun, 12 Nov 2017 04:01:56 -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 DBEFC60AC1; Sun, 12 Nov 2017 12:01:55 +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 7867E607E1; Sun, 12 Nov 2017 12:01:00 +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 C3C5F609C4; Sun, 12 Nov 2017 12:00:50 +0000 (UTC) Received: from forward105p.mail.yandex.net (forward105p.mail.yandex.net [77.88.28.108]) by lists.linaro.org (Postfix) with ESMTPS id 4387360A03 for ; Sun, 12 Nov 2017 12:00:11 +0000 (UTC) Received: from mxback14g.mail.yandex.net (mxback14g.mail.yandex.net [IPv6:2a02:6b8:0:1472:2741:0:8b7:93]) by forward105p.mail.yandex.net (Yandex) with ESMTP id ED348408831D for ; Sun, 12 Nov 2017 15:00:09 +0300 (MSK) Received: from smtp1j.mail.yandex.net (smtp1j.mail.yandex.net [2a02:6b8:0:801::ab]) by mxback14g.mail.yandex.net (nwsmtp/Yandex) with ESMTP id jAhXnWuY2S-09BSGh75; Sun, 12 Nov 2017 15:00:09 +0300 Received: by smtp1j.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id r6E8l2cXPM-09W4SxNA; Sun, 12 Nov 2017 15:00:09 +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: Sun, 12 Nov 2017 15:00:01 +0300 Message-Id: <1510488007-21101-3-git-send-email-odpbot@yandex.ru> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1510488007-21101-1-git-send-email-odpbot@yandex.ru> References: <1510488007-21101-1-git-send-email-odpbot@yandex.ru> Github-pr-num: 288 Subject: [lng-odp] [PATCH API-NEXT v4 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: a908a4dead95321e84d6a8a23de060051dcd8969 ** Merge commit sha: 9fff58cf77d87306efed89f77e84f957850623d5 **/ 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 dc338bfcd..b2d12eada 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) { @@ -325,7 +325,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 &&