lkml.org 
[lkml]   [2012]   [Mar]   [30]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[ 156/175] NFSv4: Fix two infinite loops in the mount code
    3.3-stable review patch.  If anyone has any objections, please let me know.

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

    From: Trond Myklebust <Trond.Myklebust@netapp.com>

    commit 05e9cfb408b24debb3a85fd98edbfd09dd148881 upstream.

    We can currently loop forever in nfs4_lookup_root() and in
    nfs41_proc_secinfo_no_name(), if the first iteration returns a
    NFS4ERR_DELAY or something else that causes exception.retry to get
    set.

    Reported-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/nfs4proc.c | 6 ++++--
    1 file changed, 4 insertions(+), 2 deletions(-)

    --- a/fs/nfs/nfs4proc.c
    +++ b/fs/nfs/nfs4proc.c
    @@ -2249,11 +2249,12 @@ static int nfs4_lookup_root(struct nfs_s
    switch (err) {
    case 0:
    case -NFS4ERR_WRONGSEC:
    - break;
    + goto out;
    default:
    err = nfs4_handle_exception(server, err, &exception);
    }
    } while (exception.retry);
    +out:
    return err;
    }

    @@ -6068,11 +6069,12 @@ nfs41_proc_secinfo_no_name(struct nfs_se
    case 0:
    case -NFS4ERR_WRONGSEC:
    case -NFS4ERR_NOTSUPP:
    - break;
    + goto out;
    default:
    err = nfs4_handle_exception(server, err, &exception);
    }
    } while (exception.retry);
    +out:
    return err;
    }




    \
     
     \ /
      Last update: 2012-03-30 23:35    [W:0.044 / U:30.064 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site