Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

elevator: fix truncation of icq_cache_name

gcc 7.1 reports the following warning:

block/elevator.c: In function ‘elv_register’:
block/elevator.c:898:5: warning: ‘snprintf’ output may be truncated before the last format character [-Wformat-truncation=]
"%s_io_cq", e->elevator_name);
^~~~~~~~~~
block/elevator.c:897:3: note: ‘snprintf’ output between 7 and 22 bytes into a destination of size 21
snprintf(e->icq_cache_name, sizeof(e->icq_cache_name),
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
"%s_io_cq", e->elevator_name);
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

The bug is that the name of the icq_cache is 6 characters longer than
the elevator name, but only ELV_NAME_MAX + 5 characters were reserved
for it --- so in the case of a maximum-length elevator name, the 'q'
character in "_io_cq" would be truncated by snprintf(). Fix it by
reserving ELV_NAME_MAX + 6 characters instead.

Signed-off-by: Eric Biggers <ebiggers@google.com>
Reviewed-by: Bart Van Assche <Bart.VanAssche@sandisk.com>
Signed-off-by: Jens Axboe <axboe@fb.com>

authored by

Eric Biggers and committed by
Jens Axboe
9bd2bbc0 d964f04a

+1 -1
+1 -1
include/linux/elevator.h
··· 153 153 #endif 154 154 155 155 /* managed by elevator core */ 156 - char icq_cache_name[ELV_NAME_MAX + 5]; /* elvname + "_io_cq" */ 156 + char icq_cache_name[ELV_NAME_MAX + 6]; /* elvname + "_io_cq" */ 157 157 struct list_head list; 158 158 }; 159 159