lkml.org 
[lkml]   [2020]   [Apr]   [15]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH AUTOSEL 5.6 034/129] NFS: alloc_nfs_open_context() must use the file cred when available
    Date
    From: Trond Myklebust <trond.myklebust@hammerspace.com>

    [ Upstream commit 1d179d6bd67369a52edea8562154b31ee20be1cc ]

    If we're creating a nfs_open_context() for a specific file pointer,
    we must use the cred assigned to that file.

    Fixes: a52458b48af1 ("NFS/NFSD/SUNRPC: replace generic creds with 'struct cred'.")
    Signed-off-by: Trond Myklebust <trond.myklebust@hammerspace.com>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    fs/nfs/inode.c | 10 +++++-----
    1 file changed, 5 insertions(+), 5 deletions(-)

    diff --git a/fs/nfs/inode.c b/fs/nfs/inode.c
    index 11bf15800ac99..a10fb87c6ac33 100644
    --- a/fs/nfs/inode.c
    +++ b/fs/nfs/inode.c
    @@ -959,16 +959,16 @@ struct nfs_open_context *alloc_nfs_open_context(struct dentry *dentry,
    struct file *filp)
    {
    struct nfs_open_context *ctx;
    - const struct cred *cred = get_current_cred();

    ctx = kmalloc(sizeof(*ctx), GFP_KERNEL);
    - if (!ctx) {
    - put_cred(cred);
    + if (!ctx)
    return ERR_PTR(-ENOMEM);
    - }
    nfs_sb_active(dentry->d_sb);
    ctx->dentry = dget(dentry);
    - ctx->cred = cred;
    + if (filp)
    + ctx->cred = get_cred(filp->f_cred);
    + else
    + ctx->cred = get_current_cred();
    ctx->ll_cred = NULL;
    ctx->state = NULL;
    ctx->mode = f_mode;
    --
    2.20.1
    \
     
     \ /
      Last update: 2020-04-15 15:16    [W:4.184 / U:0.008 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site