path: root/xlators/features/locks/src/posix.c
diff options
authorYaniv Kaul <>2018-08-21 20:43:07 +0300
committerAmar Tumballi <>2018-08-31 13:13:43 +0000
commit052849983e51a061d7fb2c3ffd74fa78bb257084 (patch)
tree5f82954bd3518c7eeab6ece16edbf72b0a3e0db1 /xlators/features/locks/src/posix.c
parent67cfacaa9d5ce31240a4d39e81b2984a57ac8865 (diff)
Various files: strncpy()->sprintf(), reduce strlen()'s
strncpy may not be very efficient for short strings copied into a large buffer: If the length of src is less than n, strncpy() writes additional null bytes to dest to ensure that a total of n bytes are written. Instead, use snprintf(). Check for truncated output where applicable. Also: - save the result of strlen() and re-use it when possible. - move from strlen to SLEN (sizeof() ) for const strings. Compile-tested only! Change-Id: I54e80d4f4a80e98d3775e376efe05c51af0b29eb updates: bz#1193929 Signed-off-by: Yaniv Kaul <>
Diffstat (limited to 'xlators/features/locks/src/posix.c')
1 files changed, 5 insertions, 2 deletions
diff --git a/xlators/features/locks/src/posix.c b/xlators/features/locks/src/posix.c
index c4ca71cfd7f..22d5990275d 100644
--- a/xlators/features/locks/src/posix.c
+++ b/xlators/features/locks/src/posix.c
@@ -1062,7 +1062,7 @@ pl_getxattr (call_frame_t *frame, xlator_t *this, loc_t *loc,
if (!name)
goto usual;
- if (strncmp (name, GF_XATTR_CLRLK_CMD, strlen (GF_XATTR_CLRLK_CMD)))
+ if (strncmp (name, GF_XATTR_CLRLK_CMD, SLEN (GF_XATTR_CLRLK_CMD)))
goto usual;
if (clrlk_parse_args (name, &args)) {
@@ -1136,7 +1136,10 @@ pl_getxattr (call_frame_t *frame, xlator_t *this, loc_t *loc,
goto out;
- strncpy (key, name, strlen (name));
+ if (snprintf (key, sizeof (key), "%s", name) >= sizeof (key)) {
+ op_ret = -1;
+ goto out;
+ }
if (dict_set_dynstr (dict, key, lk_summary)) {
op_ret = -1;
op_errno = ENOMEM;