mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
* [PATCH] block: elevator.c:  Cleaning up missing null-terminate in conjunction with strncpy
@ 2014-07-26 23:15 Rickard Strandqvist
  2014-07-28 14:32 ` Jeff Moyer
  0 siblings, 1 reply; 2+ messages in thread
From: Rickard Strandqvist @ 2014-07-26 23:15 UTC (permalink / raw)
  To: Jens Axboe, linux-kernel; +Cc: Rickard Strandqvist

Replacing strncpy with strlcpy to avoid strings that lacks null terminate.
And set a string to be empty from the start.

Signed-off-by: Rickard Strandqvist <rickard_strandqvist@spectrumdigital.se>
---
 block/elevator.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/block/elevator.c b/block/elevator.c
index 24c28b6..ad17774 100644
--- a/block/elevator.c
+++ b/block/elevator.c
@@ -118,7 +118,7 @@ static struct elevator_type *elevator_get(const char *name, bool try_loading)
 	return e;
 }
 
-static char chosen_elevator[ELV_NAME_MAX];
+static char chosen_elevator[ELV_NAME_MAX] = "";
 
 static int __init elevator_setup(char *str)
 {
@@ -126,7 +126,7 @@ static int __init elevator_setup(char *str)
 	 * Be backwards-compatible with previous kernels, so users
 	 * won't get the wrong elevator.
 	 */
-	strncpy(chosen_elevator, str, sizeof(chosen_elevator) - 1);
+	strlcpy(chosen_elevator, str, sizeof(chosen_elevator));
 	return 1;
 }
 
-- 
1.7.10.4


^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2014-07-28 14:32 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2014-07-26 23:15 [PATCH] block: elevator.c: Cleaning up missing null-terminate in conjunction with strncpy Rickard Strandqvist
2014-07-28 14:32 ` Jeff Moyer

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®