FAILED: patch "[PATCH] eventfs: Update all the eventfs_inodes from the events" failed to apply to 6.9-stable tree
Subsystems (2)
[email protected]
maintainerThe patch below does not apply to the 6.9-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.
To reproduce the conflict and resubmit, you may use the following commands:
git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-6.9.y
git checkout FETCH_HEAD
git cherry-pick -x 340f0c7067a95281ad13734f8225f49c6cf52067
# <resolve conflicts, build, test, etc.>
git commit -s
git send-email --to '<[email protected]>' --in-reply-to '2024061305-kilogram-handheld-7bd9@gregkh' --subject-prefix 'PATCH 6.9.y' HEAD^..
Possible dependencies:
340f0c7067a9 ("eventfs: Update all the eventfs_inodes from the events descriptor") 27c046484382 ("tracefs: Update inode permissions on remount")
thanks,
greg k-h
------------------ original commit in Linus's tree ------------------
From 340f0c7067a95281ad13734f8225f49c6cf52067 Mon Sep 17 00:00:00 2001
From: "Steven Rostedt (Google)" <[email protected]>
Date: Thu, 23 May 2024 01:14:28 -0400
Subject: [PATCH] eventfs: Update all the eventfs_inodes from the events
descriptor
The change to update the permissions of the eventfs_inode had the misconception that using the tracefs_inode would find all the eventfs_inodes that have been updated and reset them on remount. The problem with this approach is that the eventfs_inodes are freed when they are no longer used (basically the reason the eventfs system exists). When they are freed, the updated eventfs_inodes are not reset on a remount because their tracefs_inodes have been freed.
Instead, since the events directory eventfs_inode always has a tracefs_inode pointing to it (it is not freed when finished), and the events directory has a link to all its children, have the eventfs_remount() function only operate on the events eventfs_inode and have it descend into its children updating their uid and gids.
fs/tracefs/event_inode.c +43 -25
@@ -305,6 +305,45 @@ static const struct file_operations eventfs_file_operations = { .llseek = generic_file_llseek, }; +static void eventfs_set_attrs (struct eventfs_inode *ei,bool update_uid,kuid_t uid, +bool update_gid,kgid_t gid,int level) +{ +struct eventfs_inode *ei_child; + +/* Update events/<system>/<event> */ +if (WARN_ON_ONCE (level >3 )) +return ; + +if (update_uid) { + ei->attr.mode &= ~EVENTFS_SAVE_UID ; + ei->attr.uid = uid; + } + +if (update_gid) { + ei->attr.mode &= ~EVENTFS_SAVE_GID ; + ei->attr.gid = gid; + } + +list_for_each_entry (ei_child, &ei->children, list) { +eventfs_set_attrs (ei_child, update_uid, uid, update_gid, gid, level +1 ); + } + +if (!ei->entry_attrs) +return ; + +for (int i =0 ; i < ei->nr_entries; i++) { +if (update_uid) { + ei->entry_attrs[i].mode &= ~EVENTFS_SAVE_UID ; + ei->entry_attrs[i].uid = uid; + } +if (update_gid) { + ei->entry_attrs[i].mode &= ~EVENTFS_SAVE_GID ; + ei->entry_attrs[i].gid = gid; + } + } + +} +/* * On a remount of tracefs, if UID or GID options are set, then * the mount point inode permissions should be used.
@@ -314,33 +353,12 @@ void eventfs_remount(struct tracefs_inode *ti, bool update_uid, bool update_gid) {struct eventfs_inode *ei = ti->private; -if (!ei) +/* Only the events directory does the updates */ +if (!ei || !ei->is_events || ei->is_freed)return ; -if (update_uid) { - ei->attr.mode &= ~EVENTFS_SAVE_UID ; - ei->attr.uid = ti->vfs_inode.i_uid; - } - - -if (update_gid) { - ei->attr.mode &= ~EVENTFS_SAVE_GID ; - ei->attr.gid = ti->vfs_inode.i_gid; - } - -if (!ei->entry_attrs) -return ; - -for (int i =0 ; i < ei->nr_entries; i++) { -if (update_uid) { - ei->entry_attrs[i].mode &= ~EVENTFS_SAVE_UID ; - ei->entry_attrs[i].uid = ti->vfs_inode.i_uid; - } -if (update_gid) { - ei->entry_attrs[i].mode &= ~EVENTFS_SAVE_GID ; - ei->entry_attrs[i].gid = ti->vfs_inode.i_gid; - } - } +eventfs_set_attrs (ei, update_uid, ti->vfs_inode.i_uid, + update_gid, ti->vfs_inode.i_gid,0 ); }/* Return the evenfs_inode of the "events" directory */