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 9E93DA0350 for ; Mon, 21 Feb 2022 16:43:02 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 987BA4013F; Mon, 21 Feb 2022 16:43:02 +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 372E840DF6 for ; Mon, 21 Feb 2022 16:43:01 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1645458180; 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=GWT/gF+HSRYMwqItxZMxjnVdBJCyJ2hEN6kYxuoh6Xo=; b=Ac+DZYuiAIpbM1Pi+oZ/d185UtpcUBz5EFBTh+119mMYfTtBpenIw/Hf129AtnCrFs9cn6 b0c4eM1O0xhJaSqUWG1wNywMswHWWS53ckYJ4FGrzKo1heJVSp4aRh2jL2ldD9LFpcEs/f ACvQqpL5WN87xux/JlwBQVQG5fYuSF4= 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-410-TRsg1sRfMba4w7neZcbneg-1; Mon, 21 Feb 2022 10:42:57 -0500 X-MC-Unique: TRsg1sRfMba4w7neZcbneg-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 6DFF41853028; Mon, 21 Feb 2022 15:42:56 +0000 (UTC) Received: from rh.Home (unknown [10.39.195.12]) by smtp.corp.redhat.com (Postfix) with ESMTP id 6447F7E131; Mon, 21 Feb 2022 15:42:55 +0000 (UTC) From: Kevin Traynor To: Weiguo Li Cc: Maxime Coquelin , dpdk stable Subject: patch 'vdpa/sfc: fix null dereference during removal' has been queued to stable release 21.11.1 Date: Mon, 21 Feb 2022 15:36:01 +0000 Message-Id: <20220221153625.152324-172-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/8f821b11356db2d496b09a2540e623ef6938c993 Thanks. Kevin --- >From 8f821b11356db2d496b09a2540e623ef6938c993 Mon Sep 17 00:00:00 2001 From: Weiguo Li Date: Sun, 30 Jan 2022 01:30:12 +0800 Subject: [PATCH] vdpa/sfc: fix null dereference during removal [ upstream commit 500640b328c2ce623715ca8ec013e7a8ff922428 ] When sva is null, sfc_vdpa_info(sva, ...) will cause a null dereference. Use SFC_VDPA_GENERIC_LOG() to avoid that. See macros sfc_vdpa_info and SFC_VDPA_GENERIC_LOG defined in drivers/vdpa/sfc/sfc_vdpa_log.h for detail. Fixes: 5e7596ba7cb3 ("vdpa/sfc: introduce Xilinx vDPA driver") Signed-off-by: Weiguo Li Reviewed-by: Maxime Coquelin --- drivers/vdpa/sfc/sfc_vdpa.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/vdpa/sfc/sfc_vdpa.c b/drivers/vdpa/sfc/sfc_vdpa.c index fccdd8c687..53f598facc 100644 --- a/drivers/vdpa/sfc/sfc_vdpa.c +++ b/drivers/vdpa/sfc/sfc_vdpa.c @@ -329,5 +329,6 @@ sfc_vdpa_pci_remove(struct rte_pci_device *pci_dev) sva = sfc_vdpa_get_adapter_by_dev(pci_dev); if (sva == NULL) { - sfc_vdpa_info(sva, "invalid device: %s", pci_dev->name); + SFC_VDPA_GENERIC_LOG(INFO, + "Invalid device: %s.", pci_dev->name); return -1; } -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-02-21 15:22:48.270061424 +0000 +++ 0172-vdpa-sfc-fix-null-dereference-during-removal.patch 2022-02-21 15:22:44.334704673 +0000 @@ -1 +1 @@ -From 500640b328c2ce623715ca8ec013e7a8ff922428 Mon Sep 17 00:00:00 2001 +From 8f821b11356db2d496b09a2540e623ef6938c993 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 500640b328c2ce623715ca8ec013e7a8ff922428 ] + @@ -12 +13,0 @@ -Cc: stable@dpdk.org