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: Christoph Hellwig <hch@lst.de> Acked-by: Trond Myklebust <trond.myklebust@primarydata.com>
这个提交包含在:
@@ -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
|
||||
|
@@ -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,
|
||||
|
@@ -1152,7 +1152,7 @@ static int nfs_stat_to_errno(enum nfs_stat status)
|
||||
.p_statidx = NFSPROC_##proc, \
|
||||
.p_name = #proc, \
|
||||
}
|
||||
struct rpc_procinfo nfs_procedures[] = {
|
||||
const struct rpc_procinfo nfs_procedures[] = {
|
||||
PROC(GETATTR, fhandle, attrstat, 1),
|
||||
PROC(SETATTR, sattrargs, attrstat, 0),
|
||||
PROC(LOOKUP, diropargs, diropres, 2),
|
||||
|
@@ -2554,7 +2554,7 @@ static int nfs3_stat_to_errno(enum nfs_stat status)
|
||||
.p_name = #proc, \
|
||||
}
|
||||
|
||||
struct rpc_procinfo nfs3_procedures[] = {
|
||||
const struct rpc_procinfo nfs3_procedures[] = {
|
||||
PROC(GETATTR, getattr, getattr, 1),
|
||||
PROC(SETATTR, setattr, setattr, 0),
|
||||
PROC(LOOKUP, lookup, lookup, 2),
|
||||
@@ -2587,7 +2587,7 @@ const struct rpc_version nfs_version3 = {
|
||||
};
|
||||
|
||||
#ifdef CONFIG_NFS_V3_ACL
|
||||
static struct rpc_procinfo nfs3_acl_procedures[] = {
|
||||
static const struct rpc_procinfo nfs3_acl_procedures[] = {
|
||||
[ACLPROC3_GETACL] = {
|
||||
.p_proc = ACLPROC3_GETACL,
|
||||
.p_encode = nfs3_xdr_enc_getacl3args,
|
||||
|
@@ -493,7 +493,7 @@ static inline void nfs4_unregister_sysctl(void)
|
||||
#endif
|
||||
|
||||
/* nfs4xdr.c */
|
||||
extern struct rpc_procinfo nfs4_procedures[];
|
||||
extern const struct rpc_procinfo nfs4_procedures[];
|
||||
|
||||
struct nfs4_mount_data;
|
||||
|
||||
|
@@ -7594,7 +7594,7 @@ nfs4_stat_to_errno(int stat)
|
||||
.p_name = #proc, \
|
||||
}
|
||||
|
||||
struct rpc_procinfo nfs4_procedures[] = {
|
||||
const struct rpc_procinfo nfs4_procedures[] = {
|
||||
PROC(READ, enc_read, dec_read),
|
||||
PROC(WRITE, enc_write, dec_write),
|
||||
PROC(COMMIT, enc_commit, dec_commit),
|
||||
|
在新工单中引用
屏蔽一个用户