Commit b9c744c1 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Anna Schumaker
Browse files

sunrpc: mark all struct svc_procinfo instances as const 



struct svc_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>
parent 0becc118

fs/lockd/svc4proc.c

+1 −1
Original line number Diff line number Diff line
@@ -507,7 +507,7 @@ struct nlm_void { int dummy; }; 
#define	No	(1+1024/4)				/* netobj */

#define	St	1					/* status */

#define	Rg	4					/* range (offset + length) */

struct svc_procedure		nlmsvc_procedures4[] = {

const struct svc_procedure nlmsvc_procedures4[] = {

  PROC(null,		void,		void,		void,	void, 1),

  PROC(test,		testargs,	testres,	args,	res, Ck+St+2+No+Rg),

  PROC(lock,		lockargs,	res,		args,	res, Ck+St),

fs/lockd/svcproc.c

+1 −1
Original line number Diff line number Diff line
@@ -551,7 +551,7 @@ struct nlm_void { int dummy; }; 
#define	No	(1+1024/4)			/* Net Obj */

#define	Rg	2				/* range - offset + size */



struct svc_procedure		nlmsvc_procedures[] = {

const struct svc_procedure nlmsvc_procedures[] = {

  PROC(null,		void,		void,		void,	void, 1),

  PROC(test,		testargs,	testres,	args,	res, Ck+St+2+No+Rg),

  PROC(lock,		lockargs,	res,		args,	res, Ck+St),

fs/nfs/callback_xdr.c

+1 −1
Original line number Diff line number Diff line
@@ -995,7 +995,7 @@ static struct callback_op callback_ops[] = { 
/*

 * Define NFS4 callback procedures

 */

static struct svc_procedure nfs4_callback_procedures1[] = {

static const struct svc_procedure nfs4_callback_procedures1[] = {

	[CB_NULL] = {

		.pc_func = nfs4_callback_null,

		.pc_decode = nfs4_decode_void,

fs/nfsd/nfs2acl.c

+1 −1
Original line number Diff line number Diff line
@@ -370,7 +370,7 @@ struct nfsd3_voidargs { int dummy; }; 
#define pAT (1+AT)	/* post attributes - conditional */

#define ACL (1+NFS_ACL_MAX_ENTRIES*3)  /* Access Control List */



static struct svc_procedure		nfsd_acl_procedures2[] = {

static const struct svc_procedure nfsd_acl_procedures2[] = {

  PROC(null,	void,		void,		void,	  RC_NOCACHE, ST),

  PROC(getacl,	getacl,		getacl,		getacl,	  RC_NOCACHE, ST+1+2*(1+ACL)),

  PROC(setacl,	setacl,		attrstat,	attrstat, RC_NOCACHE, ST+AT),

fs/nfsd/nfs3acl.c

+1 −1
Original line number Diff line number Diff line
@@ -257,7 +257,7 @@ struct nfsd3_voidargs { int dummy; }; 
#define pAT (1+AT)	/* post attributes - conditional */

#define ACL (1+NFS_ACL_MAX_ENTRIES*3)  /* Access Control List */



static struct svc_procedure		nfsd_acl_procedures3[] = {

static const struct svc_procedure nfsd_acl_procedures3[] = {

  PROC(null,	void,		void,		void,	  RC_NOCACHE, ST),

  PROC(getacl,	getacl,		getacl,		getacl,	  RC_NOCACHE, ST+1+2*(1+ACL)),

  PROC(setacl,	setacl,		setacl,		fhandle,  RC_NOCACHE, ST+pAT),