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

!10041 Fix CVE-2024-36939 

Merge Pull Request from: @ci-robot 
 
PR sync from: Wang Zhaolong <wangzhaolong1@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/NOVLPGEQOHK2K4SB4356LXSQEICKENWE/ 
Josef Bacik (3):
  sunrpc: add a struct rpc_stats arg to rpc_create_args
  nfs: expose /proc/net/sunrpc/nfs in net namespaces
  nfs: make the rpc_stat per net namespace

Kuniyuki Iwashima (1):
  nfs: Handle error of rpc_proc_register() in nfs_net_init().

Wang Zhaolong (1):
  sunrpc: fix KABI broken in struct rpc_create_args


-- 
2.34.3
 
https://gitee.com/src-openeuler/kernel/issues/I9W3QR 
 
Link:https://gitee.com/openeuler/kernel/pulls/10041

 

Reviewed-by: default avatarYang Yingliang <yangyingliang@huawei.com>
Signed-off-by: default avatarYang Yingliang <yangyingliang@huawei.com>
parents 3c8f142b af616845

fs/nfs/client.c

+4 −1
Original line number Diff line number Diff line
@@ -73,7 +73,6 @@ const struct rpc_program nfs_program = { 
	.number			= NFS_PROGRAM,

	.nrvers			= ARRAY_SIZE(nfs_version),

	.version		= nfs_version,

	.stats			= &nfs_rpcstat,

	.pipe_dir_name		= NFS_PIPE_DIRNAME,

};
@@ -501,6 +500,7 @@ int nfs_create_rpc_client(struct nfs_client *clp, 
			  const struct nfs_client_initdata *cl_init,

			  rpc_authflavor_t flavor)

{

	struct nfs_net		*nn = net_generic(clp->cl_net, nfs_net_id);

	struct rpc_clnt		*clnt = NULL;

	struct rpc_create_args args = {

		.net		= clp->cl_net,
@@ -512,6 +512,7 @@ int nfs_create_rpc_client(struct nfs_client *clp, 
		.servername	= clp->cl_hostname,

		.nodename	= cl_init->nodename,

		.program	= &nfs_program,

		.stats		= &nn->rpcstats,

		.version	= clp->rpc_ops->version,

		.authflavor	= flavor,

		.cred		= cl_init->cred,
@@ -1110,6 +1111,8 @@ void nfs_clients_init(struct net *net) 
#endif

	spin_lock_init(&nn->nfs_client_lock);

	nn->boot_time = ktime_get_real();

	memset(&nn->rpcstats, 0, sizeof(nn->rpcstats));

	nn->rpcstats.program = &nfs_program;



	nfs_netns_sysfs_setup(nn, net);

}

fs/nfs/inode.c

+9 −4
Original line number Diff line number Diff line
@@ -2225,12 +2225,21 @@ EXPORT_SYMBOL_GPL(nfs_net_id); 


static int nfs_net_init(struct net *net)

{

	struct nfs_net *nn = net_generic(net, nfs_net_id);



	nfs_clients_init(net);



	if (!rpc_proc_register(net, &nn->rpcstats)) {

		nfs_clients_exit(net);

		return -ENOMEM;

	}



	return nfs_fs_proc_net_init(net);

}



static void nfs_net_exit(struct net *net)

{

	rpc_proc_unregister(net, "nfs");

	nfs_fs_proc_net_exit(net);

	nfs_clients_exit(net);

}
@@ -2289,15 +2298,12 @@ static int __init init_nfs_fs(void) 
	if (err)

		goto out1;



	rpc_proc_register(&init_net, &nfs_rpcstat);



	err = register_nfs_fs();

	if (err)

		goto out0;



	return 0;

out0:

	rpc_proc_unregister(&init_net, "nfs");

	nfs_destroy_directcache();

out1:

	nfs_destroy_writepagecache();
@@ -2330,7 +2336,6 @@ static void __exit exit_nfs_fs(void) 
	nfs_destroy_nfspagecache();

	nfs_fscache_unregister();

	unregister_pernet_subsys(&nfs_net_ops);

	rpc_proc_unregister(&init_net, "nfs");

	unregister_nfs_fs();

	nfs_fs_proc_exit();

	nfsiod_stop();

fs/nfs/internal.h

+0 −2
Original line number Diff line number Diff line
@@ -435,8 +435,6 @@ int nfs_try_get_tree(struct fs_context *); 
int nfs_get_tree_common(struct fs_context *);

void nfs_kill_super(struct super_block *);



extern struct rpc_stat nfs_rpcstat;



extern int __init register_nfs_fs(void);

extern void __exit unregister_nfs_fs(void);

extern bool nfs_sb_active(struct super_block *sb);

fs/nfs/netns.h

+2 −0
Original line number Diff line number Diff line
@@ -9,6 +9,7 @@ 
#include <linux/nfs4.h>

#include <net/net_namespace.h>

#include <net/netns/generic.h>

#include <linux/sunrpc/stats.h>



struct bl_dev_msg {

	int32_t status;
@@ -34,6 +35,7 @@ struct nfs_net { 
	struct nfs_netns_client *nfs_client;

	spinlock_t nfs_client_lock;

	ktime_t boot_time;

	struct rpc_stat rpcstats;

#ifdef CONFIG_PROC_FS

	struct proc_dir_entry *proc_nfsfs;

#endif

include/linux/sunrpc/clnt.h

+1 −1
Original line number Diff line number Diff line
@@ -143,7 +143,7 @@ struct rpc_create_args { 
	struct svc_xprt		*bc_xprt;	/* NFSv4.1 backchannel */

	const struct cred	*cred;



	KABI_RESERVE(1)

	KABI_USE(1, struct rpc_stat *stats)

};



struct rpc_add_xprt_test {