lkml.org 
[lkml]   [2011]   [Mar]   [30]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH] [126/275] nfsd: correctly handle return value from nfsd_map_name_to_*
    Date
    2.6.35-longterm review patch.  If anyone has any objections, please let me know.

    ------------------
    From: NeilBrown <neilb@suse.de>

    commit 47c85291d3dd1a51501555000b90f8e281a0458e upstream.

    These functions return an nfs status, not a host_err. So don't
    try to convert before returning.

    This is a regression introduced by
    3c726023402a2f3b28f49b9d90ebf9e71151157d; I fixed up two of the callers,
    but missed these two.

    Reported-by: Herbert Poetzl <herbert@13thfloor.at>
    Signed-off-by: NeilBrown <neilb@suse.de>
    Signed-off-by: J. Bruce Fields <bfields@redhat.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
    Signed-off-by: Andi Kleen <ak@linux.intel.com>

    ---
    fs/nfsd/nfs4xdr.c | 8 ++++----
    1 file changed, 4 insertions(+), 4 deletions(-)

    Index: linux-2.6.35.y/fs/nfsd/nfs4xdr.c
    ===================================================================
    --- linux-2.6.35.y.orig/fs/nfsd/nfs4xdr.c 2011-03-29 22:51:17.639271825 -0700
    +++ linux-2.6.35.y/fs/nfsd/nfs4xdr.c 2011-03-29 23:54:22.675422220 -0700
    @@ -316,8 +316,8 @@
    READ_BUF(dummy32);
    len += (XDR_QUADLEN(dummy32) << 2);
    READMEM(buf, dummy32);
    - if ((host_err = nfsd_map_name_to_uid(argp->rqstp, buf, dummy32, &iattr->ia_uid)))
    - goto out_nfserr;
    + if ((status = nfsd_map_name_to_uid(argp->rqstp, buf, dummy32, &iattr->ia_uid)))
    + return status;
    iattr->ia_valid |= ATTR_UID;
    }
    if (bmval[1] & FATTR4_WORD1_OWNER_GROUP) {
    @@ -327,8 +327,8 @@
    READ_BUF(dummy32);
    len += (XDR_QUADLEN(dummy32) << 2);
    READMEM(buf, dummy32);
    - if ((host_err = nfsd_map_name_to_gid(argp->rqstp, buf, dummy32, &iattr->ia_gid)))
    - goto out_nfserr;
    + if ((status = nfsd_map_name_to_gid(argp->rqstp, buf, dummy32, &iattr->ia_gid)))
    + return status;
    iattr->ia_valid |= ATTR_GID;
    }
    if (bmval[1] & FATTR4_WORD1_TIME_ACCESS_SET) {

    \
     
     \ /
      Last update: 2011-03-30 23:47    [W:0.019 / U:0.908 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site