openkylin
/
platform_kernel-5.15
mirror of https://gitee.com/openkylin/platform_kernel-5.15.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

NFS: Reduce stack use in encode_exchange_id() 

encode_exchange_id() uses more stack space than necessary, giving a compile
time warning. Reduce the size of the static buffer for implementation name.

Signed-off-by: Jim Rees <rees@umich.edu>
Reviewed-by: "Adamson, Dros" <Weston.Adamson@netapp.com>
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
This commit is contained in:
Jim Rees 2012-11-16 18:12:06 -05:00 committed by Trond Myklebust
parent fe20d7d5ee
commit d751f748b3
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
fs/nfs/nfs4xdr.c
View File

@ -270,6 +270,8 @@ static int nfs4_stat_to_errno(int);
#if defined(CONFIG_NFS_V4_1) #if defined(CONFIG_NFS_V4_1)
#define NFS4_MAX_MACHINE_NAME_LEN (64) #define NFS4_MAX_MACHINE_NAME_LEN (64)
#define IMPL_NAME_LIMIT (sizeof(utsname()->sysname) + sizeof(utsname()->release) + \
sizeof(utsname()->version) + sizeof(utsname()->machine) + 8)
#define encode_exchange_id_maxsz (op_encode_hdr_maxsz + \ #define encode_exchange_id_maxsz (op_encode_hdr_maxsz + \
encode_verifier_maxsz + \ encode_verifier_maxsz + \
@ -282,7 +284,7 @@ static int nfs4_stat_to_errno(int);
1 /* nii_domain */ + \ 1 /* nii_domain */ + \
XDR_QUADLEN(NFS4_OPAQUE_LIMIT) + \ XDR_QUADLEN(NFS4_OPAQUE_LIMIT) + \
1 /* nii_name */ + \ 1 /* nii_name */ + \
XDR_QUADLEN(NFS4_OPAQUE_LIMIT) + \ XDR_QUADLEN(IMPL_NAME_LIMIT) + \
3 /* nii_date */) 3 /* nii_date */)
#define decode_exchange_id_maxsz (op_decode_hdr_maxsz + \ #define decode_exchange_id_maxsz (op_decode_hdr_maxsz + \
2 /* eir_clientid */ + \ 2 /* eir_clientid */ + \
@ -1713,7 +1715,7 @@ static void encode_exchange_id(struct xdr_stream *xdr,
struct compound_hdr *hdr) struct compound_hdr *hdr)
{ {
__be32 *p; __be32 *p;
char impl_name[NFS4_OPAQUE_LIMIT]; char impl_name[IMPL_NAME_LIMIT];
int len = 0; int len = 0;
encode_op_hdr(xdr, OP_EXCHANGE_ID, decode_exchange_id_maxsz, hdr); encode_op_hdr(xdr, OP_EXCHANGE_ID, decode_exchange_id_maxsz, hdr);
@ -1728,7 +1730,7 @@ static void encode_exchange_id(struct xdr_stream *xdr,
if (send_implementation_id && if (send_implementation_id &&
sizeof(CONFIG_NFS_V4_1_IMPLEMENTATION_ID_DOMAIN) > 1 && sizeof(CONFIG_NFS_V4_1_IMPLEMENTATION_ID_DOMAIN) > 1 &&
sizeof(CONFIG_NFS_V4_1_IMPLEMENTATION_ID_DOMAIN) sizeof(CONFIG_NFS_V4_1_IMPLEMENTATION_ID_DOMAIN)
<= NFS4_OPAQUE_LIMIT + 1) <= sizeof(impl_name) + 1)
len = snprintf(impl_name, sizeof(impl_name), "%s %s %s %s", len = snprintf(impl_name, sizeof(impl_name), "%s %s %s %s",
utsname()->sysname, utsname()->release, utsname()->sysname, utsname()->release,
utsname()->version, utsname()->machine); utsname()->version, utsname()->machine);