From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (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 9A82934389C; Thu, 28 May 2026 20:45:42 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780001143; cv=none; b=uwq2sP0eeIW8rB7qVyfBFahW2jAtVGDWnfkg5EZFrrXW8SBKBchSvIs4KiVGih6B+gXGMe8fAMWAzG24Q9YIaVz9bSFfjv/CoGJgvzXHOMSUcFtvpk8wVTFhyrpwOPsKF2EhJgVU20x333IS4Kn6kJXCP6rweJ0UxdkRRztGDng= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780001143; c=relaxed/simple; bh=KlpiRfdjXcZr013jpCn5afZ++iu20FcOUDv4LAjD3m8=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=DpTrB2b+myA3eifA4xCeKvBf7t4mZsNNP0whSMP5aMHL6Tcp0CcT/RVc6tviWADY4AqMWOPRmJzgtywhUSnhthssSbAKGxKWYvbM3VYhxvtXoSsdb1iliN7dtAClUVCO0LZtXMKFVqKkh98fru9V7KlR6wzrFejIgxnCNiaByw4= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=uWxJyWgQ; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="uWxJyWgQ" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 02D251F00A3A; Thu, 28 May 2026 20:45:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1780001142; bh=O4vURmqey4i+0JiiCILpGSlzd1sCNFtNvA0L2ATfcbU=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=uWxJyWgQ2YvxYJr1T1F/MThekw2YnxME5JB2gDSh/R/O4xG2Y0gF6CO85pMnwmM4f xSUIQSrlVhwjSDeKv3ncFICQONUcSqLM4WcW3DmVRVjNLxOEs4b4BnxLzYtISFs4CV ChnSo3t3KW8BTaxa7FDatryeWF3asnDUhYA5UnRQ= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Rajat Jain , stable , "Rafael J. Wysocki (Intel)" , Danilo Krummrich Subject: [PATCH 6.6 022/186] sysfs: dont remove existing directory on update failure Date: Thu, 28 May 2026 21:48:22 +0200 Message-ID: <20260528194929.559182681@linuxfoundation.org> X-Mailer: git-send-email 2.54.0 In-Reply-To: <20260528194928.941004471@linuxfoundation.org> References: <20260528194928.941004471@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.6-stable review patch. If anyone has any objections, please let me know. ------------------ From: Greg Kroah-Hartman commit 237557b8a81ab948e8332f7c0058e758f081c0a3 upstream. When sysfs_update_group() is called for a named group and create_files() fails (e.g. -ENOMEM), internal_create_group() calls kernfs_remove(kn) on the group directory. In the update path, kn was obtained via kernfs_find_and_get() and refers to a directory that already existed before this call. Removing it silently destroys a sysfs group that the caller did not create. Only remove the directory if we created it ourselves. On update failure the directory remains as it is left empty by remove_files() inside create_files(), but can be repopulated by a retry. Cc: Rajat Jain Fixes: c855cf2759d2 ("sysfs: Fix internal_create_group() for named group updates") Cc: stable Assisted-by: gkh_clanker_t1000 Reviewed-by: Rafael J. Wysocki (Intel) Reviewed-by: Danilo Krummrich Link: https://patch.msgid.link/2026052003-uniquely-hastily-c093@gregkh Signed-off-by: Greg Kroah-Hartman --- fs/sysfs/group.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/fs/sysfs/group.c +++ b/fs/sysfs/group.c @@ -151,7 +151,7 @@ static int internal_create_group(struct kernfs_get(kn); error = create_files(kn, kobj, uid, gid, grp, update); if (error) { - if (grp->name) + if (grp->name && !update) kernfs_remove(kn); } kernfs_put(kn);