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 1EF94A0350 for ; Mon, 21 Feb 2022 16:42:24 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 1A3894013F; Mon, 21 Feb 2022 16:42:24 +0100 (CET) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mails.dpdk.org (Postfix) with ESMTP id D19ED41145 for ; Mon, 21 Feb 2022 16:42:22 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1645458142; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=dHU3Wds+7EX5nlyjOylmvKDCVHmRW+IyD+RybWjFlR4=; b=QspHsjFl+sGVAirjctacoPcjygfMCHJLfph5QfkKq2SAYYWFqoEfwk1XZ1xwJMCzuDf4xD jBkpdvmGSUZXswb0Rc95ibnsmp0RplN3eY2VieXv7z1Mx02lolkkGKPW+VYKphpXE48HEE f+BiUOZZYMtXB6jBnFbN8Qncl9lzlDc= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-618-DZLb-OARM4W2cDIP68E-9A-1; Mon, 21 Feb 2022 10:42:19 -0500 X-MC-Unique: DZLb-OARM4W2cDIP68E-9A-1 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 46135801B2E; Mon, 21 Feb 2022 15:42:18 +0000 (UTC) Received: from rh.Home (unknown [10.39.195.12]) by smtp.corp.redhat.com (Postfix) with ESMTP id 4C3507E2E8; Mon, 21 Feb 2022 15:42:17 +0000 (UTC) From: Kevin Traynor To: Weiguo Li Cc: Ferruh Yigit , dpdk stable Subject: patch 'net/memif: remove pointer deference before null check' has been queued to stable release 21.11.1 Date: Mon, 21 Feb 2022 15:35:49 +0000 Message-Id: <20220221153625.152324-160-ktraynor@redhat.com> In-Reply-To: <20220221153625.152324-1-ktraynor@redhat.com> References: <20220221153625.152324-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=ktraynor@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" 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 21.11.1 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 02/26/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/kevintraynor/dpdk-stable This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable/commit/d594afc7926fb5d2b2502152f400b22e30aa93e8 Thanks. Kevin --- >From d594afc7926fb5d2b2502152f400b22e30aa93e8 Mon Sep 17 00:00:00 2001 From: Weiguo Li Date: Wed, 9 Feb 2022 15:39:34 +0800 Subject: [PATCH] net/memif: remove pointer deference before null check [ upstream commit b6c0f464affcf0ec6fcf0a26e517692dc08244f4 ] There are duplicates of assignment here, the one before null check may cause a null pointer deference, so remove the previous one. Fixes: 09c7e63a71f9 ("net/memif: introduce memory interface PMD") Signed-off-by: Weiguo Li Reviewed-by: Ferruh Yigit --- drivers/net/memif/memif_socket.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/net/memif/memif_socket.c b/drivers/net/memif/memif_socket.c index 42f48a68a1..7886644412 100644 --- a/drivers/net/memif/memif_socket.c +++ b/drivers/net/memif/memif_socket.c @@ -403,9 +403,8 @@ memif_msg_enq_init(struct rte_eth_dev *dev) struct pmd_internals *pmd = dev->data->dev_private; struct memif_msg_queue_elt *e = memif_msg_enq(pmd->cc); - memif_msg_init_t *i = &e->msg.init; + memif_msg_init_t *i; if (e == NULL) return -1; - i = &e->msg.init; e->msg.type = MEMIF_MSG_TYPE_INIT; -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-02-21 15:22:48.019865600 +0000 +++ 0160-net-memif-remove-pointer-deference-before-null-check.patch 2022-02-21 15:22:44.310704619 +0000 @@ -1 +1 @@ -From b6c0f464affcf0ec6fcf0a26e517692dc08244f4 Mon Sep 17 00:00:00 2001 +From d594afc7926fb5d2b2502152f400b22e30aa93e8 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit b6c0f464affcf0ec6fcf0a26e517692dc08244f4 ] + @@ -10 +11,0 @@ -Cc: stable@dpdk.org