Unverified Commit 7f557359 authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!14363 CVE-2024-53217 

Merge Pull Request from: @ci-robot 
 
PR sync from: Li Lingfeng <lilingfeng3@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/AT3F57KEOGW3KQFNQAPYFUH46AEGHYHR/ 
Chuck Lever (1):
  NFSD: Prevent NULL dereference in nfsd4_process_cb_update()

NeilBrown (1):
  nfsd: restore callback functionality for NFSv4.0


-- 
2.31.1
 
https://gitee.com/src-openeuler/kernel/issues/IBEAET 
 
Link:https://gitee.com/openeuler/kernel/pulls/14363

 

Reviewed-by: default avatarLi Nan <linan122@huawei.com>
Signed-off-by: default avatarLi Nan <linan122@huawei.com>
parents 55bf638d 23396191

fs/nfsd/nfs4callback.c

+1 −1
Original line number Diff line number Diff line
@@ -915,7 +915,7 @@ static int setup_callback_client(struct nfs4_client *clp, struct nfs4_cb_conn *c 
		args.authflavor = clp->cl_cred.cr_flavor;

		clp->cl_cb_ident = conn->cb_ident;

	} else {

		if (!conn->cb_xprt)

		if (!conn->cb_xprt || !ses)

			return -EINVAL;

		clp->cl_cb_session = ses;

		args.bc_xprt = conn->cb_xprt;