Fixes for 6.6

Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/queue-6.6/eventfs-check-for-null-ef-in-eventfs_set_attr.patch b/queue-6.6/eventfs-check-for-null-ef-in-eventfs_set_attr.patch
new file mode 100644 (file)
index 0000000..12e8650
--- /dev/null
+++ b/queue-6.6/eventfs-check-for-null-ef-in-eventfs_set_attr.patch
@@ -0,0 +1,45 @@
+From b09e01e65478dbe961b3b78aa53c187f23e98860 Mon Sep 17 00:00:00 2001
+From: Sasha Levin <sashal@kernel.org>
+Date: Sun, 12 Nov 2023 12:18:17 -0500
+Subject: eventfs: Check for NULL ef in eventfs_set_attr()
+
+From: Steven Rostedt (Google) <rostedt@goodmis.org>
+
+The top level events directory dentry does not have a d_fsdata set to a
+eventfs_file pointer. This dentry is still passed to eventfs_set_attr().
+It can not assume that the d_fsdata is set. Check for that.
+
+Link: https://lore.kernel.org/all/20231112104158.6638-1-milian.wolff@kdab.com/
+
+Fixes: 9aaee3eebc91 ("eventfs: Save ownership and mode")
+Reported-by: Milian Wolff <milian.wolff@kdab.com>
+Signed-off-by: Steven Rostedt (Google) <rostedt@goodmis.org>
+Signed-off-by: Sasha Levin <sashal@kernel.org>
+---
+ fs/tracefs/event_inode.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/fs/tracefs/event_inode.c b/fs/tracefs/event_inode.c
+index 5fcfb634fec26..efbdc47c74dcf 100644
+--- a/fs/tracefs/event_inode.c
++++ b/fs/tracefs/event_inode.c
+@@ -113,14 +113,14 @@ static int eventfs_set_attr(struct mnt_idmap *idmap, struct dentry *dentry,
+ 
+       mutex_lock(&eventfs_mutex);
+       ef = dentry->d_fsdata;
+-      if (ef->is_freed) {
++      if (ef && ef->is_freed) {
+               /* Do not allow changes if the event is about to be removed. */
+               mutex_unlock(&eventfs_mutex);
+               return -ENODEV;
+       }
+ 
+       ret = simple_setattr(idmap, dentry, iattr);
+-      if (!ret)
++      if (!ret && ef)
+               update_attr(ef, iattr);
+       mutex_unlock(&eventfs_mutex);
+       return ret;
+-- 
+2.42.0
+

diff --git a/queue-6.6/series b/queue-6.6/series
index a88a6a49701a1f0d303bc1a9731d2be68fb5c0fe..3944eb9041bed8815d4844da4157f73e3fd8f7f2 100644 (file)
--- a/queue-6.6/series
+++ b/queue-6.6/series
@@ -592,3 +592,4 @@ fbdev-imsttfb-fix-a-resource-leak-in-probe.patch
 alsa-hda-realtek-add-support-dual-speaker-for-dell.patch
 fbdev-fsl-diu-fb-mark-wr_reg_wa-static.patch
 tracing-kprobes-fix-the-order-of-argument-descriptio.patch
+eventfs-check-for-null-ef-in-eventfs_set_attr.patch