Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5559b50a authored by Vivek Trivedi's avatar Vivek Trivedi Committed by J. Bruce Fields
Browse files

nfsd4: fix cr_principal comparison check in same_creds 



This fixes a wrong check for same cr_principal in same_creds

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

Cc: stable@vger.kernel.org
Signed-off-by: default avatarVivek Trivedi <vtrivedi018@gmail.com>
Signed-off-by: default avatarNamjae Jeon <linkinjeon@gmail.com>
Signed-off-by: default avatarJ. Bruce Fields <bfields@redhat.com>
parent 200724a7

fs/nfsd/nfs4state.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -1221,7 +1221,7 @@ static bool groups_equal(struct group_info *g1, struct group_info *g2) 
	return true;

	return true;

}

}





static int

static bool

same_creds(struct svc_cred *cr1, struct svc_cred *cr2)

same_creds(struct svc_cred *cr1, struct svc_cred *cr2)

{

{

	if ((cr1->cr_flavor != cr2->cr_flavor)

	if ((cr1->cr_flavor != cr2->cr_flavor)
@@ -1233,7 +1233,7 @@ same_creds(struct svc_cred *cr1, struct svc_cred *cr2) 
		return true;

		return true;

	if (!cr1->cr_principal || !cr2->cr_principal)

	if (!cr1->cr_principal || !cr2->cr_principal)

		return false;

		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)

static void gen_clid(struct nfs4_client *clp)