summaryrefslogtreecommitdiff
path: root/arch/um
diff options
context:
space:
mode:
authorHajime Tazaki <thehajime@gmail.com>2020-12-21 05:24:34 +0300
committerRichard Weinberger <richard@nod.at>2021-01-27 00:10:44 +0300
commit94c41b3a7c370b0d6afc5ace8fafa0531865a940 (patch)
treef4ffbf92ee96bc0a54dfbde41a0ea22f9c91e71c /arch/um
parent4992eb41ab1b5d08479193afdc94f9678e5ded13 (diff)
downloadlinux-94c41b3a7c370b0d6afc5ace8fafa0531865a940.tar.xz
um: ubd: fix command line handling of ubd
This commit fixes a regression to handle command line parameters of ubd. With a simple line "./linux ubd0="./disk-ext4.img", it fails at ubd_setup_common(). The commit adds additional checks to the variables in order to properly parse the paremeters which previously worked. Fixes: ef3ba87cb7c9 ("um: ubd: Set device serial attribute from cmdline") Cc: Christopher Obbard <chris.obbard@collabora.com> Signed-off-by: Hajime Tazaki <thehajime@gmail.com> Acked-by: Christopher Obbard <chris.obbard@collabora.com> Signed-off-by: Richard Weinberger <richard@nod.at>
Diffstat (limited to 'arch/um')
-rw-r--r--arch/um/drivers/ubd_kern.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/um/drivers/ubd_kern.c b/arch/um/drivers/ubd_kern.c
index 13b1fe694b90..bd16b17ba4d6 100644
--- a/arch/um/drivers/ubd_kern.c
+++ b/arch/um/drivers/ubd_kern.c
@@ -375,11 +375,11 @@ break_loop:
file = NULL;
backing_file = strsep(&str, ",:");
- if (*backing_file == '\0')
+ if (backing_file && *backing_file == '\0')
backing_file = NULL;
serial = strsep(&str, ",:");
- if (*serial == '\0')
+ if (serial && *serial == '\0')
serial = NULL;
if (backing_file && ubd_dev->no_cow) {