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 88537A0542 for ; Fri, 11 Nov 2022 11:34:42 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 843AE40150; Fri, 11 Nov 2022 11:34:42 +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 76BE74014F for ; Fri, 11 Nov 2022 11:34:39 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1668162879; 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=X/1N8qEFG1Nf07kvsDvMjtgfKfDzYgs2s85Fukn24Nc=; b=iMetLCiWCxRdGBJM76XyjvraPQCTS7/arQ9grNeuO7Cf0mYTQZomY5+Ew7CdRKvfPZ30Rf AWu+vIF0BqiTS/EqbTqoDeqVt21HiA/zekb4uVSQqhALCakTy3wmlOQAst6WpocWCF62we 6FknThq0bYZtaKtCQCr52zVkERxmswo= 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-622-SB451Kd0NUKwShwIuu6fRw-1; Fri, 11 Nov 2022 05:34:35 -0500 X-MC-Unique: SB451Kd0NUKwShwIuu6fRw-1 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 3262A8339D0; Fri, 11 Nov 2022 10:34:35 +0000 (UTC) Received: from rh.redhat.com (unknown [10.39.195.104]) by smtp.corp.redhat.com (Postfix) with ESMTP id 69987200E288; Fri, 11 Nov 2022 10:34:33 +0000 (UTC) From: Kevin Traynor To: Michael Baum Cc: Matan Azrad , dpdk stable Subject: patch 'net/mlx5: fix null check in devargs parsing' has been queued to stable release 21.11.3 Date: Fri, 11 Nov 2022 10:33:10 +0000 Message-Id: <20221111103337.307408-20-ktraynor@redhat.com> In-Reply-To: <20221111103337.307408-1-ktraynor@redhat.com> References: <20221111103337.307408-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.4 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.3 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 11/14/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/1b71989e069ef1d72d9b947e28a3833257db7aff Thanks. Kevin --- >From 1b71989e069ef1d72d9b947e28a3833257db7aff Mon Sep 17 00:00:00 2001 From: Michael Baum Date: Mon, 24 Oct 2022 15:33:35 +0300 Subject: [PATCH] net/mlx5: fix null check in devargs parsing [ upstream commit c2e3b84ec80d90e93a83e26ccc8c4fb750bb2d03 ] The "mlx5_os_parse_eth_devargs()" function parses the ETH devargs into a specific structure called "eth_da". It gets structure called "devargs" as a member of EAL device containing the relevant information. When "devargs" structure is invalid, the function avoids parsing it. However, when it valid but its field "args" is invalid, the function tries to parse it and dereference to NULL pointer. This patch adds check to avoid this NULL dereferencing. Fixes: 919488fbfa71 ("net/mlx5: support Sub-Function") Signed-off-by: Michael Baum Acked-by: Matan Azrad --- drivers/net/mlx5/linux/mlx5_os.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/mlx5/linux/mlx5_os.c b/drivers/net/mlx5/linux/mlx5_os.c index 27d6fe644d..4197ec424e 100644 --- a/drivers/net/mlx5/linux/mlx5_os.c +++ b/drivers/net/mlx5/linux/mlx5_os.c @@ -2575,5 +2575,5 @@ mlx5_os_parse_eth_devargs(struct rte_device *dev, return -rte_errno; } - if (eth_da->type == RTE_ETH_REPRESENTOR_NONE) { + if (eth_da->type == RTE_ETH_REPRESENTOR_NONE && dev->devargs->args) { /* Parse legacy device argument */ ret = rte_eth_devargs_parse(dev->devargs->args, eth_da); -- 2.38.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-11-11 10:32:17.581524996 +0000 +++ 0020-net-mlx5-fix-null-check-in-devargs-parsing.patch 2022-11-11 10:32:17.073300764 +0000 @@ -1 +1 @@ -From c2e3b84ec80d90e93a83e26ccc8c4fb750bb2d03 Mon Sep 17 00:00:00 2001 +From 1b71989e069ef1d72d9b947e28a3833257db7aff Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit c2e3b84ec80d90e93a83e26ccc8c4fb750bb2d03 ] + @@ -18 +19,0 @@ -Cc: stable@dpdk.org @@ -27 +28 @@ -index ab7ffa0931..2b6741396d 100644 +index 27d6fe644d..4197ec424e 100644 @@ -30 +31 @@ -@@ -2412,5 +2412,5 @@ mlx5_os_parse_eth_devargs(struct rte_device *dev, +@@ -2575,5 +2575,5 @@ mlx5_os_parse_eth_devargs(struct rte_device *dev,