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 82554A0C4C for ; Mon, 12 Jul 2021 15:13:58 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 7C83D406B4; Mon, 12 Jul 2021 15:13:58 +0200 (CEST) Received: from mail-wm1-f53.google.com (mail-wm1-f53.google.com [209.85.128.53]) by mails.dpdk.org (Postfix) with ESMTP id 08C5C40685 for ; Mon, 12 Jul 2021 15:13:57 +0200 (CEST) Received: by mail-wm1-f53.google.com with SMTP id u8-20020a7bcb080000b02901e44e9caa2aso11488086wmj.4 for ; Mon, 12 Jul 2021 06:13:57 -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=T4dz9AXZYuiYSqNzgZSwgStRPVkBja4Iti2V06TJqjY=; b=JfnDCMV66WqYIWod8pKVHR3BWKQfMnjckm66A2faNZi++SUn+zKpWsj6Xb+D5Q86Jd F4zzPEEDVah9QBCL021k6tSmJm0SFQ0uKz4pLX/tP2eb2Ojre7+AslDviAKlETzYLBpl /JJkIs3HEg462R5ML098J2m5Vuz45gUt+/ys3ce1NrdI8gK36XhEzYOeOuaqGjjNgL9l WOXtU706sakmhpGz7oCylv3PVCN3u8xyvn148hj4n9P+/lVq2J0YZs0IrNup7jDUhgvD Y1TWRz4BZZb5puxrtZrJDd0xR97vSr08Xw9obJ5O1FKEvphgfCXHaPPSyLwc4J8agCJA 3pcg== 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=T4dz9AXZYuiYSqNzgZSwgStRPVkBja4Iti2V06TJqjY=; b=KoFw7OX7gbjpF3ZdZP0VstFyGD22+KAQNfeh6hj3sOQS28QS5Y7beV4PZkBT+e+yBR BdXUt04MSJ9XIlvbQiB43FC1sIQoelRm4RIz13hlfaSz0N7seuw/AByaxuuthE0KeLFS 9zBekEm/OX4h3EsAJo0oLw4nVwpGqGAZ6kbDuLdAjh09/jqkpUQyx1tbUTZUGPFgR5e5 83Zp6ZQcvo9Wgbx1wDXrLRs7e7XXSG9UUxY1e8PPZWFcZJrgr4DHuVOZFvedfc4hXToO 2QKBDjAwqpQR7AvRxJdQzclEG2ZAJtJkUohiIKWp8AV/EddkZF2CKySLi2rg1HvXPorl 1BHw== X-Gm-Message-State: AOAM532M3bIv64sb51yYtN+IIcBfoKyXlcraZoXSCRWzdtR8bJYJ0zA0 mmUnOiOpd2Y11QfVZV8/4Ok= X-Google-Smtp-Source: ABdhPJyb/vdiZM7OawAhsyumQPod4/WNOkVTERGI9/5U9bpMlyc9aNkB4kJgjk0Pgm5NioU+x/8ixg== X-Received: by 2002:a1c:7314:: with SMTP id d20mr14236825wmb.156.1626095636862; Mon, 12 Jul 2021 06:13:56 -0700 (PDT) Received: from localhost ([137.220.125.106]) by smtp.gmail.com with ESMTPSA id 12sm21008739wme.28.2021.07.12.06.13.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 12 Jul 2021 06:13:56 -0700 (PDT) From: luca.boccassi@gmail.com To: Thierry Herbelot Cc: Akhil Goyal , dpdk stable Date: Mon, 12 Jul 2021 14:05:09 +0100 Message-Id: <20210712130551.2462159-74-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210712130551.2462159-1-luca.boccassi@gmail.com> References: <20210712130551.2462159-1-luca.boccassi@gmail.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 20.11.3 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 20.11.3 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/14/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/bluca/dpdk-stable This queued commit can be viewed at: https://github.com/bluca/dpdk-stable/commit/72af1d626d30632859314e0485d360b5431b4bf1 Thanks. Luca Boccassi --- >From 72af1d626d30632859314e0485d360b5431b4bf1 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 ea24e8edb7..8c76cdb313 100644 --- a/app/test/test_cryptodev.c +++ b/app/test/test_cryptodev.c @@ -135,10 +135,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.30.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-07-12 13:41:40.503116363 +0100 +++ 0074-test-crypto-fix-mbuf-reset-after-null-check.patch 2021-07-12 13:41:36.650125944 +0100 @@ -1 +1 @@ -From 2b81eb2c992b2e3728b8866cf6199cfd3b5fd776 Mon Sep 17 00:00:00 2001 +From 72af1d626d30632859314e0485d360b5431b4bf1 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 ea24e8edb7..8c76cdb313 100644