From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 9D73D5474F for ; Sat, 14 Feb 2026 01:49:26 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1771033766; cv=none; b=SDQ/cv9I6GBdEyQWZ2F5bZLyKrkQq+5hffJ02Otbxd4sApi/bQUbPdAabkjGhn5WjWkXOEDEag4/yl+PqOTH8zvumMmfsC0MUmlwbwpbXcVECq7ErDBg+PtxcsnkiWTBLdgRUK+pmajr2CgsJY9kWxsODSwv4atqispmzEv5Pq0= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1771033766; c=relaxed/simple; bh=HFWh0/6Ca1MZO9qIa1wj4J5dJVV1TpuKjTzBSEprzpA=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=ObYy8NhCJeqUOmRfsbFK88LG/6Eet+kwTbiWsJFTECwKt+8vYu9VEa7/CfVOivW09K9p66PEAcETN3qTo5H7vRDz+8cqMXd3eEW6qfbvyqPzClRgd9rD5FNX9nnOzseDIuTekIQ49MB1oYKeMCC8FYVR2YJzjrylcX22f5onZzk= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=imXThll3; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="imXThll3" Received: by smtp.kernel.org (Postfix) with ESMTPSA id BBF17C16AAE; Sat, 14 Feb 2026 01:49:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1771033766; bh=HFWh0/6Ca1MZO9qIa1wj4J5dJVV1TpuKjTzBSEprzpA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=imXThll3kcMjoFAV1PuXn74zxhRdkR1JMFdwlQ0MMhDHZwmfFV9QPr9xNfuYl68FD qHWwZ7TAn/GZcuZ8Tl3zA6MVoLiDHHKqkEBj84+0dZzfU+FRX5jCRAmw6P31JpGyqS mXdfHb/moN5n3KAWoTzaRWvEkIEM0v5PNup2pOf++cMkF8KDSaTec/6RL7JBxX+S9S pGykwc5KN12HiTYm3gp8xXoEy5d56CYwhcG4PUUJYjeYYqJE3FIqoyz3/iv+hGMkSr liyJW2yWeU+tIreZByRuk3TXQRKtGWauPEO7AIX4YSlSwkF0iVPtjQnMoUzmSl0kio vkEJjNjfDYFRQ== From: Sasha Levin To: stable@vger.kernel.org Cc: Liu Song , Manivannan Sadhasivam , Bjorn Helgaas , stable@kernel.org, Sasha Levin Subject: [PATCH 6.6.y 2/2] PCI: endpoint: Avoid creating sub-groups asynchronously Date: Fri, 13 Feb 2026 20:49:23 -0500 Message-ID: <20260214014923.3899226-2-sashal@kernel.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20260214014923.3899226-1-sashal@kernel.org> References: <2026021303-salt-retread-63e7@gregkh> <20260214014923.3899226-1-sashal@kernel.org> Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: Liu Song [ Upstream commit 7c5c7d06bd1f86d2c3ebe62be903a4ba42db4d2c ] The asynchronous creation of sub-groups by a delayed work could lead to a NULL pointer dereference when the driver directory is removed before the work completes. The crash can be easily reproduced with the following commands: # cd /sys/kernel/config/pci_ep/functions/pci_epf_test # for i in {1..20}; do mkdir test && rmdir test; done BUG: kernel NULL pointer dereference, address: 0000000000000088 ... Call Trace: configfs_register_group+0x3d/0x190 pci_epf_cfs_work+0x41/0x110 process_one_work+0x18f/0x350 worker_thread+0x25a/0x3a0 Fix this issue by using configfs_add_default_group() API which does not have the deadlock problem as configfs_register_group() and does not require the delayed work handler. Fixes: e85a2d783762 ("PCI: endpoint: Add support in configfs to associate two EPCs with EPF") Signed-off-by: Liu Song [mani: slightly reworded the description and added stable list] Signed-off-by: Manivannan Sadhasivam Signed-off-by: Bjorn Helgaas Cc: stable@kernel.org Link: https://patch.msgid.link/20250710143845409gLM6JdlwPhlHG9iX3F6jK@zte.com.cn Signed-off-by: Sasha Levin --- drivers/pci/endpoint/pci-ep-cfs.c | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/drivers/pci/endpoint/pci-ep-cfs.c b/drivers/pci/endpoint/pci-ep-cfs.c index a2b81a64fcd11..c28c3f094496a 100644 --- a/drivers/pci/endpoint/pci-ep-cfs.c +++ b/drivers/pci/endpoint/pci-ep-cfs.c @@ -23,7 +23,6 @@ struct pci_epf_group { struct config_group group; struct config_group primary_epc_group; struct config_group secondary_epc_group; - struct delayed_work cfs_work; struct pci_epf *epf; int index; }; @@ -100,7 +99,7 @@ static struct config_group secondary_epc_group = &epf_group->secondary_epc_group; config_group_init_type_name(secondary_epc_group, "secondary", &pci_secondary_epc_type); - configfs_register_group(&epf_group->group, secondary_epc_group); + configfs_add_default_group(secondary_epc_group, &epf_group->group); return secondary_epc_group; } @@ -160,7 +159,7 @@ static struct config_group config_group_init_type_name(primary_epc_group, "primary", &pci_primary_epc_type); - configfs_register_group(&epf_group->group, primary_epc_group); + configfs_add_default_group(primary_epc_group, &epf_group->group); return primary_epc_group; } @@ -561,15 +560,13 @@ static void pci_ep_cfs_add_type_group(struct pci_epf_group *epf_group) return; } - configfs_register_group(&epf_group->group, group); + configfs_add_default_group(group, &epf_group->group); } -static void pci_epf_cfs_work(struct work_struct *work) +static void pci_epf_cfs_add_sub_groups(struct pci_epf_group *epf_group) { - struct pci_epf_group *epf_group; struct config_group *group; - epf_group = container_of(work, struct pci_epf_group, cfs_work.work); group = pci_ep_cfs_add_primary_group(epf_group); if (IS_ERR(group)) { pr_err("failed to create 'primary' EPC interface\n"); @@ -628,9 +625,7 @@ static struct config_group *pci_epf_make(struct config_group *group, kfree(epf_name); - INIT_DELAYED_WORK(&epf_group->cfs_work, pci_epf_cfs_work); - queue_delayed_work(system_wq, &epf_group->cfs_work, - msecs_to_jiffies(1)); + pci_epf_cfs_add_sub_groups(epf_group); return &epf_group->group; -- 2.51.0