Commit 499b4988 authored by Christoph Hellwig's avatar Christoph Hellwig
Browse files

sunrpc: mark all struct rpc_procinfo instances as const 



struct rpc_procinfo contains function pointers, and marking it as
constant avoids it being able to be used as an attach vector for
code injections.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Acked-by: default avatarTrond Myklebust <trond.myklebust@primarydata.com>
parent f700c72d

fs/lockd/clnt4xdr.c

+1 −1
Original line number Diff line number Diff line
@@ -584,7 +584,7 @@ static int nlm4_xdr_dec_res(struct rpc_rqst *req, 
	.p_name      = #proc,						\

	}



static struct rpc_procinfo	nlm4_procedures[] = {

static const struct rpc_procinfo nlm4_procedures[] = {

	PROC(TEST,		testargs,	testres),

	PROC(LOCK,		lockargs,	res),

	PROC(CANCEL,		cancargs,	res),

fs/lockd/clntxdr.c

+1 −1
Original line number Diff line number Diff line
@@ -582,7 +582,7 @@ static int nlm_xdr_dec_res(struct rpc_rqst *req, 
	.p_name      = #proc,						\

	}



static struct rpc_procinfo	nlm_procedures[] = {

static const struct rpc_procinfo nlm_procedures[] = {

	PROC(TEST,		testargs,	testres),

	PROC(LOCK,		lockargs,	res),

	PROC(CANCEL,		cancargs,	res),

fs/lockd/mon.c

+1 −1
Original line number Diff line number Diff line
@@ -531,7 +531,7 @@ static int nsm_xdr_dec_stat(struct rpc_rqst *rqstp, 
#define SM_monres_sz	2

#define SM_unmonres_sz	1



static struct rpc_procinfo	nsm_procedures[] = {

static const struct rpc_procinfo nsm_procedures[] = {

[NSMPROC_MON] = {

		.p_proc		= NSMPROC_MON,

		.p_encode	= nsm_xdr_enc_mon,

fs/nfs/internal.h

+3 −3
Original line number Diff line number Diff line
@@ -270,12 +270,12 @@ static inline bool nfs_match_open_context(const struct nfs_open_context *ctx1, 
}



/* nfs2xdr.c */

extern struct rpc_procinfo nfs_procedures[];

extern const struct rpc_procinfo nfs_procedures[];

extern int nfs2_decode_dirent(struct xdr_stream *,

				struct nfs_entry *, int);



/* nfs3xdr.c */

extern struct rpc_procinfo nfs3_procedures[];

extern const struct rpc_procinfo nfs3_procedures[];

extern int nfs3_decode_dirent(struct xdr_stream *,

				struct nfs_entry *, int);
@@ -292,7 +292,7 @@ extern const u32 nfs41_maxgetdevinfo_overhead; 


/* nfs4proc.c */

#if IS_ENABLED(CONFIG_NFS_V4)

extern struct rpc_procinfo nfs4_procedures[];

extern const struct rpc_procinfo nfs4_procedures[];

#endif



#ifdef CONFIG_NFS_V4_SECURITY_LABEL

fs/nfs/mount_clnt.c

+2 −2
Original line number Diff line number Diff line
@@ -466,7 +466,7 @@ static int mnt_xdr_dec_mountres3(struct rpc_rqst *req, 
	return decode_auth_flavors(xdr, res);

}



static struct rpc_procinfo mnt_procedures[] = {

static const struct rpc_procinfo mnt_procedures[] = {

	[MOUNTPROC_MNT] = {

		.p_proc		= MOUNTPROC_MNT,

		.p_encode	= mnt_xdr_enc_dirpath,
@@ -485,7 +485,7 @@ static struct rpc_procinfo mnt_procedures[] = { 
	},

};



static struct rpc_procinfo mnt3_procedures[] = {

static const struct rpc_procinfo mnt3_procedures[] = {

	[MOUNTPROC3_MNT] = {

		.p_proc		= MOUNTPROC3_MNT,

		.p_encode	= mnt_xdr_enc_dirpath,