lkml.org 
[lkml]   [2018]   [Feb]   [15]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.15 002/202] cifs: Fix missing put_xid in cifs_file_strict_mmap
    Date
    4.15-stable review patch.  If anyone has any objections, please let me know.

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

    From: Matthew Wilcox <mawilcox@microsoft.com>

    commit f04a703c3d613845ae3141bfaf223489de8ab3eb upstream.

    If cifs_zap_mapping() returned an error, we would return without putting
    the xid that we got earlier. Restructure cifs_file_strict_mmap() and
    cifs_file_mmap() to be more similar to each other and have a single
    point of return that always puts the xid.

    Signed-off-by: Matthew Wilcox <mawilcox@microsoft.com>
    Signed-off-by: Steve French <smfrench@gmail.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    fs/cifs/file.c | 26 ++++++++++++--------------
    1 file changed, 12 insertions(+), 14 deletions(-)

    --- a/fs/cifs/file.c
    +++ b/fs/cifs/file.c
    @@ -3471,20 +3471,18 @@ static const struct vm_operations_struct

    int cifs_file_strict_mmap(struct file *file, struct vm_area_struct *vma)
    {
    - int rc, xid;
    + int xid, rc = 0;
    struct inode *inode = file_inode(file);

    xid = get_xid();

    - if (!CIFS_CACHE_READ(CIFS_I(inode))) {
    + if (!CIFS_CACHE_READ(CIFS_I(inode)))
    rc = cifs_zap_mapping(inode);
    - if (rc)
    - return rc;
    - }
    -
    - rc = generic_file_mmap(file, vma);
    - if (rc == 0)
    + if (!rc)
    + rc = generic_file_mmap(file, vma);
    + if (!rc)
    vma->vm_ops = &cifs_file_vm_ops;
    +
    free_xid(xid);
    return rc;
    }
    @@ -3494,16 +3492,16 @@ int cifs_file_mmap(struct file *file, st
    int rc, xid;

    xid = get_xid();
    +
    rc = cifs_revalidate_file(file);
    - if (rc) {
    + if (rc)
    cifs_dbg(FYI, "Validation prior to mmap failed, error=%d\n",
    rc);
    - free_xid(xid);
    - return rc;
    - }
    - rc = generic_file_mmap(file, vma);
    - if (rc == 0)
    + if (!rc)
    + rc = generic_file_mmap(file, vma);
    + if (!rc)
    vma->vm_ops = &cifs_file_vm_ops;
    +
    free_xid(xid);
    return rc;
    }

    \
     
     \ /
      Last update: 2018-02-15 18:03    [W:4.154 / U:0.208 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site