nbd: use shifts rather than multiplies

commit fad7cd3310db ("nbd: add the check to prevent overflow in
__nbd_ioctl()") raised an issue from the fallback helpers added in
commit f0907827a8a9 ("compiler.h: enable builtin overflow checkers and
add fallback code")

ERROR: modpost: "__divdi3" [drivers/block/nbd.ko] undefined!

As Stephen Rothwell notes:
The added check_mul_overflow() call is being passed 64 bit values.
COMPILER_HAS_GENERIC_BUILTIN_OVERFLOW is not set for this build (see
include/linux/overflow.h).

Specifically, the helpers for checking whether the results of a
multiplication overflowed (__unsigned_mul_overflow,
__signed_add_overflow) use the division operator when
!COMPILER_HAS_GENERIC_BUILTIN_OVERFLOW. This is problematic for 64b
operands on 32b hosts.

This was fixed upstream by
commit 76ae847497bc ("Documentation: raise minimum supported version of
GCC to 5.1")
which is not suitable to be backported to stable.

Further, __builtin_mul_overflow() would emit a libcall to a
compiler-rt-only symbol when compiling with clang < 14 for 32b targets.

ld.lld: error: undefined symbol: __mulodi4

In order to keep stable buildable with GCC 4.9 and clang < 14, modify
struct nbd_config to instead track the number of bits of the block size;
reconstructing the block size using runtime checked shifts that are not
problematic for those compilers and in a ways that can be backported to
stable.

In nbd_set_size, we do validate that the value of blksize must be a
power of two (POT) and is in the range of [512, PAGE_SIZE] (both
inclusive).

This does modify the debugfs interface.

Cc: stable@vger.kernel.org
Cc: Arnd Bergmann <arnd@kernel.org>
Cc: Rasmus Villemoes <linux@rasmusvillemoes.dk>
Link: https://github.com/ClangBuiltLinux/linux/issues/1438
Link: https://lore.kernel.org/all/20210909182525.372ee687@canb.auug.org.au/
Link: https://lore.kernel.org/stable/CAHk-=whiQBofgis_rkniz8GBP9wZtSZdcDEffgSLO62BUGV3gg@mail.gmail.com/
Reported-by: Naresh Kamboju <naresh.kamboju@linaro.org>
Reported-by: Nathan Chancellor <nathan@kernel.org>
Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
Suggested-by: Kees Cook <keescook@chromium.org>
Suggested-by: Linus Torvalds <torvalds@linux-foundation.org>
Suggested-by: Pavel Machek <pavel@ucw.cz>
Signed-off-by: Nick Desaulniers <ndesaulniers@google.com>
Reviewed-by: Josef Bacik <josef@toxicpanda.com>
Link: https://lore.kernel.org/r/20210920232533.4092046-1-ndesaulniers@google.com
Signed-off-by: Jens Axboe <axboe@kernel.dk>

authored by Nick Desaulniers and committed by Jens Axboe 41e76c6a ebc69e89

+17 -12
+17 -12
drivers/block/nbd.c
··· 97 98 atomic_t recv_threads; 99 wait_queue_head_t recv_wq; 100 - loff_t blksize; 101 loff_t bytesize; 102 #if IS_ENABLED(CONFIG_DEBUG_FS) 103 struct dentry *dbg_dir; 104 #endif 105 }; 106 107 struct nbd_device { 108 struct blk_mq_tag_set tag_set; ··· 151 152 #define NBD_MAGIC 0x68797548 153 154 - #define NBD_DEF_BLKSIZE 1024 155 156 static unsigned int nbds_max = 16; 157 static int max_part = 16; ··· 322 loff_t blksize) 323 { 324 if (!blksize) 325 - blksize = NBD_DEF_BLKSIZE; 326 if (blksize < 512 || blksize > PAGE_SIZE || !is_power_of_2(blksize)) 327 return -EINVAL; 328 329 nbd->config->bytesize = bytesize; 330 - nbd->config->blksize = blksize; 331 332 if (!nbd->task_recv) 333 return 0; ··· 1342 args->index = i; 1343 queue_work(nbd->recv_workq, &args->work); 1344 } 1345 - return nbd_set_size(nbd, config->bytesize, config->blksize); 1346 } 1347 1348 static int nbd_start_device_ioctl(struct nbd_device *nbd, struct block_device *bdev) ··· 1411 case NBD_SET_BLKSIZE: 1412 return nbd_set_size(nbd, config->bytesize, arg); 1413 case NBD_SET_SIZE: 1414 - return nbd_set_size(nbd, arg, config->blksize); 1415 case NBD_SET_SIZE_BLOCKS: 1416 - if (check_mul_overflow((loff_t)arg, config->blksize, &bytesize)) 1417 return -EINVAL; 1418 - return nbd_set_size(nbd, bytesize, config->blksize); 1419 case NBD_SET_TIMEOUT: 1420 nbd_set_cmd_timeout(nbd, arg); 1421 return 0; ··· 1481 atomic_set(&config->recv_threads, 0); 1482 init_waitqueue_head(&config->recv_wq); 1483 init_waitqueue_head(&config->conn_wait); 1484 - config->blksize = NBD_DEF_BLKSIZE; 1485 atomic_set(&config->live_connections, 0); 1486 try_module_get(THIS_MODULE); 1487 return config; ··· 1609 debugfs_create_file("tasks", 0444, dir, nbd, &nbd_dbg_tasks_fops); 1610 debugfs_create_u64("size_bytes", 0444, dir, &config->bytesize); 1611 debugfs_create_u32("timeout", 0444, dir, &nbd->tag_set.timeout); 1612 - debugfs_create_u64("blocksize", 0444, dir, &config->blksize); 1613 debugfs_create_file("flags", 0444, dir, nbd, &nbd_dbg_flags_fops); 1614 1615 return 0; ··· 1831 static int nbd_genl_size_set(struct genl_info *info, struct nbd_device *nbd) 1832 { 1833 struct nbd_config *config = nbd->config; 1834 - u64 bsize = config->blksize; 1835 u64 bytes = config->bytesize; 1836 1837 if (info->attrs[NBD_ATTR_SIZE_BYTES]) ··· 1840 if (info->attrs[NBD_ATTR_BLOCK_SIZE_BYTES]) 1841 bsize = nla_get_u64(info->attrs[NBD_ATTR_BLOCK_SIZE_BYTES]); 1842 1843 - if (bytes != config->bytesize || bsize != config->blksize) 1844 return nbd_set_size(nbd, bytes, bsize); 1845 return 0; 1846 }
··· 97 98 atomic_t recv_threads; 99 wait_queue_head_t recv_wq; 100 + unsigned int blksize_bits; 101 loff_t bytesize; 102 #if IS_ENABLED(CONFIG_DEBUG_FS) 103 struct dentry *dbg_dir; 104 #endif 105 }; 106 + 107 + static inline unsigned int nbd_blksize(struct nbd_config *config) 108 + { 109 + return 1u << config->blksize_bits; 110 + } 111 112 struct nbd_device { 113 struct blk_mq_tag_set tag_set; ··· 146 147 #define NBD_MAGIC 0x68797548 148 149 + #define NBD_DEF_BLKSIZE_BITS 10 150 151 static unsigned int nbds_max = 16; 152 static int max_part = 16; ··· 317 loff_t blksize) 318 { 319 if (!blksize) 320 + blksize = 1u << NBD_DEF_BLKSIZE_BITS; 321 if (blksize < 512 || blksize > PAGE_SIZE || !is_power_of_2(blksize)) 322 return -EINVAL; 323 324 nbd->config->bytesize = bytesize; 325 + nbd->config->blksize_bits = __ffs(blksize); 326 327 if (!nbd->task_recv) 328 return 0; ··· 1337 args->index = i; 1338 queue_work(nbd->recv_workq, &args->work); 1339 } 1340 + return nbd_set_size(nbd, config->bytesize, nbd_blksize(config)); 1341 } 1342 1343 static int nbd_start_device_ioctl(struct nbd_device *nbd, struct block_device *bdev) ··· 1406 case NBD_SET_BLKSIZE: 1407 return nbd_set_size(nbd, config->bytesize, arg); 1408 case NBD_SET_SIZE: 1409 + return nbd_set_size(nbd, arg, nbd_blksize(config)); 1410 case NBD_SET_SIZE_BLOCKS: 1411 + if (check_shl_overflow(arg, config->blksize_bits, &bytesize)) 1412 return -EINVAL; 1413 + return nbd_set_size(nbd, bytesize, nbd_blksize(config)); 1414 case NBD_SET_TIMEOUT: 1415 nbd_set_cmd_timeout(nbd, arg); 1416 return 0; ··· 1476 atomic_set(&config->recv_threads, 0); 1477 init_waitqueue_head(&config->recv_wq); 1478 init_waitqueue_head(&config->conn_wait); 1479 + config->blksize_bits = NBD_DEF_BLKSIZE_BITS; 1480 atomic_set(&config->live_connections, 0); 1481 try_module_get(THIS_MODULE); 1482 return config; ··· 1604 debugfs_create_file("tasks", 0444, dir, nbd, &nbd_dbg_tasks_fops); 1605 debugfs_create_u64("size_bytes", 0444, dir, &config->bytesize); 1606 debugfs_create_u32("timeout", 0444, dir, &nbd->tag_set.timeout); 1607 + debugfs_create_u32("blocksize_bits", 0444, dir, &config->blksize_bits); 1608 debugfs_create_file("flags", 0444, dir, nbd, &nbd_dbg_flags_fops); 1609 1610 return 0; ··· 1826 static int nbd_genl_size_set(struct genl_info *info, struct nbd_device *nbd) 1827 { 1828 struct nbd_config *config = nbd->config; 1829 + u64 bsize = nbd_blksize(config); 1830 u64 bytes = config->bytesize; 1831 1832 if (info->attrs[NBD_ATTR_SIZE_BYTES]) ··· 1835 if (info->attrs[NBD_ATTR_BLOCK_SIZE_BYTES]) 1836 bsize = nla_get_u64(info->attrs[NBD_ATTR_BLOCK_SIZE_BYTES]); 1837 1838 + if (bytes != config->bytesize || bsize != nbd_blksize(config)) 1839 return nbd_set_size(nbd, bytes, bsize); 1840 return 0; 1841 }