lkml.org 
[lkml]   [2008]   [May]   [18]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5/6] vfs: fix ERR_PTR abuse in generic_readlink
    Date
    generic_readlink calls ERR_PTR for negative and positive values
    (vfs_readlink returns length of "link"), but it should not
    (not an errno) and does not need to.

    Signed-off-by: Marcin Slusarz <marcin.slusarz@gmail.com>
    Cc: Al Viro <viro@ZenIV.linux.org.uk>
    Cc: Andrew Morton <akpm@linux-foundation.org>
    Cc: Christoph Hellwig <hch@lst.de>
    ---
    fs/namei.c | 15 ++++++++-------
    1 files changed, 8 insertions(+), 7 deletions(-)

    diff --git a/fs/namei.c b/fs/namei.c
    index 32fd965..959523d 100644
    --- a/fs/namei.c
    +++ b/fs/namei.c
    @@ -2853,16 +2853,17 @@ int generic_readlink(struct dentry *dentry, char __user *buffer, int buflen)
    {
    struct nameidata nd;
    void *cookie;
    + int res;

    nd.depth = 0;
    cookie = dentry->d_inode->i_op->follow_link(dentry, &nd);
    - if (!IS_ERR(cookie)) {
    - int res = vfs_readlink(dentry, buffer, buflen, nd_get_link(&nd));
    - if (dentry->d_inode->i_op->put_link)
    - dentry->d_inode->i_op->put_link(dentry, &nd, cookie);
    - cookie = ERR_PTR(res);
    - }
    - return PTR_ERR(cookie);
    + if (IS_ERR(cookie))
    + return PTR_ERR(cookie);
    +
    + res = vfs_readlink(dentry, buffer, buflen, nd_get_link(&nd));
    + if (dentry->d_inode->i_op->put_link)
    + dentry->d_inode->i_op->put_link(dentry, &nd, cookie);
    + return res;
    }

    int vfs_follow_link(struct nameidata *nd, const char *link)
    --
    1.5.4.5


    \
     
     \ /
      Last update: 2008-05-19 00:07    [W:0.020 / U:33.532 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site