From: Paul Lawrence <paullawrence@google.com>
To: Jeff Dike <jdike@addtoit.com>,
Richard Weinberger <richard@nod.at>,
Anton Ivanov <anton.ivanov@cambridgegreys.com>,
Gabriel Krisman Bertazi <krisman@collabora.com>,
Christopher Obbard <chris.obbard@collabora.com>,
Paul Lawrence <paullawrence@google.com>
Cc: linux-um@lists.infradead.org, linux-kernel@vger.kernel.org
Subject: [PATCH] um: ubd: Fix crash from option parsing
Date: Tue, 19 Jan 2021 18:19:45 +0000 [thread overview]
Message-ID: <20210119181945.2071053-1-paullawrence@google.com> (raw)
Below patch will cause NULL ptr dereferences if the optional filenames
are not present.
Fixes: ef3ba87cb7c9 (um: ubd: Set device serial attribute from cmdline)
Signed-off-by: Paul Lawrence <paullawrence@google.com>
---
arch/um/drivers/ubd_kern.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/arch/um/drivers/ubd_kern.c b/arch/um/drivers/ubd_kern.c
index 13b1fe694b90..704989088f28 100644
--- a/arch/um/drivers/ubd_kern.c
+++ b/arch/um/drivers/ubd_kern.c
@@ -371,15 +371,15 @@ static int ubd_setup_common(char *str, int *index_out, char **error_out)
break_loop:
file = strsep(&str, ",:");
- if (*file == '\0')
+ if (file && *file == '\0')
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) {
--
2.30.0.284.gd98b1dd5eaa7-goog
next reply other threads:[~2021-01-19 18:30 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-01-19 18:19 Paul Lawrence [this message]
2021-01-19 18:35 ` [PATCH] um: ubd: Fix crash from option parsing Gabriel Krisman Bertazi
2021-01-22 0:41 ` Hajime Tazaki
2021-01-22 14:44 ` Paul Lawrence
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210119181945.2071053-1-paullawrence@google.com \
--to=paullawrence@google.com \
--cc=anton.ivanov@cambridgegreys.com \
--cc=chris.obbard@collabora.com \
--cc=jdike@addtoit.com \
--cc=krisman@collabora.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-um@lists.infradead.org \
--cc=richard@nod.at \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).