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

staging: lustre: lustre: ptlrpc: sec.c: Replacing strncat with strlcat to avoid overwrite size 

Changed from using strncat with strlcat to avoid overwrite the max size.
Take the opportunity to change a snprint to strlcpy.

Signed-off-by: Rickard Strandqvist <rickard_strandqvist@spectrumdigital.se>
Acked-by: Chen Gang <gang.chen.5i5j@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Rickard Strandqvist 2014-10-12 17:55:33 +02:00 committed by Greg Kroah-Hartman
parent 5a13503ecd
commit 22e1dd69fe
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/staging/lustre/lustre/ptlrpc/sec.c
View File

@ -209,7 +209,7 @@ EXPORT_SYMBOL(sptlrpc_flavor2name_bulk);
char *sptlrpc_flavor2name(struct sptlrpc_flavor *sf, char *buf, int bufsize) char *sptlrpc_flavor2name(struct sptlrpc_flavor *sf, char *buf, int bufsize)
{ {
snprintf(buf, bufsize, "%s", sptlrpc_flavor2name_base(sf->sf_rpc)); strlcpy(buf, sptlrpc_flavor2name_base(sf->sf_rpc), bufsize);
/* /*
* currently we don't support customized bulk specification for * currently we don't support customized bulk specification for
@ -220,10 +220,9 @@ char *sptlrpc_flavor2name(struct sptlrpc_flavor *sf, char *buf, int bufsize)
bspec[0] = '-'; bspec[0] = '-';
sptlrpc_flavor2name_bulk(sf, &bspec[1], sizeof(bspec) - 1); sptlrpc_flavor2name_bulk(sf, &bspec[1], sizeof(bspec) - 1);
strncat(buf, bspec, bufsize); strlcat(buf, bspec, bufsize);
} }
buf[bufsize - 1] = '\0';
return buf; return buf;
} }
EXPORT_SYMBOL(sptlrpc_flavor2name); EXPORT_SYMBOL(sptlrpc_flavor2name);