Whamcloud - gitweb
git://git.whamcloud.com
/
fs
/
lustre-release.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
LU-9245 utils: fix string copy handling within lgss_sk
[fs/lustre-release.git]
/
lustre
/
utils
/
gss
/
lgss_sk.c
diff --git
a/lustre/utils/gss/lgss_sk.c
b/lustre/utils/gss/lgss_sk.c
index
f7254d2
..
15ff3fc
100644
(file)
--- a/
lustre/utils/gss/lgss_sk.c
+++ b/
lustre/utils/gss/lgss_sk.c
@@
-550,7
+550,7
@@
int main(int argc, char **argv)
generate_prime = type & SK_TYPE_CLIENT;
strncpy(config->skc_nodemap, SK_DEFAULT_NODEMAP,
generate_prime = type & SK_TYPE_CLIENT;
strncpy(config->skc_nodemap, SK_DEFAULT_NODEMAP,
- s
trlen(SK_DEFAULT_NODEMAP)
);
+ s
izeof(config->skc_nodemap) - 1
);
if (!datafile)
datafile = "/dev/random";
if (!datafile)
datafile = "/dev/random";
@@
-567,9
+567,11
@@
int main(int argc, char **argv)
if (prime_bits != -1)
config->skc_prime_bits = prime_bits;
if (fsname)
if (prime_bits != -1)
config->skc_prime_bits = prime_bits;
if (fsname)
- strncpy(config->skc_fsname, fsname, strlen(fsname));
+ strncpy(config->skc_fsname, fsname,
+ sizeof(config->skc_fsname) - 1);
if (nodemap)
if (nodemap)
- strncpy(config->skc_nodemap, nodemap, strlen(nodemap));
+ strncpy(config->skc_nodemap, nodemap,
+ sizeof(config->skc_nodemap) - 1);
if (mgsnids && parse_mgsnids(mgsnids, config))
goto error;
if (sk_validate_config(config)) {
if (mgsnids && parse_mgsnids(mgsnids, config))
goto error;
if (sk_validate_config(config)) {