lkml.org 
[lkml]   [2020]   [May]   [28]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 6/6] readdir.c: get rid of the last __put_user(), drop now-useless access_ok()
    Date
    From: Al Viro <viro@zeniv.linux.org.uk>

    Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
    ---
    fs/readdir.c | 11 +----------
    1 file changed, 1 insertion(+), 10 deletions(-)

    diff --git a/fs/readdir.c b/fs/readdir.c
    index 9534675880ce..a49f07c11cfb 100644
    --- a/fs/readdir.c
    +++ b/fs/readdir.c
    @@ -276,9 +276,6 @@ SYSCALL_DEFINE3(getdents, unsigned int, fd,
    };
    int error;

    - if (!access_ok(dirent, count))
    - return -EFAULT;
    -
    f = fdget_pos(fd);
    if (!f.file)
    return -EBADF;
    @@ -362,9 +359,6 @@ int ksys_getdents64(unsigned int fd, struct linux_dirent64 __user *dirent,
    };
    int error;

    - if (!access_ok(dirent, count))
    - return -EFAULT;
    -
    f = fdget_pos(fd);
    if (!f.file)
    return -EBADF;
    @@ -377,7 +371,7 @@ int ksys_getdents64(unsigned int fd, struct linux_dirent64 __user *dirent,
    typeof(lastdirent->d_off) d_off = buf.ctx.pos;

    lastdirent = (void __user *) buf.current_dir - buf.prev_reclen;
    - if (__put_user(d_off, &lastdirent->d_off))
    + if (put_user(d_off, &lastdirent->d_off))
    error = -EFAULT;
    else
    error = count - buf.count;
    @@ -537,9 +531,6 @@ COMPAT_SYSCALL_DEFINE3(getdents, unsigned int, fd,
    };
    int error;

    - if (!access_ok(dirent, count))
    - return -EFAULT;
    -
    f = fdget_pos(fd);
    if (!f.file)
    return -EBADF;
    --
    2.11.0
    \
     
     \ /
      Last update: 2020-05-29 01:50    [W:4.122 / U:0.060 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site