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 84C7AA0350 for ; Mon, 21 Feb 2022 16:43:00 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 7F7FB4013F; Mon, 21 Feb 2022 16:43:00 +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 6F2204013F for ; Mon, 21 Feb 2022 16:42:59 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1645458179; 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=u2Ar5QBkywC1kI5grk/EJTCQkCoryrqJ1sZn2WDu0ks=; b=asLyr+lSuF95RkB8xHUDhKYQ/6ZmsgngbyImCGEdpkcYCFDFByVIXwx/DlQrNTXFYSusms bsiON+yyvCMx8bByciPGBqslhVh/zHryinzupQZ9jOBQw4On5fSJsImktaV2Lmej3PLAoF u8P3lNj3SeTakytdlE+5y0l6Rjc7yN8= 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-274-ulVt89pYOOqpIIZQeHT0LQ-1; Mon, 21 Feb 2022 10:42:55 -0500 X-MC-Unique: ulVt89pYOOqpIIZQeHT0LQ-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 DF49C1853030; Mon, 21 Feb 2022 15:42:54 +0000 (UTC) Received: from rh.Home (unknown [10.39.195.12]) by smtp.corp.redhat.com (Postfix) with ESMTP id 9F67A7E2F3; Mon, 21 Feb 2022 15:42:34 +0000 (UTC) From: Kevin Traynor To: Weiguo Li Cc: Maxime Coquelin , dpdk stable Subject: patch 'vdpa/sfc: fix null dereference during config' has been queued to stable release 21.11.1 Date: Mon, 21 Feb 2022 15:36:00 +0000 Message-Id: <20220221153625.152324-171-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/5dfd488d82175f3ef522bb0bb0c1961fb45d3219 Thanks. Kevin --- >From 5dfd488d82175f3ef522bb0bb0c1961fb45d3219 Mon Sep 17 00:00:00 2001 From: Weiguo Li Date: Sun, 30 Jan 2022 02:07:30 +0800 Subject: [PATCH] vdpa/sfc: fix null dereference during config [ upstream commit d8875804e00b37a80efc6e1c97ac57f8ac2c7d91 ] Fixes: b11961363b4a ("vdpa/sfc: support device configure and close") Signed-off-by: Weiguo Li Reviewed-by: Maxime Coquelin --- drivers/vdpa/sfc/sfc_vdpa_ops.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/vdpa/sfc/sfc_vdpa_ops.c b/drivers/vdpa/sfc/sfc_vdpa_ops.c index c4ce4474ef..b3d9b6cd56 100644 --- a/drivers/vdpa/sfc/sfc_vdpa_ops.c +++ b/drivers/vdpa/sfc/sfc_vdpa_ops.c @@ -612,5 +612,5 @@ sfc_vdpa_dev_config(int vid) ops_data = sfc_vdpa_get_data_by_dev(vdpa_dev); if (ops_data == NULL) { - sfc_vdpa_err(ops_data->dev_handle, + SFC_VDPA_GENERIC_LOG(ERR, "invalid vDPA device : %p, vid : %d", vdpa_dev, vid); @@ -667,5 +667,5 @@ sfc_vdpa_dev_close(int vid) ops_data = sfc_vdpa_get_data_by_dev(vdpa_dev); if (ops_data == NULL) { - sfc_vdpa_err(ops_data->dev_handle, + SFC_VDPA_GENERIC_LOG(ERR, "invalid vDPA device : %p, vid : %d", vdpa_dev, vid); -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-02-21 15:22:48.250937299 +0000 +++ 0171-vdpa-sfc-fix-null-dereference-during-config.patch 2022-02-21 15:22:44.334704673 +0000 @@ -1 +1 @@ -From d8875804e00b37a80efc6e1c97ac57f8ac2c7d91 Mon Sep 17 00:00:00 2001 +From 5dfd488d82175f3ef522bb0bb0c1961fb45d3219 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit d8875804e00b37a80efc6e1c97ac57f8ac2c7d91 ] + @@ -7 +8,0 @@ -Cc: stable@dpdk.org