diff options
| author | Vivek Trivedi <vtrivedi018@gmail.com> | 2012-07-24 21:18:20 +0530 |
|---|---|---|
| committer | J. Bruce Fields <bfields@redhat.com> | 2012-07-25 09:05:30 -0400 |
| commit | 5559b50acdcdcad7e362882d3261bf934c9436f6 (patch) | |
| tree | a6debec42b71d76d7b2f86482b579edd092afb26 /fs/nfsd | |
| parent | 200724a7074281e7a0bf1101784a59fecddfa77d (diff) | |
| download | linux-3.10-5559b50acdcdcad7e362882d3261bf934c9436f6.tar.gz linux-3.10-5559b50acdcdcad7e362882d3261bf934c9436f6.tar.bz2 linux-3.10-5559b50acdcdcad7e362882d3261bf934c9436f6.zip | |
nfsd4: fix cr_principal comparison check in same_creds
This fixes a wrong check for same cr_principal in same_creds
Introduced by 8fbba96e5b327665265ad02b7f331b68536828bf "nfsd4: stricter
cred comparison for setclientid/exchange_id".
Cc: stable@vger.kernel.org
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>
Diffstat (limited to 'fs/nfsd')
| -rw-r--r-- | fs/nfsd/nfs4state.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c index e404fca0826..fe96015fbfc 100644 --- a/fs/nfsd/nfs4state.c +++ b/fs/nfsd/nfs4state.c @@ -1221,7 +1221,7 @@ static bool groups_equal(struct group_info *g1, struct group_info *g2) return true; } -static int +static bool same_creds(struct svc_cred *cr1, struct svc_cred *cr2) { if ((cr1->cr_flavor != cr2->cr_flavor) @@ -1233,7 +1233,7 @@ same_creds(struct svc_cred *cr1, struct svc_cred *cr2) 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) |