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 CA6BB427EF for ; Wed, 22 Mar 2023 11:32:53 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id C5A7F42D16; Wed, 22 Mar 2023 11:32:53 +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 4A4A842BC9 for ; Wed, 22 Mar 2023 11:32:52 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1679481171; 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=03f7m2tJgOm82LvAvSzscjeekVjLcrnoJkUDPFerebo=; b=C8DnhQN5IjviUAejitfdBBZyERc4fAiJ4G3yqly532ItJ3sB8JU7+M9hSlwXt/XmAV/rQd hRBrrIwZhguZEGP6TGjUILEd16qshFd+HDfdbeMQRXAfoEfDeauMflwJonOqZyDYVWk5B6 7SFwoxJrMY3W9N4cAaoy+sJJM2aj1DU= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-54-fNE4fRYUMyaLQDuSH6YKEQ-1; Wed, 22 Mar 2023 06:32:48 -0400 X-MC-Unique: fNE4fRYUMyaLQDuSH6YKEQ-1 Received: from smtp.corp.redhat.com (int-mx09.intmail.prod.int.rdu2.redhat.com [10.11.54.9]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 0645B8828C0; Wed, 22 Mar 2023 10:32:47 +0000 (UTC) Received: from rh.redhat.com (unknown [10.39.192.69]) by smtp.corp.redhat.com (Postfix) with ESMTP id F185A492C13; Wed, 22 Mar 2023 10:32:45 +0000 (UTC) From: Kevin Traynor To: Wei Huang Cc: Tianfei Zhang , Rosen Xu , dpdk stable Subject: patch 'bus/ifpga: fix devargs handling' has been queued to stable release 21.11.4 Date: Wed, 22 Mar 2023 10:32:07 +0000 Message-Id: <20230322103209.456098-20-ktraynor@redhat.com> In-Reply-To: <20230322103209.456098-1-ktraynor@redhat.com> References: <20230322103209.456098-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.9 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII"; x-default=true 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.4 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 03/24/23. 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/400ac4f9daafb903b476b2e43b5853024407d12f Thanks. Kevin --- >From 400ac4f9daafb903b476b2e43b5853024407d12f Mon Sep 17 00:00:00 2001 From: Wei Huang Date: Thu, 16 Mar 2023 16:44:12 -0400 Subject: [PATCH] bus/ifpga: fix devargs handling [ upstream commit 8a0b28b4d9581497d7b347c7c8797317707cd58f ] In function ifpga_scan_one(), variable 'path' is NULL if device argument 'afu_bts' is not set, subsequent string copy with 'path' would lead to segmentation fault. Fixes: 6fa4aa2b3645 ("bus/ifpga: fix forcing optional devargs") Signed-off-by: Wei Huang Acked-by: Tianfei Zhang Acked-by: Rosen Xu --- drivers/bus/ifpga/ifpga_bus.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/bus/ifpga/ifpga_bus.c b/drivers/bus/ifpga/ifpga_bus.c index c5c8bbd572..f82b93af65 100644 --- a/drivers/bus/ifpga/ifpga_bus.c +++ b/drivers/bus/ifpga/ifpga_bus.c @@ -137,4 +137,6 @@ ifpga_scan_one(struct rte_rawdev *rawdev, } afu_pr_conf.pr_enable = 1; + strlcpy(afu_pr_conf.bs_path, path, + sizeof(afu_pr_conf.bs_path)); } else { afu_pr_conf.pr_enable = 0; @@ -176,5 +178,4 @@ ifpga_scan_one(struct rte_rawdev *rawdev, goto end; - strlcpy(afu_pr_conf.bs_path, path, sizeof(afu_pr_conf.bs_path)); if (rawdev->dev_ops && rawdev->dev_ops->firmware_load && -- 2.39.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-03-22 10:30:08.417427812 +0000 +++ 0020-bus-ifpga-fix-devargs-handling.patch 2023-03-22 10:30:07.933866586 +0000 @@ -1 +1 @@ -From 8a0b28b4d9581497d7b347c7c8797317707cd58f Mon Sep 17 00:00:00 2001 +From 400ac4f9daafb903b476b2e43b5853024407d12f Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 8a0b28b4d9581497d7b347c7c8797317707cd58f ] + @@ -11 +12,0 @@ -Cc: stable@dpdk.org @@ -21 +22 @@ -index bb943b58b5..07e316b38e 100644 +index c5c8bbd572..f82b93af65 100644 @@ -24 +25 @@ -@@ -136,4 +136,6 @@ ifpga_scan_one(struct rte_rawdev *rawdev, +@@ -137,4 +137,6 @@ ifpga_scan_one(struct rte_rawdev *rawdev, @@ -31 +32 @@ -@@ -175,5 +177,4 @@ ifpga_scan_one(struct rte_rawdev *rawdev, +@@ -176,5 +178,4 @@ ifpga_scan_one(struct rte_rawdev *rawdev,