]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
blk-mq: make sure that line break can be printed
authorMing Lei <ming.lei@redhat.com>
Mon, 4 Nov 2019 08:26:53 +0000 (16:26 +0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sat, 21 Dec 2019 09:42:18 +0000 (10:42 +0100)
commit d2c9be89f8ebe7ebcc97676ac40f8dec1cf9b43a upstream.

8962842ca5ab ("blk-mq: avoid sysfs buffer overflow with too many CPU cores")
avoids sysfs buffer overflow, and reserves one character for line break.
However, the last snprintf() doesn't get correct 'size' parameter passed
in, so fixed it.

Fixes: 8962842ca5ab ("blk-mq: avoid sysfs buffer overflow with too many CPU cores")
Signed-off-by: Ming Lei <ming.lei@redhat.com>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Cc: Nobuhiro Iwamatsu <nobuhiro1.iwamatsu@toshiba.co.jp>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
block/blk-mq-sysfs.c

index 17b9dd81bc6d735971795b6b58014fcb5b9151b6..5b64d9d7d147ca37930c2d2d0926b5b44faba39e 100644 (file)
@@ -260,7 +260,7 @@ static ssize_t blk_mq_hw_sysfs_cpus_show(struct blk_mq_hw_ctx *hctx, char *page)
                pos += ret;
        }
 
-       ret = snprintf(pos + page, size - pos, "\n");
+       ret = snprintf(pos + page, size + 1 - pos, "\n");
        return pos + ret;
 }