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 D589B46A9C for ; Mon, 30 Jun 2025 14:26:19 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id D0D2540656; Mon, 30 Jun 2025 14:26:19 +0200 (CEST) Received: from mail-wm1-f54.google.com (mail-wm1-f54.google.com [209.85.128.54]) by mails.dpdk.org (Postfix) with ESMTP id 17FF34025D for ; Mon, 30 Jun 2025 14:26:17 +0200 (CEST) Received: by mail-wm1-f54.google.com with SMTP id 5b1f17b1804b1-451e2f0d9c2so30085095e9.1 for ; Mon, 30 Jun 2025 05:26:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1751286377; x=1751891177; darn=dpdk.org; 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=j1SvXFUV4X3mUeMgC2bPW2Lj817fb6GeWUoht6+hZSE=; b=gqpPFWErfyAXzP9F42GMPysddpVGNdbx0FooYHsDGTNXuvBoi8TWTvlcbzjn6vb6zx guspI8Vvkb1027uo96cgo9JjjFEeaVvGunkqTT2yjxpBwhkOXh8CEJzQa5CxelHf3T+R ZTirSnC1NZmOXHHmDwvaaBKBCNF+ruUbvYnTixS8lgXnKAxLvIVJLgPTk+1QtC/o0llZ Y1vFup3ejA8Ygp0tjmuosyGnv/qP702h1ds2v/d9zJv2BcYhjH5po1y+G+eTAMlLFjRe tIK2G1J5YCMJYWdE1EXXTMfplERMS5BNrlk/qJcbxalnlZd0vrQ1Zds3TwfzDedjxQ7Z 9r3Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1751286377; x=1751891177; 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=j1SvXFUV4X3mUeMgC2bPW2Lj817fb6GeWUoht6+hZSE=; b=nU8HpSxz+bU/XDZXSG6PZExmBNF/3MoFWSXTZeddCi1Gvezpj6EnhTzYdkfPU1NuC8 et7FXge+8Q5Holoiff7BJBNI2WXWew9h/5ZHuxapi/YfAhntdW4AthWuEesTznqaNKG6 5xV6IAYJTNLgFwMR2NmwOMxXHCLiyMn8uxStD4H0mnBB/K+ZVzk6J3wteUOgNPltWDuh GZOkzmxBSc0f+lT7jgHHUv0pYXqyZGmqQIMYlUySTFIojQwl/vFfhk8LipYkMTsb5noq Hhz0vu5XJN/hsHyQ493kx/Dmmdu94O7rgCUNf6vBxG6XyQ/24ffnMxFJ93w48AfTojUY emUA== X-Gm-Message-State: AOJu0YwzBRbEkTDmdUhmVNv0HEToBhPS3SAW/7Q7rgxqH+hMDCV97UP6 niGcW69261B8TEvNGQtNlxfHWySsxsuETGjtb1bs8kn1XNhsCPOf68af X-Gm-Gg: ASbGncsWcSLEcCXWeXKlWpitqEQHYzD7Orcyt22BE29uxv/Ouja1H8EEgk20aFA2zdU zpFrAlZ8mfYZQ8G5bEdDrkWxYC8QpwQfSHcAatYOxBKT/KFgXQ7qj+meZGM3g6ndbMugfNmFNbL g9An8ZhIOuBlFAoECXQqUlm42maCDtmSiaK1UtztnFzmT6KSMQuS1HamTOqhJ8oyRFc9KdBflR5 sirMxi4ga2A3LVcEcyjDHl6At3PxjaMSIERU60R9TpYQ+H9SKE2BjCaDN/CRwDWTfvIk/HEBAtF k/6ZTUlp637L55U1JupOxL9X7cm3WRgfazML4lY1Y8E32rpNioKGLMvEIg/ozSOKXeM= X-Google-Smtp-Source: AGHT+IG7UN992swNzCMGqWwJ1bEXVQwyYjfCzz5pStjGKZF7GHPpJ94XV0dMOdrCvnI3VUof3Wx2/w== X-Received: by 2002:a05:600c:a10e:b0:441:d228:3a07 with SMTP id 5b1f17b1804b1-45388a03dd1mr134864185e9.13.1751286376251; Mon, 30 Jun 2025 05:26:16 -0700 (PDT) Received: from localhost ([2a01:4b00:d036:ae00:ded1:f637:68f:c2a6]) by smtp.gmail.com with UTF8SMTPSA id ffacd0b85a97d-3a88c8013fesm10459567f8f.38.2025.06.30.05.26.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 30 Jun 2025 05:26:15 -0700 (PDT) From: luca.boccassi@gmail.com To: Rahul Bhansali Cc: dpdk stable Subject: patch 'common/cnxk: fix null pointer checks' has been queued to stable release 22.11.9 Date: Mon, 30 Jun 2025 13:25:37 +0100 Message-ID: <20250630122556.1133654-7-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.47.2 In-Reply-To: <20250630122556.1133654-1-luca.boccassi@gmail.com> References: <20250612210733.2506558-72-luca.boccassi@gmail.com> <20250630122556.1133654-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 22.11.9 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 07/02/25. 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/8a9907fdd54b083bbf8f3648568ef1b6fcc5d354 Thanks. Luca Boccassi --- >From 8a9907fdd54b083bbf8f3648568ef1b6fcc5d354 Mon Sep 17 00:00:00 2001 From: Rahul Bhansali Date: Mon, 23 Jun 2025 10:19:07 +0530 Subject: [PATCH] common/cnxk: fix null pointer checks [ upstream commit bba99bb88c4f2bf3391ade016d808b27a8a17a19 ] Adds null pointer check before executing CPT instruction. Fixes: 4d00b8c6a331 ("common/cnxk: allocate dynamic BPIDs") Fixes: 4af4e36a93d7 ("common/cnxk: support inline device API without ROC NIX") Signed-off-by: Rahul Bhansali --- drivers/common/cnxk/roc_nix_inl.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/common/cnxk/roc_nix_inl.c b/drivers/common/cnxk/roc_nix_inl.c index 15fec65d93..163c875a73 100644 --- a/drivers/common/cnxk/roc_nix_inl.c +++ b/drivers/common/cnxk/roc_nix_inl.c @@ -1253,7 +1253,7 @@ roc_nix_inl_sa_sync(struct roc_nix *roc_nix, void *sa, bool inb, if (idev) inl_dev = idev->nix_inl_dev; - if (!inl_dev && roc_nix == NULL) + if ((!inl_dev && roc_nix == NULL) || sa == NULL) return -EINVAL; if (roc_nix) { @@ -1316,7 +1316,7 @@ roc_nix_inl_ctx_write(struct roc_nix *roc_nix, void *sa_dptr, void *sa_cptr, if (idev) inl_dev = idev->nix_inl_dev; - if (!inl_dev && roc_nix == NULL) + if ((!inl_dev && roc_nix == NULL) || sa_dptr == NULL || sa_cptr == NULL) return -EINVAL; if (roc_nix) { -- 2.47.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2025-06-30 13:21:22.050251771 +0100 +++ 0007-common-cnxk-fix-null-pointer-checks.patch 2025-06-30 13:21:21.743057270 +0100 @@ -1 +1 @@ -From bba99bb88c4f2bf3391ade016d808b27a8a17a19 Mon Sep 17 00:00:00 2001 +From 8a9907fdd54b083bbf8f3648568ef1b6fcc5d354 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit bba99bb88c4f2bf3391ade016d808b27a8a17a19 ] + @@ -10 +11,0 @@ -Cc: stable@dpdk.org @@ -14,2 +15,2 @@ - drivers/common/cnxk/roc_nix_inl.c | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) + drivers/common/cnxk/roc_nix_inl.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) @@ -18 +19 @@ -index bee8e25c7c..c7637ddbdc 100644 +index 15fec65d93..163c875a73 100644 @@ -21,10 +22 @@ -@@ -1312,7 +1312,7 @@ static int - nix_inl_legacy_inb_init(struct roc_nix *roc_nix) - { - struct nix *nix = roc_nix_to_nix_priv(roc_nix); -- struct roc_cpt_inline_ipsec_inb_cfg cfg; -+ struct roc_cpt_inline_ipsec_inb_cfg cfg = {0}; - struct idev_cfg *idev = idev_get_cfg(); - uint16_t bpids[ROC_NIX_MAX_BPID_CNT]; - struct roc_cpt *roc_cpt; -@@ -2219,7 +2219,7 @@ roc_nix_inl_sa_sync(struct roc_nix *roc_nix, void *sa, bool inb, +@@ -1253,7 +1253,7 @@ roc_nix_inl_sa_sync(struct roc_nix *roc_nix, void *sa, bool inb, @@ -39 +31 @@ -@@ -2299,7 +2299,7 @@ roc_nix_inl_ctx_write(struct roc_nix *roc_nix, void *sa_dptr, void *sa_cptr, +@@ -1316,7 +1316,7 @@ roc_nix_inl_ctx_write(struct roc_nix *roc_nix, void *sa_dptr, void *sa_cptr,