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

mtd: phram: use div_u64_rem to stop overwrite len in phram_setup

We now support user to set erase page size, and use do_div between len
and erase size to determine the reasonableness for the erase size.
However, do_div is a macro and will overwrite the value of len. Which
results a mtd device with unexcepted size. Fix it by use div_u64_rem.

Fixes: ffad560394de ("mtd: phram: Allow the user to set the erase page size.")
Signed-off-by: yangerkun <yangerkun@huawei.com>
Signed-off-by: Miquel Raynal <miquel.raynal@bootlin.com>
Link: https://lore.kernel.org/linux-mtd/20210125124936.651812-1-yangerkun@huawei.com

authored by

yangerkun and committed by
Miquel Raynal
dc2b3e5c b81770a7

+5 -1
+5 -1
drivers/mtd/devices/phram.c
··· 222 222 uint64_t start; 223 223 uint64_t len; 224 224 uint64_t erasesize = PAGE_SIZE; 225 + uint32_t rem; 225 226 int i, ret; 226 227 227 228 if (strnlen(val, sizeof(buf)) >= sizeof(buf)) ··· 264 263 } 265 264 } 266 265 266 + if (erasesize) 267 + div_u64_rem(len, (uint32_t)erasesize, &rem); 268 + 267 269 if (len == 0 || erasesize == 0 || erasesize > len 268 - || erasesize > UINT_MAX || do_div(len, (uint32_t)erasesize) != 0) { 270 + || erasesize > UINT_MAX || rem) { 269 271 parse_err("illegal erasesize or len\n"); 270 272 goto error; 271 273 }