From patchwork Wed Jan 24 16:00:07 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Github ODP bot X-Patchwork-Id: 125681 Delivered-To: patch@linaro.org Received: by 10.46.66.141 with SMTP id h13csp506388ljf; Wed, 24 Jan 2018 08:02:41 -0800 (PST) X-Google-Smtp-Source: AH8x226GdP9IP4rElC6ugHXA/9ACCkBEt2P5H5W28nLvhWzki0NRit38gGZjJbGeWGfMqTIOq3S5 X-Received: by 10.55.54.210 with SMTP id d201mr10047956qka.213.1516809761080; Wed, 24 Jan 2018 08:02:41 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1516809761; cv=none; d=google.com; s=arc-20160816; b=JPaMpEsGHQt9iZLMVKD+ARRGCsyPCIqbpICUfqIOzC6DC4mdptF9gC+HNJM0PQ7WOd /w0eU9HR90kdpVBy2TrWyL756SpHG0BeNy6syFvh1oQon+biHs3gEBrowhiOYpXBE3O1 okSAyfKx5laaXOn/Z7D5LswfpPkQw0gdBO99JKO50iZhBoeWV9KvhggiKUvmbAPe3S9j Og2G2ewVaHWNJ5UCe7sXXBeQTZLWkzQpqGMT6fhBm+Ob+yD9Ac7o+PHfnWRCXZZzC+HL vG3JYDaKr/rt/3U4kOgC0VlJq5KlCAOkIjrdww2daZ0Jar73qQLRFRFst4Ma8cdSZJZJ bH5A== 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=idPS6DWAqOSFZfIB17pX7uwJJwSrqso8L3KWGj1XJb8=; b=pXEavKPxNLlOOmxfW57R+/e4DubxUbCAjskfRkowAh6yEsZpi17wf0dcr9s6z+2QOd UPR8BGor0AC5f2pLI3e5HWlZUVZvzQ8cu3NRxrsanKaGdCLtdlGiOKGGpR3cJdYTePpi N8pKcIHnWGV2SRREbH4VUkghJwvEkO0YZndxjTbQ6px+IoKK5KhX3LdNc11pKu583rqq vmE5B8scbxkmysuK91BkpuxBBBb9xtZOYRd+PtlpJNrXtFFmRU6pGLwT/gD+iVdHD75s XVdJQFCneZtlPZwSsb2c6oMoOKbhRhtmUvKK6TFDT5Z+/0jCr7Hn4yCVNQxpR0CAKPVN uG/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 92si522910qky.383.2018.01.24.08.02.40; Wed, 24 Jan 2018 08:02:41 -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 B968F617DA; Wed, 24 Jan 2018 16:02:40 +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_H2 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 2BD54617A3; Wed, 24 Jan 2018 16:00:37 +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 2EBF96156D; Wed, 24 Jan 2018 16:00:21 +0000 (UTC) Received: from forward100p.mail.yandex.net (forward100p.mail.yandex.net [77.88.28.100]) by lists.linaro.org (Postfix) with ESMTPS id 75088608E6 for ; Wed, 24 Jan 2018 16:00:13 +0000 (UTC) Received: from mxback11g.mail.yandex.net (mxback11g.mail.yandex.net [IPv6:2a02:6b8:0:1472:2741:0:8b7:90]) by forward100p.mail.yandex.net (Yandex) with ESMTP id 94B845104E01 for ; Wed, 24 Jan 2018 19:00:11 +0300 (MSK) Received: from smtp1j.mail.yandex.net (smtp1j.mail.yandex.net [2a02:6b8:0:801::ab]) by mxback11g.mail.yandex.net (nwsmtp/Yandex) with ESMTP id r2HFcKaipx-0BZ4ZwaH; Wed, 24 Jan 2018 19:00:11 +0300 Received: by smtp1j.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id Q8SBLojAvI-0BsKTMhr; Wed, 24 Jan 2018 19:00:11 +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, 24 Jan 2018 19:00:07 +0300 Message-Id: <1516809608-18061-4-git-send-email-odpbot@yandex.ru> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1516809608-18061-1-git-send-email-odpbot@yandex.ru> References: <1516809608-18061-1-git-send-email-odpbot@yandex.ru> Github-pr-num: 427 Subject: [lng-odp] [PATCH v1 3/4] linux-gen: ipsec: fix SA leak in lookup case 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 SA lookup can leave SAs locked if multiple SAs matched the LOOKUP_SPI case. Follow that case if we have no 'best' option. Fixes: https://bugs.linaro.org/show_bug.cgi?id=3595 Signed-off-by: Dmitry Eremin-Solenikov --- /** Email created from pull request 427 (lumag:ipsec-fix-sad) ** https://github.com/Linaro/odp/pull/427 ** Patch: https://github.com/Linaro/odp/pull/427.patch ** Base sha: 27480d82bd93a881ae683a3c314c11042a68ce29 ** Merge commit sha: 83482dc460d8a076de317029373e2c8bf3178974 **/ platform/linux-generic/odp_ipsec_sad.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/platform/linux-generic/odp_ipsec_sad.c b/platform/linux-generic/odp_ipsec_sad.c index 162626de0..ad229e754 100644 --- a/platform/linux-generic/odp_ipsec_sad.c +++ b/platform/linux-generic/odp_ipsec_sad.c @@ -575,9 +575,10 @@ ipsec_sa_t *_odp_ipsec_sa_lookup(const ipsec_sa_lookup_t *lookup) if (NULL != best) _odp_ipsec_sa_unuse(best); return ipsec_sa; - } else if (ODP_IPSEC_LOOKUP_SPI == ipsec_sa->in.lookup_mode && - lookup->proto == ipsec_sa->proto && - lookup->spi == ipsec_sa->spi) { + } else if (NULL == best && + ODP_IPSEC_LOOKUP_SPI == ipsec_sa->in.lookup_mode && + lookup->proto == ipsec_sa->proto && + lookup->spi == ipsec_sa->spi) { best = ipsec_sa; } else { _odp_ipsec_sa_unuse(ipsec_sa);