[PATCH v2 38/46] mtd: nandsim: Expose partition creation logic to user space

From: Daniel Walter
Date: Wed Sep 21 2016 - 05:56:17 EST


From: Richard Weinberger <richard@xxxxxx>

Signed-off-by: Richard Weinberger <richard@xxxxxx>
---
drivers/mtd/nand/nandsim.c | 12 +++++++++++-
include/linux/mtd/nandsim.h | 2 +-
2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/drivers/mtd/nand/nandsim.c b/drivers/mtd/nand/nandsim.c
index 615dde3..6b7570b 100644
--- a/drivers/mtd/nand/nandsim.c
+++ b/drivers/mtd/nand/nandsim.c
@@ -2585,6 +2585,16 @@ static int ns_ctrl_new_instance(struct ns_new_instance_req *req)
nsparam->file_fd = req->file_fd;
nsparam->no_oob = !!req->no_oob;

+ if (req->parts_num > NANDSIM_MAX_PARTS || req->parts_num < 0) {
+ kfree(nsparam);
+ return -EINVAL;
+ }
+
+ if (req->parts_num > 0) {
+ nsparam->parts_num = req->parts_num;
+ memcpy(nsparam->parts, req->parts, sizeof(nsparam->parts));
+ }
+
switch (req->backend) {
case NANDSIM_BACKEND_RAM:
nsparam->bops = &ns_ram_bops;
@@ -2979,7 +2989,7 @@ static int __init ns_init_default(void)
nsparam->input_cycle = input_cycle;
nsparam->bus_width = bus_width;
nsparam->do_delays = do_delays;
- nsparam->parts = parts;
+ memcpy(nsparam->parts, parts, sizeof(nsparam->parts));
nsparam->parts_num = parts_num;
nsparam->badblocks = badblocks;
nsparam->weakblocks = weakblocks;
diff --git a/include/linux/mtd/nandsim.h b/include/linux/mtd/nandsim.h
index 61ff5dd..07d32a9 100644
--- a/include/linux/mtd/nandsim.h
+++ b/include/linux/mtd/nandsim.h
@@ -12,7 +12,7 @@ struct nandsim_params {
unsigned int input_cycle;
unsigned int bus_width;
unsigned int do_delays;
- unsigned int *parts;
+ unsigned int parts[NANDSIM_MAX_PARTS];
unsigned int parts_num;
char *badblocks;
char *weakblocks;
--
2.8.3