Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
debugfs: take better advantage of strscpy.
Signed-off-by: Mike Marshall <hubcap@omnibond.com>
+6
-10
+6
-10
fs/orangefs/orangefs-debugfs.c
+6
-10
fs/orangefs/orangefs-debugfs.c
···
238
238
static void orangefs_kernel_debug_init(void)
239
239
{
240
240
static char k_buffer[ORANGEFS_MAX_DEBUG_STRING_LEN] = { };
241
-
size_t len = strlen(kernel_debug_string);
241
+
size_t len =
242
+
strscpy(k_buffer, kernel_debug_string, sizeof(k_buffer) - 1);
242
243
243
-
gossip_debug(GOSSIP_DEBUGFS_DEBUG, "%s: start\n", __func__);
244
-
245
-
if (len + 1 < ORANGEFS_MAX_DEBUG_STRING_LEN) {
246
-
memcpy(k_buffer, kernel_debug_string, len);
244
+
if (len > 0) {
247
245
k_buffer[len] = '\n';
248
246
k_buffer[len + 1] = '\0';
249
247
} else {
···
337
339
static void orangefs_client_debug_init(void)
338
340
{
339
341
static char c_buffer[ORANGEFS_MAX_DEBUG_STRING_LEN] = { };
340
-
size_t len = strlen(client_debug_string);
342
+
size_t len =
343
+
strscpy(c_buffer, client_debug_string, sizeof(c_buffer) - 1);
341
344
342
-
gossip_debug(GOSSIP_DEBUGFS_DEBUG, "%s: start\n", __func__);
343
-
344
-
if (len + 1 < ORANGEFS_MAX_DEBUG_STRING_LEN) {
345
-
memcpy(c_buffer, client_debug_string, len);
345
+
if (len > 0) {
346
346
c_buffer[len] = '\n';
347
347
c_buffer[len + 1] = '\0';
348
348
} else {