lkml.org 
[lkml]   [2020]   [Jul]   [1]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 10/23] integrity/ima: switch to using __kernel_read
    Date
    __kernel_read has a bunch of additional sanity checks, and this moves
    the set_fs out of non-core code.

    Signed-off-by: Christoph Hellwig <hch@lst.de>
    ---
    security/integrity/iint.c | 14 +-------------
    1 file changed, 1 insertion(+), 13 deletions(-)

    diff --git a/security/integrity/iint.c b/security/integrity/iint.c
    index e12c4900510f60..1d20003243c3fb 100644
    --- a/security/integrity/iint.c
    +++ b/security/integrity/iint.c
    @@ -188,19 +188,7 @@ DEFINE_LSM(integrity) = {
    int integrity_kernel_read(struct file *file, loff_t offset,
    void *addr, unsigned long count)
    {
    - mm_segment_t old_fs;
    - char __user *buf = (char __user *)addr;
    - ssize_t ret;
    -
    - if (!(file->f_mode & FMODE_READ))
    - return -EBADF;
    -
    - old_fs = get_fs();
    - set_fs(KERNEL_DS);
    - ret = __vfs_read(file, buf, count, &offset);
    - set_fs(old_fs);
    -
    - return ret;
    + return __kernel_read(file, addr, count, &offset);
    }

    /*
    --
    2.26.2
    \
     
     \ /
      Last update: 2020-07-01 22:23    [W:4.414 / U:0.072 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site