From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id DF514A04DD for ; Wed, 28 Oct 2020 11:53:48 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id C4C39CA10; Wed, 28 Oct 2020 11:53:47 +0100 (CET) Received: from mail-wr1-f68.google.com (mail-wr1-f68.google.com [209.85.221.68]) by dpdk.org (Postfix) with ESMTP id DBFDCCA06 for ; Wed, 28 Oct 2020 11:53:46 +0100 (CET) Received: by mail-wr1-f68.google.com with SMTP id y12so5155767wrp.6 for ; Wed, 28 Oct 2020 03:53:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=KXesuJKDpbq8cjwHwiFRXMK4yCdam1ImNMymI50WsNI=; b=mlUgZhCg7naw0T3tF6/NZ5CHYBfPcrh6vCxH0ztszGGawNBIIMs65FOmIPjhhqJQcp 380iAN9hDAM77eH0DjlGnu49OKg+LcGXtDGNzbEufhLCq1UkGfep1YSaeGbysVia9/wz 43Z2WmUM8ZFvyC0E9Y2SKN6EW0ldK7lYP1w/TnjU1nzR5ANDjbIJ1JEUFBvmj6Yq7xRl VCFPBms1C9evbrVNrgGzBVPn2LS9m/J6IHlEsChOuXpvgPrVsfF8CNp+hVKaKZSZFo1a dJ181O+Lzm+Mp9F+BjLO705t16A+Qiabmx8NKDTehHAo/Wj8rY2zUFXW5FPGpV7Df7wO S8Vw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=KXesuJKDpbq8cjwHwiFRXMK4yCdam1ImNMymI50WsNI=; b=ic6Gor+XyvMTBtxFU76Gaf+0tEpfkJ4ZRCRfb8QHWtW24+i4VEPyztZswP9KnPtAIe KV4WyM8Iq9yhEqzWAvoRyN+KypxJwXP1C5DX24m5Ml1G4iAIA7ouyD8+AllkPy8TkZ5Q SvJ2kP4JQLC6km+wO74JUo1OdmedySD2P1Fpw52Bxu//SlSYB643/cvZ0qDvhPfycz71 xEHQCmIGmhhkEmunyS7qAbrpXKDTDT1CqP6CpGGGoc9PxF7QvW9RjSaT1s2ytQoKT9q4 q6LJorzXNX9jZ7vEUciWA4U9YwyUjuXlFXX8vWlbbghyAthRcSVYhPx92T+ALw5F/xOI 8NWQ== X-Gm-Message-State: AOAM530BVSjUMjuIjFpSDJdnK/qNa5K85GXXZ+8CIdgSRSZvqb0Ah+jH w+t5qGYV68YEfEBxk8Fi9cI= X-Google-Smtp-Source: ABdhPJyIDqnN/qP8vGQp+KXMEnJOXzNXCLiMJsnEF0N2HtLHbr6I6XTtMv+1JhNszzzqEXnDsJF2oA== X-Received: by 2002:adf:f48c:: with SMTP id l12mr8597999wro.77.1603882425659; Wed, 28 Oct 2020 03:53:45 -0700 (PDT) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id t7sm6216883wrx.42.2020.10.28.03.53.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 28 Oct 2020 03:53:45 -0700 (PDT) From: luca.boccassi@gmail.com To: Yunjian Wang Cc: Akhil Goyal , dpdk stable Date: Wed, 28 Oct 2020 10:45:03 +0000 Message-Id: <20201028104606.3504127-144-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20201028104606.3504127-1-luca.boccassi@gmail.com> References: <20201028104606.3504127-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'crypto/dpaa_sec: fix a null pointer dereference' has been queued to stable release 19.11.6 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Sender: "stable" Hi, FYI, your patch has been queued to stable release 19.11.6 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 10/30/20. So please shout if anyone has objections. Also note that after the patch there's a diff of the upstream commit vs the patch applied to the branch. This will indicate if there was any rebasing needed to apply to the stable branch. If there were code changes for rebasing (ie: not only metadata diffs), please double check that the rebase was correctly done. Thanks. Luca Boccassi --- >From a1d4781f98130649437ee812533776cb8c0c58d8 Mon Sep 17 00:00:00 2001 From: Yunjian Wang Date: Sat, 5 Sep 2020 18:26:02 +0800 Subject: [PATCH] crypto/dpaa_sec: fix a null pointer dereference [ upstream commit 8839c8a1f79e722be6397590bd7d255972a398b4 ] This patch fixes a null pointer dereference after null check detected by coverity scan. Coverity issue: 349904 Fixes: 6a0c9d364afc ("crypto/dpaax_sec: support HFN override") Signed-off-by: Yunjian Wang Acked-by: Akhil Goyal --- drivers/crypto/dpaa_sec/dpaa_sec.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/crypto/dpaa_sec/dpaa_sec.c b/drivers/crypto/dpaa_sec/dpaa_sec.c index 35f1feac44..a650313cdb 100644 --- a/drivers/crypto/dpaa_sec/dpaa_sec.c +++ b/drivers/crypto/dpaa_sec/dpaa_sec.c @@ -2959,7 +2959,8 @@ dpaa_sec_set_pdcp_session(struct rte_cryptodev *dev, session->pdcp.hfn = pdcp_xform->hfn; session->pdcp.hfn_threshold = pdcp_xform->hfn_threshold; session->pdcp.hfn_ovd = pdcp_xform->hfn_ovrd; - session->pdcp.hfn_ovd_offset = cipher_xform->iv.offset; + if (cipher_xform) + session->pdcp.hfn_ovd_offset = cipher_xform->iv.offset; rte_spinlock_lock(&dev_priv->lock); for (i = 0; i < MAX_DPAA_CORES; i++) { -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-10-28 10:35:16.210650780 +0000 +++ 0144-crypto-dpaa_sec-fix-a-null-pointer-dereference.patch 2020-10-28 10:35:11.728833321 +0000 @@ -1,14 +1,15 @@ -From 8839c8a1f79e722be6397590bd7d255972a398b4 Mon Sep 17 00:00:00 2001 +From a1d4781f98130649437ee812533776cb8c0c58d8 Mon Sep 17 00:00:00 2001 From: Yunjian Wang Date: Sat, 5 Sep 2020 18:26:02 +0800 Subject: [PATCH] crypto/dpaa_sec: fix a null pointer dereference +[ upstream commit 8839c8a1f79e722be6397590bd7d255972a398b4 ] + This patch fixes a null pointer dereference after null check detected by coverity scan. Coverity issue: 349904 Fixes: 6a0c9d364afc ("crypto/dpaax_sec: support HFN override") -Cc: stable@dpdk.org Signed-off-by: Yunjian Wang Acked-by: Akhil Goyal @@ -17,10 +18,10 @@ 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/crypto/dpaa_sec/dpaa_sec.c b/drivers/crypto/dpaa_sec/dpaa_sec.c -index 97002170b0..0495422a4c 100644 +index 35f1feac44..a650313cdb 100644 --- a/drivers/crypto/dpaa_sec/dpaa_sec.c +++ b/drivers/crypto/dpaa_sec/dpaa_sec.c -@@ -2949,7 +2949,8 @@ dpaa_sec_set_pdcp_session(struct rte_cryptodev *dev, +@@ -2959,7 +2959,8 @@ dpaa_sec_set_pdcp_session(struct rte_cryptodev *dev, session->pdcp.hfn = pdcp_xform->hfn; session->pdcp.hfn_threshold = pdcp_xform->hfn_threshold; session->pdcp.hfn_ovd = pdcp_xform->hfn_ovrd;