lkml.org 
[lkml]   [2012]   [Sep]   [28]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[ 151/262] NFS: return error from decode_getfh in decode open
    Date
    From: Greg KH <gregkh@linuxfoundation.org>

    3.5-stable review patch. If anyone has any objections, please let me know.

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

    From: Weston Andros Adamson <dros@netapp.com>

    commit 01913b49cf1dc6409a07dd2a4cc6af2e77f3c410 upstream.

    If decode_getfh failed, nfs4_xdr_dec_open would return 0 since the last
    decode_* call must have succeeded.

    Signed-off-by: Weston Andros Adamson <dros@netapp.com>
    Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    fs/nfs/nfs4xdr.c | 3 ++-
    1 file changed, 2 insertions(+), 1 deletion(-)

    --- a/fs/nfs/nfs4xdr.c
    +++ b/fs/nfs/nfs4xdr.c
    @@ -6262,7 +6262,8 @@ static int nfs4_xdr_dec_open(struct rpc_
    status = decode_open(xdr, res);
    if (status)
    goto out;
    - if (decode_getfh(xdr, &res->fh) != 0)
    + status = decode_getfh(xdr, &res->fh);
    + if (status)
    goto out;
    decode_getfattr(xdr, res->f_attr, res->server);
    out:



    \
     
     \ /
      Last update: 2012-09-28 22:01    [W:4.120 / U:0.088 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site