Commit ee2e992c authored by Li Zefan's avatar Li Zefan Committed by Jens Axboe
Browse files

block: simplify string handling in elv_iosched_store() 



strlcpy() guarantees the dest buffer is NULL teminated.

Signed-off-by: default avatarLi Zefan <lizf@cn.fujitsu.com>
Signed-off-by: default avatarJens Axboe <jens.axboe@oracle.com>
parent e6d63840

block/elevator.c

+2 −7
Original line number Diff line number Diff line
@@ -1166,15 +1166,10 @@ ssize_t elv_iosched_store(struct request_queue *q, const char *name, 
			  size_t count)

{

	char elevator_name[ELV_NAME_MAX];

	size_t len;

	struct elevator_type *e;



	elevator_name[sizeof(elevator_name) - 1] = '\0';

	strncpy(elevator_name, name, sizeof(elevator_name) - 1);

	len = strlen(elevator_name);



	if (len && elevator_name[len - 1] == '\n')

		elevator_name[len - 1] = '\0';

	strlcpy(elevator_name, name, sizeof(elevator_name));

	strstrip(elevator_name);



	e = elevator_get(elevator_name);

	if (!e) {