Unverified Commit 6b7bfb89 authored Jan 02, 2025 by openeuler-ci-bot Committed by Gitee Jan 02, 2025

!14362 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/54WHCOEXCLE2YHAZSNL4OC5DMDCYWLCL/ 
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/14362

 

Reviewed-by: Zhang Peng <zhangpeng362@huawei.com>
Signed-off-by: Zhang Peng <zhangpeng362@huawei.com>

parents 44f5ce94 658e46e8

fs/nfsd/nfs4callback.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -986,7 +986,7 @@ static int setup_callback_client(struct nfs4_client clp, struct nfs4_cb_conn c
	args.authflavor = clp->cl_cred.cr_flavor;		args.authflavor = clp->cl_cred.cr_flavor;
	clp->cl_cb_ident = conn->cb_ident;		clp->cl_cb_ident = conn->cb_ident;
	} else {		} else {
	if (!conn->cb_xprt)		if (!conn->cb_xprt \|\| !ses)
	return -EINVAL;		return -EINVAL;
	clp->cl_cb_session = ses;		clp->cl_cb_session = ses;
	args.bc_xprt = conn->cb_xprt;		args.bc_xprt = conn->cb_xprt;