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 B17A842800 for ; Wed, 22 Mar 2023 01:42:50 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 1A8B1427F2; Wed, 22 Mar 2023 01:42:49 +0100 (CET) Received: from mail-wr1-f45.google.com (mail-wr1-f45.google.com [209.85.221.45]) by mails.dpdk.org (Postfix) with ESMTP id 3890540E09 for ; Wed, 22 Mar 2023 01:42:46 +0100 (CET) Received: by mail-wr1-f45.google.com with SMTP id e18so3886603wra.9 for ; Tue, 21 Mar 2023 17:42:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1679445766; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=L0pdUR3Rk4v2iOdJ6+l+vow8gDjnsJb4XMdDNg28OFI=; b=YiKSZ92+QU9zSnwbBPSCPSIbLLOsb04mCRf1QKNp2FnCe96qqKTq2t1ycUsfxId5Xv dIP1dcPVr1pSe+3r/u5eJVI4CTt0L55sG8vi1A/FMzwzdFGbb2zUJFSC24mEQL6EG/3w esXM5ILoYdoI2lp5YmUIhCsQvqY94ELS7A0FFfElCye4ktXTU6+R4191Q5AQ5PjwvY1h +DLoSKput5K/6AwyoHgEhDFNbfz/AzLkdKFmAoHDlMHp6i1DdYQpW/k9RJ0x4GertYnS ogygQZB1yGILmfmJ0ULQpzI/pomOHGY1/xqvolq+nnsZf9U4EaNYULGu/KiX1hpSsLl6 W9ew== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1679445766; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=L0pdUR3Rk4v2iOdJ6+l+vow8gDjnsJb4XMdDNg28OFI=; b=hlHuYZ0OfwOFXMshaxjgsE5KxLLFJMnNtYBe5iqtprKJ+9KR5Im6OaEFlmTscWrppv bKYzb/iX5aG9/cPepyBrEMmrq4yx4Nkn/XvqzLcTZb7cSxJonK9Coppv8iuuP2rZeSna dTCOmzfElorjh9LJes1eZrYE+KRGIUdiemaBC2k5Doc0OvPMfMobPKPVo50bKsqwbjpA cFr5xa3oJuoCV8pdJ88kn8cPnUYHg/hDEQfxiFWR/SAmfSN9T2C+vpCZmuTKl64bzUNP QhIjT6bjcE8YT6xfh/ZMGmRPPPAlRs3sjkGZDuIia998O2RFlipxObYtggMWmd8FXXLg WEjA== X-Gm-Message-State: AO0yUKWXDh7XT6ZNNH40gx131XV2IsP5/Ipl5v0bv0FYKLm3Ol/5fdmy /sMMEzDHz+pAkVWCz4+Q/fE= X-Google-Smtp-Source: AK7set8TxJ2SVko4PHtG8kyfBnXL+E9E/mr/UFbUVcqnYszWSscFcYIj55ajFYi9EevELfADYjfsbQ== X-Received: by 2002:a5d:4d8e:0:b0:2ce:a6be:2bd with SMTP id b14-20020a5d4d8e000000b002cea6be02bdmr4026004wru.1.1679445765943; Tue, 21 Mar 2023 17:42:45 -0700 (PDT) Received: from localhost ([2a01:4b00:d307:1000:f1d3:eb5e:11f4:a7d9]) by smtp.gmail.com with ESMTPSA id s15-20020a5d6a8f000000b002d743eeab39sm5766242wru.58.2023.03.21.17.42.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 21 Mar 2023 17:42:45 -0700 (PDT) From: luca.boccassi@gmail.com To: Wei Huang Cc: Tianfei Zhang , Rosen Xu , dpdk stable Subject: patch 'bus/ifpga: fix devargs handling' has been queued to stable release 20.11.8 Date: Wed, 22 Mar 2023 00:41:53 +0000 Message-Id: <20230322004155.2333903-17-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230322004155.2333903-1-luca.boccassi@gmail.com> References: <20230315224631.1025649-39-luca.boccassi@gmail.com> <20230322004155.2333903-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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 20.11.8 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/23/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/bluca/dpdk-stable This queued commit can be viewed at: https://github.com/bluca/dpdk-stable/commit/7f305f7b108912d6fcf1ce5618378092cd298d71 Thanks. Luca Boccassi --- >From 7f305f7b108912d6fcf1ce5618378092cd298d71 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 56e58e04a1..d059975680 100644 --- a/drivers/bus/ifpga/ifpga_bus.c +++ b/drivers/bus/ifpga/ifpga_bus.c @@ -136,6 +136,8 @@ ifpga_scan_one(struct rte_rawdev *rawdev, goto end; } 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; } @@ -167,7 +169,6 @@ ifpga_scan_one(struct rte_rawdev *rawdev, rawdev->dev_ops->dev_start(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 && rawdev->dev_ops->firmware_load(rawdev, -- 2.39.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-03-21 21:56:37.724146292 +0000 +++ 0017-bus-ifpga-fix-devargs-handling.patch 2023-03-21 21:56:37.084807300 +0000 @@ -1 +1 @@ -From 8a0b28b4d9581497d7b347c7c8797317707cd58f Mon Sep 17 00:00:00 2001 +From 7f305f7b108912d6fcf1ce5618378092cd298d71 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 56e58e04a1..d059975680 100644 @@ -24 +25 @@ -@@ -135,6 +135,8 @@ ifpga_scan_one(struct rte_rawdev *rawdev, +@@ -136,6 +136,8 @@ ifpga_scan_one(struct rte_rawdev *rawdev, @@ -33 +34 @@ -@@ -174,7 +176,6 @@ ifpga_scan_one(struct rte_rawdev *rawdev, +@@ -167,7 +169,6 @@ ifpga_scan_one(struct rte_rawdev *rawdev,