From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 43FBEA0540 for ; Thu, 7 Jul 2022 09:57:04 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 3EDEF406B4; Thu, 7 Jul 2022 09:57:04 +0200 (CEST) Received: from smtp-relay-internal-1.canonical.com (smtp-relay-internal-1.canonical.com [185.125.188.123]) by mails.dpdk.org (Postfix) with ESMTP id 746ED406B4 for ; Thu, 7 Jul 2022 09:57:03 +0200 (CEST) Received: from mail-ej1-f69.google.com (mail-ej1-f69.google.com [209.85.218.69]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-internal-1.canonical.com (Postfix) with ESMTPS id 3B8253F04C for ; Thu, 7 Jul 2022 07:57:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1657180622; bh=QvI6PshwCrzWvEzoCIAu4OsSyxRau+10H6gkS1AC7C4=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=YMctMW8LEtQ5m3xFZ5LnHO7jBTzMEEBFRRLkzs2352gdsczayO5V75njary++12+i OCtjf7p7O4+TKZZ/MAGzHKGtzkeGxArc+Ote+HCrM5DUJER20MGdb2kXkv2U9DdTSf 7jfKDjok+QqMMGKG5G4ki3WvXQ6fPoHOO1NK3o7QHlxdadXXrkZ7AHc1ciWRADCnSB QQEijNnHKNIVqCJEV8SpmqrZ7VKMLNQepkC/ViWFLk72WV5WLRUkzfgQZvYu1RcbKU uxETtvhmwx2EWTMDJX67a82qhD/ESGau8ZXbTZidkPwO38DTAcbVZ3fA1HbJkIIYse dAKSKFAcOJa2Q== Received: by mail-ej1-f69.google.com with SMTP id gr1-20020a170906e2c100b006fefea3ec0aso4432563ejb.14 for ; Thu, 07 Jul 2022 00:57:02 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=QvI6PshwCrzWvEzoCIAu4OsSyxRau+10H6gkS1AC7C4=; b=KJp3Ss47D17Cbn7Mnfj+xmPQgc0N0f9uy9yGDpc91wdaEJBcw0GYRI2NOqz3cKnCO9 Yl5BYLSp4BmcmSAvbuXrblKhym02U+lEZLkGr++npPl6SgoCZ5oDU2Ht57EGIewyHInr ctlN4xOBPAz6E9aAdzx3ILI2u9OP6Jz1Rp+jlqrb8BDtjiTbZGkwx4XG0Xr7q/3SheJl UMhO/FuLNY9DYMgxqYyPXev4y+bavLufp+qpBPfus+pktjLdnnzqYrciQK4oMInrnLA5 5uoxsDqQTf7Ts/hmaEJ3adZhDDP7Z5A3ltLChK2vM6cvOlAUGzyt3VR13EJ79PO03md5 BtDw== X-Gm-Message-State: AJIora8KGLRwZGuIXK4YefVHFudddGSgY+wWWnBrGG59zvXsmxwpZB40 JuZnWcwyWyiAq3fmV4Nuh9OTx97xA5jUR4HAE9DQPwfiHuQ9ACq+3QKJUWnC+Vx0DVxouf3sotz Yq8YlJIsk2ksT5PH3jF+Vs82R X-Received: by 2002:a05:6402:35cf:b0:435:bd7f:932c with SMTP id z15-20020a05640235cf00b00435bd7f932cmr59351820edc.415.1657180622066; Thu, 07 Jul 2022 00:57:02 -0700 (PDT) X-Google-Smtp-Source: AGRyM1vJ6yrg0kNC+YjfS7g0aaD9qqJMewYDeUomxLwsl8qCdtGOwmVEb7c45DLIyqykAhIeVTMz2Q== X-Received: by 2002:a05:6402:35cf:b0:435:bd7f:932c with SMTP id z15-20020a05640235cf00b00435bd7f932cmr59351801edc.415.1657180621854; Thu, 07 Jul 2022 00:57:01 -0700 (PDT) Received: from Keschdeichel.fritz.box ([2a02:6d40:3a4f:7b00:c19b:938e:7c97:afe2]) by smtp.gmail.com with ESMTPSA id u5-20020a170906068500b00703671ebe65sm18360271ejb.198.2022.07.07.00.57.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 07 Jul 2022 00:57:01 -0700 (PDT) From: christian.ehrhardt@canonical.com To: Ciara Power Cc: Pablo de Lara , dpdk stable Subject: patch 'test/crypto: fix null check for ZUC authentication' has been queued to stable release 19.11.13 Date: Thu, 7 Jul 2022 09:54:26 +0200 Message-Id: <20220707075522.194223-31-christian.ehrhardt@canonical.com> X-Mailer: git-send-email 2.37.0 In-Reply-To: <20220707075522.194223-1-christian.ehrhardt@canonical.com> References: <20220707075522.194223-1-christian.ehrhardt@canonical.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.29 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 Hi, FYI, your patch has been queued to stable release 19.11.13 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 07/09/22. 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. Queued patches are on a temporary branch at: https://github.com/cpaelzer/dpdk-stable-queue This queued commit can be viewed at: https://github.com/cpaelzer/dpdk-stable-queue/commit/e78ce8dd2376de008374c9f14f2bd43e3b8d955d Thanks. Christian Ehrhardt --- >From e78ce8dd2376de008374c9f14f2bd43e3b8d955d Mon Sep 17 00:00:00 2001 From: Ciara Power Date: Wed, 11 May 2022 13:29:24 +0000 Subject: [PATCH] test/crypto: fix null check for ZUC authentication [ upstream commit e6d37ffa69ac7fb4eec9580af5b005e6c130b79d ] Check if the returned op is NULL because of failure, before using it and causing a segmentation fault. Fixes: 4c99481f49c4 ("app/test: add ZUC") Signed-off-by: Ciara Power Acked-by: Pablo de Lara --- app/test/test_cryptodev.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/test/test_cryptodev.c b/app/test/test_cryptodev.c index c1fee16861..7ecfe8fac0 100644 --- a/app/test/test_cryptodev.c +++ b/app/test/test_cryptodev.c @@ -4591,9 +4591,9 @@ test_snow3g_cipher_auth(const struct snow3g_test_data *tdata) if (retval < 0) return retval; + TEST_ASSERT_NOT_NULL(ut_params->op, "failed to retrieve obuf"); ut_params->op = process_crypto_request(ts_params->valid_devs[0], ut_params->op); - TEST_ASSERT_NOT_NULL(ut_params->op, "failed to retrieve obuf"); ut_params->obuf = ut_params->op->sym->m_src; if (ut_params->obuf) ciphertext = rte_pktmbuf_mtod(ut_params->obuf, uint8_t *); -- 2.37.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-07-07 09:54:12.521388243 +0200 +++ 0031-test-crypto-fix-null-check-for-ZUC-authentication.patch 2022-07-07 09:54:10.853823925 +0200 @@ -1 +1 @@ -From e6d37ffa69ac7fb4eec9580af5b005e6c130b79d Mon Sep 17 00:00:00 2001 +From e78ce8dd2376de008374c9f14f2bd43e3b8d955d Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit e6d37ffa69ac7fb4eec9580af5b005e6c130b79d ] + @@ -10 +11,0 @@ -Cc: stable@dpdk.org @@ -19 +20 @@ -index f444144cc6..4ffaadc008 100644 +index c1fee16861..7ecfe8fac0 100644 @@ -22,9 +23,3 @@ -@@ -6238,8 +6238,8 @@ test_zuc_authentication(const struct wireless_test_data *tdata) - else - ut_params->op = process_crypto_request(ts_params->valid_devs[0], - ut_params->op); -- ut_params->obuf = ut_params->op->sym->m_src; - TEST_ASSERT_NOT_NULL(ut_params->op, "failed to retrieve obuf"); -+ ut_params->obuf = ut_params->op->sym->m_src; - ut_params->digest = rte_pktmbuf_mtod(ut_params->obuf, uint8_t *) - + plaintext_pad_len; +@@ -4591,9 +4591,9 @@ test_snow3g_cipher_auth(const struct snow3g_test_data *tdata) + if (retval < 0) + return retval; @@ -31,0 +27,7 @@ ++ TEST_ASSERT_NOT_NULL(ut_params->op, "failed to retrieve obuf"); + ut_params->op = process_crypto_request(ts_params->valid_devs[0], + ut_params->op); +- TEST_ASSERT_NOT_NULL(ut_params->op, "failed to retrieve obuf"); + ut_params->obuf = ut_params->op->sym->m_src; + if (ut_params->obuf) + ciphertext = rte_pktmbuf_mtod(ut_params->obuf, uint8_t *);