lkml.org 
[lkml]   [2021]   [Nov]   [15]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.14 771/849] seq_file: fix passing wrong private data
    Date
    From: Muchun Song <songmuchun@bytedance.com>

    [ Upstream commit 10a6de19cad6efb9b49883513afb810dc265fca2 ]

    DEFINE_PROC_SHOW_ATTRIBUTE() is supposed to be used to define a series
    of functions and variables to register proc file easily. And the users
    can use proc_create_data() to pass their own private data and get it
    via seq->private in the callback. Unfortunately, the proc file system
    use PDE_DATA() to get private data instead of inode->i_private. So fix
    it. Fortunately, there only one user of it which does not pass any
    private data, so this bug does not break any in-tree codes.

    Link: https://lkml.kernel.org/r/20211029032638.84884-1-songmuchun@bytedance.com
    Fixes: 97a32539b956 ("proc: convert everything to "struct proc_ops"")
    Signed-off-by: Muchun Song <songmuchun@bytedance.com>
    Cc: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
    Cc: Stephen Rothwell <sfr@canb.auug.org.au>
    Cc: Florent Revest <revest@chromium.org>
    Cc: Alexey Dobriyan <adobriyan@gmail.com>
    Cc: Christian Brauner <christian.brauner@ubuntu.com>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    include/linux/seq_file.h | 2 +-
    1 file changed, 1 insertion(+), 1 deletion(-)

    diff --git a/include/linux/seq_file.h b/include/linux/seq_file.h
    index dd99569595fd3..5733890df64f5 100644
    --- a/include/linux/seq_file.h
    +++ b/include/linux/seq_file.h
    @@ -194,7 +194,7 @@ static const struct file_operations __name ## _fops = { \
    #define DEFINE_PROC_SHOW_ATTRIBUTE(__name) \
    static int __name ## _open(struct inode *inode, struct file *file) \
    { \
    - return single_open(file, __name ## _show, inode->i_private); \
    + return single_open(file, __name ## _show, PDE_DATA(inode)); \
    } \
    \
    static const struct proc_ops __name ## _proc_ops = { \
    --
    2.33.0


    \
     
     \ /
      Last update: 2021-11-16 00:40    [W:2.634 / U:0.624 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site