From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-wr1-f41.google.com (mail-wr1-f41.google.com [209.85.221.41]) (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 C7F6737B02B for ; Mon, 4 May 2026 22:07:43 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.221.41 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777932465; cv=none; b=LiLlSf54HX4Ik3NgaJ8YQYU1/a/O/vEJYNa1xhkuGXOK3eyfJTYmQD9rlbyVCmgJAhcImxtEXqDVZnjYSXqqa9bJQxv54SdmIVtxX+SkGAEokcKBR8H/1iWpawU8ltKqGOxqhnFBKgLtAmdSA3prxaFy3t9NFanPRIVT6ChgktA= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777932465; c=relaxed/simple; bh=QMnG8lNMPjiWCPP9V8fm1Uvfmgn4efv6jtSMg58pV+Y=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=TTjeQgnA0ztlnpbRlOVsVCXRXmcOqEfj+2OruWGTze60Mh8cYiqZGOHbH6zUtmCe6zW2l6O8qtAHmAR8/aWWfaal+GM7r3FXmgc8XExZ5uBKxWj8+rCRYkC++dJSQzKfuvtoLddqMD4eZ7QsDN8oa2kfXfGCNkRx4z0FC1kGY50= 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=mR+z0bc0; arc=none smtp.client-ip=209.85.221.41 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="mR+z0bc0" Received: by mail-wr1-f41.google.com with SMTP id ffacd0b85a97d-43fe608cb92so2685370f8f.2 for ; Mon, 04 May 2026 15:07:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1777932462; x=1778537262; 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=T2EAcQpFApLkE9tQqBTkW5v5GHoiaZ1e/P1wsvwgU1U=; b=mR+z0bc0KGVZu/d2HU46TVlE8dsyJn+vwLG3e2eeotorCHZZmJw+QDpY/Dd5DuQO5g D/vM8+I7yQLq3Rzx6K9xuIVimsVOyvWfujHtJaK215b0HBgv2R1Y3yDNsvTazs6w72Qz kxlKgsuKEHj0fl98wmTMwghNH90vkVRqkihaLoCfeKHiJ6g06OkD5HkyCDpqOjTbhZlg tYzRVLlUjy986KzHi5HVM67e42Fin5uBXO7mU1bwJ1HjfY8irmum9lUdWk/IO6+0LhW3 sckAHxQv0Ven5hWIs1ErV/jQSFDlRfZpwIOsg5b08CmWux9JZzISdtTgzZoh3JXkARhH HfDA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1777932462; x=1778537262; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-gg:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=T2EAcQpFApLkE9tQqBTkW5v5GHoiaZ1e/P1wsvwgU1U=; b=GF8UXE9cxqiIgKKhC+MUfQVpuTQnbwRqYHdrh49ENYGQCsEoa+JjfBScsaV9rkECQv Myr96i8Xt1P4TkOOZW3fJeGCdH9NKbV4/OJJIVcVAXTuR1zSh8Kr1uljXpoFl4JkZHjn pgqP2ria71fEcSx5HKqcjg1qZ/NcLqiH2SC8fBW3KYJOUdlMbZBSYQO/BbpaI+9IIV/F p9TP7j/xZEcTb3qrJKOy5xkMdO/pygQh3GYI/FrkJhoQmgnAieWbCoxzjCa4FXfj0Nr6 VQZ/tLqSUBiIyy2ZOEJiJXdNZxx4ubhCkMn2kvDnInJP9p3kO55Jz7TaLYhHhQYg3bSV m+Ww== X-Forwarded-Encrypted: i=1; AFNElJ/h+E4vUiZLH1lPpp6C50RNWmhhT3pk7ogw3bv46BsyYAwDYCZwaBBFpu4+pnDsC9c5OxLjrnHh6ABnYGQ=@vger.kernel.org X-Gm-Message-State: AOJu0YytvJZ9c8V9CXyHZGP5B1NOI6sBkJdnHjCShOnk1B78pxiECUbp FNC2le76uRN9sES5B8Oc5YvabnDr5N0hSVpPDTHpI5axiLgS0pqJiHv1 X-Gm-Gg: AeBDievUnko6ut/dIdGB/naIlfhjUdtxW/SirBD84zg252nAdb0iamtBjluMni3gfz+ lclmGzKlYkOqqTS9wb47ke7aE7SonTtq9dE08fBRwbKZjosQ7tH1vSAl4MClsX0CkXZCLBcnOtn XcGXneT94EZrX3ft21wJOocu2t2KQNVVR4ISLplCk5PeqFhPCgrDuMW0fvaWmLhIc7p4UDMfXR0 zTy9e+3ncPhDVANjIV8IXHWv0cEZ9d6VM91z5GXUYo42+CI+3bwmI0V92O3fDXKTlEyktHsr3ri jMYpxav9JXV+zzXyzQXal5DO8xgmsWIeaClQwuK3nPjU8OF5/cD1yeGjsLMpQpOBF1cA26fIAoD KZ6idNv02Mvp2i4P2T93LiF3B3kwoQAhztdRsp5D88Eh/k5SPstE6N0xvmzIrkUp1iH6XlQB3X8 2GWBQyiatcaXQCbByvfJMNtj9oYdNDdBBuOYppAnRFItFuiLkIAhD40LSvCjoUk1hEuXzygs3N9 nyZ96sY2D4gnKPoslR5Zy2XmI24L3MJG+HdscD8Xg== X-Received: by 2002:a05:6000:18a5:b0:44b:ad5a:cd33 with SMTP id ffacd0b85a97d-44bb66d6302mr18061645f8f.40.1777932462036; Mon, 04 May 2026 15:07:42 -0700 (PDT) Received: from SD.localdomain (heme-13-b2-v4wan-167795-cust403.vm32.cable.virginm.net. [81.108.45.148]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-4502c011043sm329503f8f.32.2026.05.04.15.07.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 04 May 2026 15:07:41 -0700 (PDT) From: Prathamesh Deshpande To: Saeed Mahameed , Leon Romanovsky Cc: Moshe Shemesh , Tariq Toukan , Yevgeny Kliteynik , Jakub Kicinski , netdev@vger.kernel.org, linux-rdma@vger.kernel.org, linux-kernel@vger.kernel.org, Prathamesh Deshpande Subject: [PATCH net v1] net/mlx5: Fix HWS action unwind NULL dereference Date: Mon, 4 May 2026 23:06:46 +0100 Message-ID: <20260504220725.46686-1-prathameshdeshpande7@gmail.com> X-Mailer: git-send-email 2.43.0 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit mlx5_fs_fte_get_hws_actions() stores some destination actions in fs_actions[] before checking whether action creation succeeded. If creating a table-number or range destination action fails, or if fetching a sampler destination action fails, dest_action is NULL but num_fs_actions has already been incremented. The shared error path then calls mlx5_fs_destroy_fs_action(), which dereferences fs_action->action to get the HWS action type, causing a NULL pointer dereference while unwinding the original failure. Track whether the current destination action needs fs_actions[] cleanup, but append it only after dest_action has been validated. Fixes: 2ec6786ad0a6b ("net/mlx5: fs, add HWS fte API functions") Fixes: 32e658c84b6d ("net/mlx5: fs, add support for dest flow sampler HWS action") Signed-off-by: Prathamesh Deshpande --- .../mellanox/mlx5/core/steering/hws/fs_hws.c | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/drivers/net/ethernet/mellanox/mlx5/core/steering/hws/fs_hws.c b/drivers/net/ethernet/mellanox/mlx5/core/steering/hws/fs_hws.c index aca77853abb8..fb12513dd83d 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/steering/hws/fs_hws.c +++ b/drivers/net/ethernet/mellanox/mlx5/core/steering/hws/fs_hws.c @@ -950,6 +950,7 @@ static int mlx5_fs_fte_get_hws_actions(struct mlx5_flow_root_namespace *ns, struct mlx5_flow_destination *attr = &dst->dest_attr; bool type_uplink = attr->type == MLX5_FLOW_DESTINATION_TYPE_UPLINK; + bool record_fs_action = false; if (num_fs_actions == MLX5_FLOW_CONTEXT_ACTION_MAX || num_dest_actions == MLX5_FLOW_CONTEXT_ACTION_MAX) { @@ -973,11 +974,11 @@ static int mlx5_fs_fte_get_hws_actions(struct mlx5_flow_root_namespace *ns, break; dest_action = mlx5_fs_create_dest_action_table_num(fs_ctx, dst); - fs_actions[num_fs_actions++].action = dest_action; + record_fs_action = true; break; case MLX5_FLOW_DESTINATION_TYPE_RANGE: dest_action = mlx5_fs_create_dest_action_range(ctx, dst); - fs_actions[num_fs_actions++].action = dest_action; + record_fs_action = true; break; case MLX5_FLOW_DESTINATION_TYPE_UPLINK: case MLX5_FLOW_DESTINATION_TYPE_VPORT: @@ -988,9 +989,7 @@ static int mlx5_fs_fte_get_hws_actions(struct mlx5_flow_root_namespace *ns, dest_action = mlx5_fs_get_dest_action_sampler(fs_ctx, dst); - fs_actions[num_fs_actions].action = dest_action; - fs_actions[num_fs_actions++].sampler_id = - dst->dest_attr.sampler_id; + record_fs_action = true; break; default: err = -EOPNOTSUPP; @@ -1000,6 +999,13 @@ static int mlx5_fs_fte_get_hws_actions(struct mlx5_flow_root_namespace *ns, err = -ENOMEM; goto free_actions; } + if (record_fs_action) { + fs_actions[num_fs_actions].action = dest_action; + if (attr->type == MLX5_FLOW_DESTINATION_TYPE_FLOW_SAMPLER) + fs_actions[num_fs_actions].sampler_id = + dst->dest_attr.sampler_id; + num_fs_actions++; + } dest_actions[num_dest_actions++].dest = dest_action; } } -- 2.43.0