From: Dan Ehrenberg <dehrenberg@chromium.org>
To: dm-devel@redhat.com, linux-kernel@vger.kernel.org, agk@redhat.com
Cc: gwendal@chromium.org, grundler@chromium.org, drewry@chromium.org,
Dan Ehrenberg <dehrenberg@chromium.org>
Subject: [PATCH 1/2] init: Stricter checking of major:minor root= values
Date: Wed, 28 Jan 2015 14:45:56 -0800 [thread overview]
Message-ID: <1422485157-33423-1-git-send-email-dehrenberg@chromium.org> (raw)
In the kernel command-line, previously, root=1:2jakshflaksjdhfa would
be accepted and interpreted just like root=1:2. This patch adds
stricter checking so that additional characters after major:minor are
rejected by root=.
The patch also makes name_to_dev_t take a const char * rather than a
char * for improved possibilities for checking const correctness.
The goal of this patch is to help in unifying dm's interpretation of
its block device argument with the interpretation in other parts of
the kernel. dm rejects malformed major:minor pairs, and it seems
reasonable that root= should reject them as well.
Signed-off-by: Dan Ehrenberg <dehrenberg@chromium.org>
---
include/linux/mount.h | 2 +-
init/do_mounts.c | 5 +++--
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/include/linux/mount.h b/include/linux/mount.h
index c2c561d..bca086d 100644
--- a/include/linux/mount.h
+++ b/include/linux/mount.h
@@ -92,6 +92,6 @@ extern struct vfsmount *vfs_kern_mount(struct file_system_type *type,
extern void mnt_set_expiry(struct vfsmount *mnt, struct list_head *expiry_list);
extern void mark_mounts_for_expiry(struct list_head *mounts);
-extern dev_t name_to_dev_t(char *name);
+extern dev_t name_to_dev_t(const char *name);
#endif /* _LINUX_MOUNT_H */
diff --git a/init/do_mounts.c b/init/do_mounts.c
index eb41008..7e06620 100644
--- a/init/do_mounts.c
+++ b/init/do_mounts.c
@@ -207,7 +207,7 @@ done:
* bangs.
*/
-dev_t name_to_dev_t(char *name)
+dev_t name_to_dev_t(const char *name)
{
char s[32];
char *p;
@@ -226,8 +226,9 @@ dev_t name_to_dev_t(char *name)
if (strncmp(name, "/dev/", 5) != 0) {
unsigned maj, min;
+ char dummy;
- if (sscanf(name, "%u:%u", &maj, &min) == 2) {
+ if (sscanf(name, "%u:%u%c", &maj, &min, &dummy) == 2) {
res = MKDEV(maj, min);
if (maj != MAJOR(res) || min != MINOR(res))
goto fail;
--
2.2.0.rc0.207.ga3a616c
next reply other threads:[~2015-01-29 1:22 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-01-28 22:45 Dan Ehrenberg [this message]
2015-01-28 22:45 ` [PATCH 2/2] dm: Get devices using name_to_dev_t Dan Ehrenberg
2015-02-09 21:14 ` Mike Snitzer
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=1422485157-33423-1-git-send-email-dehrenberg@chromium.org \
--to=dehrenberg@chromium.org \
--cc=agk@redhat.com \
--cc=dm-devel@redhat.com \
--cc=drewry@chromium.org \
--cc=grundler@chromium.org \
--cc=gwendal@chromium.org \
--cc=linux-kernel@vger.kernel.org \
/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
all inboxes | Powered by JetHome®