Skip to content

Commit 9bd2bbc

Browse files
ebiggersaxboe
authored andcommitted
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 <[email protected]> Reviewed-by: Bart Van Assche <[email protected]> Signed-off-by: Jens Axboe <[email protected]>
1 parent d964f04 commit 9bd2bbc

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

include/linux/elevator.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@ struct elevator_type
153153
#endif
154154

155155
/* 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" */
157157
struct list_head list;
158158
};
159159

0 commit comments

Comments
 (0)