lkml.org 
[lkml]   [2016]   [Aug]   [21]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3.10 144/180] ecryptfs: don't allow mmap when the lower fs doesn't support it
    Date
    From: Jeff Mahoney <jeffm@suse.com>

    commit f0fe970df3838c202ef6c07a4c2b36838ef0a88b upstream.

    There are legitimate reasons to disallow mmap on certain files, notably
    in sysfs or procfs. We shouldn't emulate mmap support on file systems
    that don't offer support natively.

    CVE-2016-1583

    Signed-off-by: Jeff Mahoney <jeffm@suse.com>
    [tyhicks: clean up f_op check by using ecryptfs_file_to_lower()]
    Signed-off-by: Tyler Hicks <tyhicks@canonical.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    Signed-off-by: Willy Tarreau <w@1wt.eu>
    ---
    fs/ecryptfs/file.c | 15 ++++++++++++++-
    1 file changed, 14 insertions(+), 1 deletion(-)

    diff --git a/fs/ecryptfs/file.c b/fs/ecryptfs/file.c
    index 9ff3664..d4644cc 100644
    --- a/fs/ecryptfs/file.c
    +++ b/fs/ecryptfs/file.c
    @@ -183,6 +183,19 @@ out:
    return rc;
    }

    +static int ecryptfs_mmap(struct file *file, struct vm_area_struct *vma)
    +{
    + struct file *lower_file = ecryptfs_file_to_lower(file);
    + /*
    + * Don't allow mmap on top of file systems that don't support it
    + * natively. If FILESYSTEM_MAX_STACK_DEPTH > 2 or ecryptfs
    + * allows recursive mounting, this will need to be extended.
    + */
    + if (!lower_file->f_op->mmap)
    + return -ENODEV;
    + return generic_file_mmap(file, vma);
    +}
    +
    /**
    * ecryptfs_open
    * @inode: inode speciying file to open
    @@ -358,7 +371,7 @@ const struct file_operations ecryptfs_main_fops = {
    #ifdef CONFIG_COMPAT
    .compat_ioctl = ecryptfs_compat_ioctl,
    #endif
    - .mmap = generic_file_mmap,
    + .mmap = ecryptfs_mmap,
    .open = ecryptfs_open,
    .flush = ecryptfs_flush,
    .release = ecryptfs_release,
    --
    2.8.0.rc2.1.gbe9624a
    \
     
     \ /
      Last update: 2016-09-17 09:57    [W:4.038 / U:0.076 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site