lkml.org 
[lkml]   [2012]   [Aug]   [7]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[ 089/122] nfsd4: fix cr_principal comparison check in same_creds
    Date
    From: Greg KH <gregkh@linuxfoundation.org>

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

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

    From: Vivek Trivedi <vtrivedi018@gmail.com>

    commit 5559b50acdcdcad7e362882d3261bf934c9436f6 upstream.

    This fixes a wrong check for same cr_principal in same_creds

    Introduced by 8fbba96e5b327665265ad02b7f331b68536828bf "nfsd4: stricter
    cred comparison for setclientid/exchange_id".

    Signed-off-by: Vivek Trivedi <vtrivedi018@gmail.com>
    Signed-off-by: Namjae Jeon <linkinjeon@gmail.com>
    Signed-off-by: J. Bruce Fields <bfields@redhat.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

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

    --- a/fs/nfsd/nfs4state.c
    +++ b/fs/nfsd/nfs4state.c
    @@ -1215,7 +1215,7 @@ static bool groups_equal(struct group_in
    return true;
    }

    -static int
    +static bool
    same_creds(struct svc_cred *cr1, struct svc_cred *cr2)
    {
    if ((cr1->cr_flavor != cr2->cr_flavor)
    @@ -1227,7 +1227,7 @@ same_creds(struct svc_cred *cr1, struct
    return true;
    if (!cr1->cr_principal || !cr2->cr_principal)
    return false;
    - return 0 == strcmp(cr1->cr_principal, cr1->cr_principal);
    + return 0 == strcmp(cr1->cr_principal, cr2->cr_principal);
    }

    static void gen_clid(struct nfs4_client *clp)



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