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 91079A0C47 for ; Tue, 10 Aug 2021 17:42:27 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 8B0DE4014F; Tue, 10 Aug 2021 17:42:27 +0200 (CEST) Received: from smtp-relay-canonical-0.canonical.com (smtp-relay-canonical-0.canonical.com [185.125.188.120]) by mails.dpdk.org (Postfix) with ESMTP id 72AB6411C5 for ; Tue, 10 Aug 2021 17:42:25 +0200 (CEST) Received: from mail-ed1-f69.google.com (mail-ed1-f69.google.com [209.85.208.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-canonical-0.canonical.com (Postfix) with ESMTPS id 5B90B3F10B for ; Tue, 10 Aug 2021 15:42:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1628610145; bh=TNXta7Szu3hGaLwYJoRnTz2CZCKlGM9FxBT7ZsXBS+Y=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=ZsCcznacGnAKAXXZNedi5adaxNT/7uMKiwVqrY4vhR/GFLkL0YJLTeH+vA4DxI2H2 5xQNTgxxwb187oU6YMQLZl31t3Ohtic0xs3BNOHUAfkGbV63oTYb0ZjEdMpbcUaIEb 1Bk7UdANwVQadjCvUB2xmy5wg3o/TTL4WriGdnRbPOq055T4qniAo+mQdKW2GFJeKE Dul04PR4AIjYCYq9ZQ3x3qzwbcH/E1gpi6a9TZZcFNJGm+5sl8YJVK/GRuGYKjbJBd rfR26C/uK6ryIuspw7LiiCeDWQLCQU3QXQgSUQLgkCc+FaTmHF+lHMBH5nzTJwZ4MT 34FohUWOPoprA== Received: by mail-ed1-f69.google.com with SMTP id p2-20020a50c9420000b02903a12bbba1ebso10898739edh.6 for ; Tue, 10 Aug 2021 08:42:25 -0700 (PDT) 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=TNXta7Szu3hGaLwYJoRnTz2CZCKlGM9FxBT7ZsXBS+Y=; b=CppE5mcaqgyaNpuUhmtOfodSDRDZ6sXtZ+98l6KGDd6X4NSsMgJRwuHVTYS4rXNrcY zFiPvwM3THy1SHiEyz+EBTFvv56HgAu2Vgp7VlFLdQS6RGH4mFAwN1OcfVeFE3TdOs/w JIjrm6vk7GpVfLPk5iSoSaM4/4KkjJjl+u5s5ksKvUQ23UgOq8nDtrS/Bl38YXXudu6H wEdoIgbdN+Rwa8MwaafDPi2gjGcLJaMuJD3YoeFe0sDqVcsZjr4odrAXWa0bb/7lvr3X XfzeQclHgWuhn02ABsMFByRu8IZDcjMd2cY012QWpQLs7cvkX0RtHZEXbJdZWZh6RHXy flvg== X-Gm-Message-State: AOAM530QwDB6pOvyGH70xPKNupyUCaxVzDo7FdhR3tbLEujAvgcFGguo wK7SPQzRrgrItHTvGGtpOqrcY0aSH6f0qpJOl401XJvUQvGZn9/sSww8uhlZHof6ITUHs148AfH 57HRdMm2T1H4XBYAhEMxnzHFV X-Received: by 2002:a05:6402:2158:: with SMTP id bq24mr5796556edb.8.1628610145079; Tue, 10 Aug 2021 08:42:25 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyvwEgXcyZhToWm8hLntgnHkgGUQh0l26oTS6FUIx8ET7B/6z8K/8J0Yoyi2iu75HJ1bPBTHg== X-Received: by 2002:a05:6402:2158:: with SMTP id bq24mr5796539edb.8.1628610144936; Tue, 10 Aug 2021 08:42:24 -0700 (PDT) Received: from Keschdeichel.fritz.box ([2001:67c:1560:8007::aac:c4ad]) by smtp.gmail.com with ESMTPSA id bs13sm7033615ejb.98.2021.08.10.08.42.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 10 Aug 2021 08:42:24 -0700 (PDT) From: christian.ehrhardt@canonical.com To: Thierry Herbelot Cc: Akhil Goyal , dpdk stable Date: Tue, 10 Aug 2021 17:39:18 +0200 Message-Id: <20210810154022.749358-38-christian.ehrhardt@canonical.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210810154022.749358-1-christian.ehrhardt@canonical.com> References: <20210810154022.749358-1-christian.ehrhardt@canonical.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'test/crypto: fix mbuf reset after null check' has been queued to stable release 19.11.10 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 Sender: "stable" Hi, FYI, your patch has been queued to stable release 19.11.10 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 08/12/21. 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/9ab830c078d0a89f1f604b5149935e0ed7b55d68 Thanks. Christian Ehrhardt --- >From 9ab830c078d0a89f1f604b5149935e0ed7b55d68 Mon Sep 17 00:00:00 2001 From: Thierry Herbelot Date: Mon, 24 May 2021 11:01:13 +0200 Subject: [PATCH] test/crypto: fix mbuf reset after null check [ upstream commit 2b81eb2c992b2e3728b8866cf6199cfd3b5fd776 ] Use m only after it was checked not to be NULL. Fixes: 202d375c60bc1 ("app/test: add cryptodev unit and performance tests") Signed-off-by: Thierry Herbelot Acked-by: Akhil Goyal --- app/test/test_cryptodev.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/app/test/test_cryptodev.c b/app/test/test_cryptodev.c index 1047c5e038..7686c7caec 100644 --- a/app/test/test_cryptodev.c +++ b/app/test/test_cryptodev.c @@ -112,10 +112,11 @@ setup_test_string(struct rte_mempool *mpool, struct rte_mbuf *m = rte_pktmbuf_alloc(mpool); size_t t_len = len - (blocksize ? (len % blocksize) : 0); - memset(m->buf_addr, 0, m->buf_len); if (m) { - char *dst = rte_pktmbuf_append(m, t_len); + char *dst; + memset(m->buf_addr, 0, m->buf_len); + dst = rte_pktmbuf_append(m, t_len); if (!dst) { rte_pktmbuf_free(m); return NULL; -- 2.32.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-08-10 15:11:14.529973531 +0200 +++ 0038-test-crypto-fix-mbuf-reset-after-null-check.patch 2021-08-10 15:11:12.994637927 +0200 @@ -1 +1 @@ -From 2b81eb2c992b2e3728b8866cf6199cfd3b5fd776 Mon Sep 17 00:00:00 2001 +From 9ab830c078d0a89f1f604b5149935e0ed7b55d68 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 2b81eb2c992b2e3728b8866cf6199cfd3b5fd776 ] + @@ -9 +10,0 @@ -Cc: stable@dpdk.org @@ -18 +19 @@ -index ead8c6e3dc..dd1669e007 100644 +index 1047c5e038..7686c7caec 100644 @@ -21 +22 @@ -@@ -135,10 +135,11 @@ setup_test_string(struct rte_mempool *mpool, +@@ -112,10 +112,11 @@ setup_test_string(struct rte_mempool *mpool,