lkml.org 
[lkml]   [2016]   [Sep]   [22]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.7 090/184] devpts: return NULL pts priv entry for non-devpts nodes
    Date
    4.7-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Linus Torvalds <torvalds@linux-foundation.org>

    commit 3e423945ea94412283eaba8bfbe9d6e0a80b434f upstream.

    In commit 8ead9dd54716 ("devpts: more pty driver interface cleanups") I
    made devpts_get_priv() just return the dentry->fs_data directly. And
    because I thought it wouldn't happen, I added a warning if you ever saw
    a pts node that wasn't on devpts.

    And no, that warning never triggered under any actual real use, but you
    can trigger it by creating nonsensical pts nodes by hand.

    So just revert the warning, and make devpts_get_priv() return NULL for
    that case like it used to.

    Reported-by: Dmitry Vyukov <dvyukov@google.com>
    Cc: "Eric W Biederman" <ebiederm@xmission.com>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    fs/devpts/inode.c | 3 ++-
    1 file changed, 2 insertions(+), 1 deletion(-)

    --- a/fs/devpts/inode.c
    +++ b/fs/devpts/inode.c
    @@ -584,7 +584,8 @@ struct dentry *devpts_pty_new(struct pts
    */
    void *devpts_get_priv(struct dentry *dentry)
    {
    - WARN_ON_ONCE(dentry->d_sb->s_magic != DEVPTS_SUPER_MAGIC);
    + if (dentry->d_sb->s_magic != DEVPTS_SUPER_MAGIC)
    + return NULL;
    return dentry->d_fsdata;
    }


    \
     
     \ /
      Last update: 2016-09-23 00:04    [W:3.753 / U:0.008 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site