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 0BDBEA034E for ; Mon, 21 Feb 2022 16:38:15 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id F1ADD4013F; Mon, 21 Feb 2022 16:38:14 +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 BF93F40E5A for ; Mon, 21 Feb 2022 16:38:12 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1645457892; 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=TPj9aHySVKvpfbIBVeC6+iHItnAtB30D3QmgnNFwCYo=; b=cItpiNDawHe0nlgn5xLyDOobdM0zrWTFx1HbTWaFe8rsNrQG17Nl6Nkf2HkcrLAel5u52v Lr6c3d4kQZg0pxs7JEZxlHO34pOI0K71ucP4Qds1z322BC5W9ZoWS2YmErk3KexezhBbsx /uzG1Lb5KPCzLhlLdUnpj2E/n6JliZY= 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-458-VyNbTfM_PuqlOt5UdlPuzw-1; Mon, 21 Feb 2022 10:38:09 -0500 X-MC-Unique: VyNbTfM_PuqlOt5UdlPuzw-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 2F5761091DA1; Mon, 21 Feb 2022 15:38:08 +0000 (UTC) Received: from rh.Home (unknown [10.39.195.12]) by smtp.corp.redhat.com (Postfix) with ESMTP id 354C17E2F4; Mon, 21 Feb 2022 15:38:07 +0000 (UTC) From: Kevin Traynor To: Michael Baum Cc: Matan Azrad , dpdk stable Subject: patch 'common/mlx5: fix missing validation in devargs parsing' has been queued to stable release 21.11.1 Date: Mon, 21 Feb 2022 15:33:52 +0000 Message-Id: <20220221153625.152324-43-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/59f8d27b5f1522e88bae41e5d3d36cadeb5a9d20 Thanks. Kevin --- >From 59f8d27b5f1522e88bae41e5d3d36cadeb5a9d20 Mon Sep 17 00:00:00 2001 From: Michael Baum Date: Thu, 16 Dec 2021 20:40:40 +0200 Subject: [PATCH] common/mlx5: fix missing validation in devargs parsing [ upstream commit a1d59091a6b56ea8f22a9954b71070533d26d63a ] The rte_kvargs_parse function parses the arguments "key=value,key=value,..." string and return an allocated structure that contains a key/value list. It enables also to send a key without value and updates the values in the following ways: - "key=value,key,..." - value is updated as NULL. - "key=value,key=,..." - value is updated as "" (empty string). Mlx5 PMDs use this function to parse, but they don't support key without value. They send the value as an argument to strtol function. When strtol gets NULL as a parameter it cause a crash, when it gets "" (empty string) it returns 0. Adds a check that will prevent an argument in these formats, and returns an error for it. Fixes: 85209924039c ("common/mlx5: share memory related devargs") Signed-off-by: Michael Baum Acked-by: Matan Azrad --- drivers/common/mlx5/mlx5_common.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/drivers/common/mlx5/mlx5_common.c b/drivers/common/mlx5/mlx5_common.c index 22ff273819..185db4d004 100644 --- a/drivers/common/mlx5/mlx5_common.c +++ b/drivers/common/mlx5/mlx5_common.c @@ -112,4 +112,9 @@ mlx5_common_args_check_handler(const char *key, const char *val, void *opaque) signed long tmp; + if (val == NULL || *val == '\0') { + DRV_LOG(ERR, "Key %s is missing value.", key); + rte_errno = EINVAL; + return -rte_errno; + } errno = 0; tmp = strtol(val, NULL, 0); -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-02-21 15:22:45.578298081 +0000 +++ 0043-common-mlx5-fix-missing-validation-in-devargs-parsin.patch 2022-02-21 15:22:44.087704116 +0000 @@ -1 +1 @@ -From a1d59091a6b56ea8f22a9954b71070533d26d63a Mon Sep 17 00:00:00 2001 +From 59f8d27b5f1522e88bae41e5d3d36cadeb5a9d20 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit a1d59091a6b56ea8f22a9954b71070533d26d63a ] + @@ -23 +24,0 @@ -Cc: stable@dpdk.org