From patchwork Tue Apr 8 15:40:57 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: henry martin X-Patchwork-Id: 14043216 Received: from mail-pf1-f195.google.com (mail-pf1-f195.google.com [209.85.210.195]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 9DA451DF25D; Tue, 8 Apr 2025 15:41:15 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.195 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744126877; cv=none; b=g11S1BGznRZD72Ugh1ZhAN/sk+FEdH5IkBjQdD+0Fd7Lat5eHZ2/Sq6ZQ+1VKRBjk6ktJBRUsGLpAMqIKWDRIIm4bvec/f4frKhDXaJQWEF4DzV22EN54kkPN/87KwsxEdWpmsGZh+QUhAMFImBQdeO428kbHITau3SILQT/Vmw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744126877; c=relaxed/simple; bh=CwFvouOcMGbJiXPigqcG2tvrWy96fvvain5XmZN6xNU=; h=From:To:Cc:Subject:Date:Message-Id:MIME-Version; b=obX7Yo64Ca492dPYt5r/pnydIKHMfo1DOxs9x6laviRNvntkjeiPN1SYarEm7EGOFWBSyaHAQ1FZnwgur+xoSzWgPILR9GXuYHpOVSvfiQzTY0po4/6NISAacbeRn8P+e55K+tbZ2hfZcOBRUicUW8igYRBskcjxYHjLxU5Ji5I= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=d8BNHqLW; arc=none smtp.client-ip=209.85.210.195 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="d8BNHqLW" Received: by mail-pf1-f195.google.com with SMTP id d2e1a72fcca58-736aa9d0f2aso6898359b3a.0; Tue, 08 Apr 2025 08:41:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1744126875; x=1744731675; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=zIP7O+L0GWF5h6fH8tWvOWW0zj8g7F6NDPpcbQe96VY=; b=d8BNHqLWZdCz5o2Z6nfuUDtKa7umgtu/omMgPQJpdZyMycbV9kBIBMXWESAvpErd9m NCqKV+XiDUqU/QvRWn6/IugrXfV9MM7qF7LtaBxm9MZKmLK2RhGys9fvJze3l6chRYQh l78oOiSjktj1GXwc6ra8l1JkWGJMgdWQR1EaBCOL0rowsYdPxg0AUMoFJ7Qzsbu0RSMb BkW7O9q7Rx8fbDOWFaOcdwMt1Ly8Q1qmu+OXGrqsXDjjn9bPsy9rGQeWXzk6nYCpAnVc fMXP+9cd6c4Ol1BPbKycKGom5cqbl4ieS45WAOycyS206cazC5hEZ26dTab5MejqwMw2 xIyg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1744126875; x=1744731675; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=zIP7O+L0GWF5h6fH8tWvOWW0zj8g7F6NDPpcbQe96VY=; b=ozKqbZXSyGAmEQOa+jl9Osx3XEihDa0I4uhXLKSZSQbDDFUHh1JCoErr4iOykVEGlF sy18Qh0nWC0lMaedZRoa58hdHW0WTgz6MszVtChtI6WtW57MewAij50F7k1FOkB6B0ol KI1uusKx+Yxvb0jIN+ITNdCH/3VhZr6C4kC2TOC03W3zSnkAkbzjgZRm+sXiaiqXk491 H0e99H5kkRh7L1Shk8TEKk7GK5sjdDCYHmtP/aLP2GHdGGPgC7HhSyTWI+yW8oOEOJyN 2xs3i8YXFdVwOUaMsBqQqICvEf2hfSuUXUW4n+YfbRzZlJH+t4Pw7OES+UK4cfnkidwV U+Ag== X-Forwarded-Encrypted: i=1; AJvYcCUh/QukDmCO5yOhHj4z37W/MuFB2ApF5q6IlCWL1kCHKBKanZeH6EtcC1LyKX+mHfwjHZgjtADbvqcD60Q=@vger.kernel.org, AJvYcCWhz8ilnjg+LIf1NzzNuS8CWnF1oN3e/NRBsaOnkd5eUOtMYx1ll+P1hPDeAw8Rh1rzk74lJodf@vger.kernel.org, AJvYcCWvgJM8VfuRNG1gkW8P76hS7frsKVsgt67aP81RJHqSI7/zIVxlCqBuT/KuW9nfcanAXCjLI2qK4/3gsQ==@vger.kernel.org X-Gm-Message-State: AOJu0YzXjHA7Vjv/rRe0CxarS6PZ8sRmdUoZZa8w2jx9Sd63l8k8dxMr TrWJoVuGqb0OktfMGQtVskp3u0uZuo/pLqIbVQGa7IgwcV035oSi X-Gm-Gg: ASbGncsGnU4dnIZTfkgNDWr+ox+pC9ihOPE8NA7sZS1InSSxBBf9ZWJfpz9+09dIoYA MgEd63FWbZ98CxQ+alJBlilxdapeufG/2uli84vEROEdb3G0K2f+xVXAozKFqOogtBvgsfu3359 hamQFp/+hMgv5v+zhte/3U17ICI1R/Vcx+j3rP8ezv34aohaDG2VqGckeNp14KfN1woxrVUe5wF zALY7ivLE4/vpNQQlbc+/TsXEDwK4M6kB3hARAW15J45Ysa7OiM3jy2HKNaz2RKeiRvygzv8RXd vYaZ4i/CRTgzQ93AqSf58FDUxWHjkPwUR+c0kFksIL2/R0vyQSzK9vl72q5g51Cb9KJMqEWzH1c RwjWe4g== X-Google-Smtp-Source: AGHT+IGzH/KgjCNprLiAa8KWid5DQQA3OpAQODsnoJel0kiFMY2trzGd268PdEhkaQYmv0bGdERikA== X-Received: by 2002:a05:6a00:2393:b0:736:52d7:daca with SMTP id d2e1a72fcca58-73b6b8c3084mr16648031b3a.18.1744126874752; Tue, 08 Apr 2025 08:41:14 -0700 (PDT) Received: from henry.localdomain ([111.202.148.133]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-739d97ee2ccsm10716421b3a.47.2025.04.08.08.41.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 08 Apr 2025 08:41:14 -0700 (PDT) From: Henry Martin To: saeedm@nvidia.com, leon@kernel.org, tariqt@nvidia.com, andrew+netdev@lunn.ch, davem@davemloft.net, edumazet@google.com, kuba@kernel.org, pabeni@redhat.com Cc: ayal@nvidia.com, amirtz@nvidia.com, bsdhenrymartin@gmail.com, netdev@vger.kernel.org, linux-rdma@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v2 1/2] net/mlx5: Fix null-ptr-deref in mlx5_create_inner_ttc_table() Date: Tue, 8 Apr 2025 23:40:57 +0800 Message-Id: <20250408154058.106668-1-bsdhenrymartin@gmail.com> X-Mailer: git-send-email 2.34.1 Precedence: bulk X-Mailing-List: linux-rdma@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Add NULL check for mlx5_get_flow_namespace() returns in mlx5_create_inner_ttc_table() to prevent NULL pointer dereference. Fixes: 137f3d50ad2a ("net/mlx5: Support matching on l4_type for ttc_table") Signed-off-by: Henry Martin --- V1 -> V2: Add a empty line after the return statement. drivers/net/ethernet/mellanox/mlx5/core/lib/fs_ttc.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/net/ethernet/mellanox/mlx5/core/lib/fs_ttc.c b/drivers/net/ethernet/mellanox/mlx5/core/lib/fs_ttc.c index eb3bd9c7f66e..ecf4b60ddd96 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/lib/fs_ttc.c +++ b/drivers/net/ethernet/mellanox/mlx5/core/lib/fs_ttc.c @@ -655,6 +655,9 @@ struct mlx5_ttc_table *mlx5_create_inner_ttc_table(struct mlx5_core_dev *dev, } ns = mlx5_get_flow_namespace(dev, params->ns_type); + if (!ns) + return ERR_PTR(-EOPNOTSUPP); + groups = use_l4_type ? &inner_ttc_groups[TTC_GROUPS_USE_L4_TYPE] : &inner_ttc_groups[TTC_GROUPS_DEFAULT]; From patchwork Tue Apr 8 15:40:58 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: henry martin X-Patchwork-Id: 14043217 Received: from mail-pl1-f193.google.com (mail-pl1-f193.google.com [209.85.214.193]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id C8BAD1DF25D; Tue, 8 Apr 2025 15:41:28 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.193 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744126890; cv=none; b=l3PAOgr4v+C1CBaQGWTe4OtQjOY3T9FpGlLMCmVOdkxikuCv9JPG4lYjWkOeo3LM7eR5GS4KOYa7SjjpbA+ENl0eKHZWDJslCqf60BO3HB/gEPPOv/EFifRim89XPD/1frSW477QjMgD4SJhOcg1I2zdImtnU6SxaEAxyRmeQwQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744126890; c=relaxed/simple; bh=tSycdtxUn2SnFn93UKolDSVqcWtOU8gRYiHdvQN/Nxg=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=FsiGMFsC6Gx+v3jzmWcsHJuqfD4MD87rWl++25sz5/qbVPlhPEimskyYjXRswIW4Mk6ghL6S6SFjpH8GvPCo3k/n7Htb8r8N+wJFg6decx8TOY/wxm4EIGuzeNYiGVNrcUtg45VpnnrzYStvVWYZwzS/barYC9PfapgUxReVjQ4= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=IY/8wk+v; arc=none smtp.client-ip=209.85.214.193 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="IY/8wk+v" Received: by mail-pl1-f193.google.com with SMTP id d9443c01a7336-22928d629faso58477925ad.3; Tue, 08 Apr 2025 08:41:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1744126888; x=1744731688; darn=vger.kernel.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=LiK+o2X3g5Wh0QWpG/DW1Ih1AAmlnS338Opfl58No9I=; b=IY/8wk+vZavNVk/88ZYc1TXYmRN1R9uxMbhIltP6oNQXEKyLSw9VFOg5yIIhGaidO6 orbNhP1Y2b/MCUaJ753DLNDr+VH78ZRHsUDFrzfKBpClgiFV0LGVrpLpo+7qgrClxKGj V5QO551G8znlKRnoQXMZ+nCx/4XGvbeJF0GTtel7+QDbq6sIQIbxhQ4vQVpsi8C4sQXk /zDLf1YubKBe7H5uPogaeGbt7yLqO6ulULST9hAP8e1HXh7rizpq6IADXH8FP+TTvShS vMfNtLtUwDYRuEWhvNqn6BQtBuUDe0uD8n7mmDrYhHmNEaJw/pCn3Rwg9WnJrpAwQ+AJ Owow== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1744126888; x=1744731688; 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=LiK+o2X3g5Wh0QWpG/DW1Ih1AAmlnS338Opfl58No9I=; b=a5cSgtDXTBDdLiLNlX2q3LM2hEqaY3II0utQH9HhPQNYOy2G9sskeWss0TDtMahssJ F7Zfx9o259snxKY8Nc43G0yxNWPUv9nGPbsHoHNCC3W3trkdQqlsD+nIgMcVpgcHbIQX m9YYhk/JSnvsqJ9w+JTtvjif//+dskQmMWt7o3oJbUlpYnyuLYSzGP70jH1PSBiJApgo 9bmWhhbJOZefhjEXJJoh4ELGYZmQwSCXQx4Mivmb4a7r/7bkYWcO0gRkKrzlX7D+IyRI 98pNx6/7T20TIaqXJ9f9s5Zc5aRTxpc07rgwzn2ic/9bSAU/eozhaGA9oY+gg3jdtqBp evBQ== X-Forwarded-Encrypted: i=1; AJvYcCURq+T++C/9iJokMk8PmMmjXaluBg6y/q+4UJRBmdE/r1ntP4ToqO+Utzf/Fj2A8nLthV5CWL4h@vger.kernel.org, AJvYcCVo1RMAO/kNXvU8A0mR9uHOCDDOIijjIFU/Wo5nwogG4mOVAevemYTKgKBXldS1AUyiAYXjQRCEQ05/yw==@vger.kernel.org, AJvYcCXezHuPNIg35T7qa8kZdV3z04rY8ylQCwdeWqUodNSqeBTb4LYp7NDcArwqx7Xn7QFQz1Cer56n+BTJvBA=@vger.kernel.org X-Gm-Message-State: AOJu0YwDW8eOydsbcmYrv8su9RkcEcq07tuGEjfOypZP/rq6iyDOsRXt dXr3M9xDBP9tERhlxu8AaYwXfWgkAKW7JWjeGucqAxD73Fi/uAns X-Gm-Gg: ASbGncunDiYeF0I98UKijbDYslAQJdRnZIF7v6XVXkDm9KVCam491+v74i2tJAXc1P3 D4pXFeNNiqJ/YgvC4I1tu95cUQd3ec9M+0U546JINuKwuj8a2XumFZ+P/tWB1GYO3dr4TLvt0L8 yS0KB7MMUPvtyuw8UN6+LZ8TfZg538CLQOXMDXPPRBZLSEGzW25MERwaoVJjMRr9wnIAVOK0PbH EyyTJs7t6ENfkaqXIODP4Ly6R6yYMDBoqWpThpZ2hAJNXCQSzqSAA19gHA+ZyTtMp4nt/W0Vh9F 6asSGhWJ57JrSdDZM9A7mPcxdvs0PAAHsVNRIgs1pmOqkd1oDLKTy5HANVZI3LRh/mhQ8zg= X-Google-Smtp-Source: AGHT+IEojOrLNISDWuLBlpZjgXDz9SwHn3hGon6AO/8an5d4j15WKBgXzjJSyS8kWFZ19CpZrOP5fw== X-Received: by 2002:a17:902:d507:b0:220:da88:2009 with SMTP id d9443c01a7336-22a8a8e400cmr234304545ad.45.1744126887922; Tue, 08 Apr 2025 08:41:27 -0700 (PDT) Received: from henry.localdomain ([111.202.148.133]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-739d97ee2ccsm10716421b3a.47.2025.04.08.08.41.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 08 Apr 2025 08:41:27 -0700 (PDT) From: Henry Martin To: saeedm@nvidia.com, leon@kernel.org, tariqt@nvidia.com, andrew+netdev@lunn.ch, davem@davemloft.net, edumazet@google.com, kuba@kernel.org, pabeni@redhat.com Cc: ayal@nvidia.com, amirtz@nvidia.com, bsdhenrymartin@gmail.com, netdev@vger.kernel.org, linux-rdma@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v2 2/2] net/mlx5: Fix null-ptr-deref in mlx5_create_ttc_table() Date: Tue, 8 Apr 2025 23:40:58 +0800 Message-Id: <20250408154058.106668-2-bsdhenrymartin@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250408154058.106668-1-bsdhenrymartin@gmail.com> References: <20250408154058.106668-1-bsdhenrymartin@gmail.com> Precedence: bulk X-Mailing-List: linux-rdma@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Add NULL check for mlx5_get_flow_namespace() returns in mlx5_create_ttc_table() to prevent NULL pointer dereference. Fixes: 137f3d50ad2a ("net/mlx5: Support matching on l4_type for ttc_table") Signed-off-by: Henry Martin --- V1 -> V2: Add a empty line after the return statement. drivers/net/ethernet/mellanox/mlx5/core/lib/fs_ttc.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/net/ethernet/mellanox/mlx5/core/lib/fs_ttc.c b/drivers/net/ethernet/mellanox/mlx5/core/lib/fs_ttc.c index ecf4b60ddd96..18cc6960a5c1 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/lib/fs_ttc.c +++ b/drivers/net/ethernet/mellanox/mlx5/core/lib/fs_ttc.c @@ -731,6 +731,9 @@ struct mlx5_ttc_table *mlx5_create_ttc_table(struct mlx5_core_dev *dev, } ns = mlx5_get_flow_namespace(dev, params->ns_type); + if (!ns) + return ERR_PTR(-EOPNOTSUPP); + groups = use_l4_type ? &ttc_groups[TTC_GROUPS_USE_L4_TYPE] : &ttc_groups[TTC_GROUPS_DEFAULT];