lkml.org 
[lkml]   [2018]   [Mar]   [8]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH AUTOSEL for 4.9 186/190] nfsd4: permit layoutget of executable-only files
    Date
    From: Benjamin Coddington <bcodding@redhat.com>

    [ Upstream commit 66282ec1cf004c09083c29cb5e49019037937bbd ]

    Clients must be able to read a file in order to execute it, and for pNFS
    that means the client needs to be able to perform a LAYOUTGET on the file.

    This behavior for executable-only files was added for OPEN in commit
    a043226bc140 "nfsd4: permit read opens of executable-only files".

    This fixes up xfstests generic/126 on block/scsi layouts.

    Signed-off-by: Benjamin Coddington <bcodding@redhat.com>
    Signed-off-by: J. Bruce Fields <bfields@redhat.com>
    Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
    ---
    fs/nfsd/nfs4proc.c | 6 +++---
    1 file changed, 3 insertions(+), 3 deletions(-)

    diff --git a/fs/nfsd/nfs4proc.c b/fs/nfsd/nfs4proc.c
    index 022d95886d66..eef0caf6e67d 100644
    --- a/fs/nfsd/nfs4proc.c
    +++ b/fs/nfsd/nfs4proc.c
    @@ -1338,14 +1338,14 @@ nfsd4_layoutget(struct svc_rqst *rqstp,
    const struct nfsd4_layout_ops *ops;
    struct nfs4_layout_stateid *ls;
    __be32 nfserr;
    - int accmode;
    + int accmode = NFSD_MAY_READ_IF_EXEC;

    switch (lgp->lg_seg.iomode) {
    case IOMODE_READ:
    - accmode = NFSD_MAY_READ;
    + accmode |= NFSD_MAY_READ;
    break;
    case IOMODE_RW:
    - accmode = NFSD_MAY_READ | NFSD_MAY_WRITE;
    + accmode |= NFSD_MAY_READ | NFSD_MAY_WRITE;
    break;
    default:
    dprintk("%s: invalid iomode %d\n",
    --
    2.14.1
    \
     
     \ /
      Last update: 2018-03-08 06:48    [W:4.075 / U:0.404 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site