lkml.org 
[lkml]   [2024]   [Feb]   [6]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[v6.7][PATCH v2 14/23] eventfs: Initialize the tracefs inode properly
    From: Linus Torvalds <torvalds@linux-foundation.org>

    The tracefs-specific fields in the inode were not initialized before the
    inode was exposed to others through the dentry with 'd_instantiate()'.

    Move the field initializations up to before the d_instantiate.

    Link: https://lore.kernel.org/linux-trace-kernel/20240131185512.478449628@goodmis.org

    Cc: stable@vger.kernel.org
    Cc: Masami Hiramatsu <mhiramat@kernel.org>
    Cc: Mark Rutland <mark.rutland@arm.com>
    Cc: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
    Cc: Christian Brauner <brauner@kernel.org>
    Cc: Al Viro <viro@ZenIV.linux.org.uk>
    Cc: Ajay Kaher <ajay.kaher@broadcom.com>
    Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    Fixes: 5790b1fb3d672 ("eventfs: Remove eventfs_file and just use eventfs_inode")
    Reported-by: kernel test robot <oliver.sang@intel.com>
    Closes: https://lore.kernel.org/oe-lkp/202401291043.e62e89dc-oliver.sang@intel.com
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
    Signed-off-by: Steven Rostedt (Google) <rostedt@goodmis.org>
    (cherry picked from commit 4fa4b010b83fb2f837b5ef79e38072a79e96e4f1)
    ---
    fs/tracefs/event_inode.c | 6 ++----
    1 file changed, 2 insertions(+), 4 deletions(-)

    diff --git a/fs/tracefs/event_inode.c b/fs/tracefs/event_inode.c
    index 1c3dd0ad4660..824b1811e342 100644
    --- a/fs/tracefs/event_inode.c
    +++ b/fs/tracefs/event_inode.c
    @@ -370,6 +370,8 @@ static struct dentry *create_dir(struct eventfs_inode *ei, struct dentry *parent

    ti = get_tracefs(inode);
    ti->flags |= TRACEFS_EVENT_INODE;
    + /* Only directories have ti->private set to an ei, not files */
    + ti->private = ei;

    inc_nlink(inode);
    d_instantiate(dentry, inode);
    @@ -515,7 +517,6 @@ create_file_dentry(struct eventfs_inode *ei, int idx,
    static void eventfs_post_create_dir(struct eventfs_inode *ei)
    {
    struct eventfs_inode *ei_child;
    - struct tracefs_inode *ti;

    lockdep_assert_held(&eventfs_mutex);

    @@ -525,9 +526,6 @@ static void eventfs_post_create_dir(struct eventfs_inode *ei)
    srcu_read_lock_held(&eventfs_srcu)) {
    ei_child->d_parent = ei->dentry;
    }
    -
    - ti = get_tracefs(ei->dentry->d_inode);
    - ti->private = ei;
    }

    /**
    --
    2.43.0


    \
     
     \ /
      Last update: 2024-05-27 14:50    [W:2.533 / U:0.028 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site