From: Al Viro <viro@zeniv.linux.org.uk>
To: Vivek Goyal <vgoyal@redhat.com>
Cc: Christoph Hellwig <hch@infradead.org>, Jan Kara <jack@suse.cz>,
Linux fsdevel mailing list <linux-fsdevel@vger.kernel.org>,
linux kernel mailing list <linux-kernel@vger.kernel.org>,
xu.xin16@zte.com.cn, christian.brauner@ubuntu.com
Subject: Re: [PATCH v3] init/do_mounts.c: Harden split_fs_names() against buffer overflow
Date: Mon, 20 Sep 2021 02:23:21 +0000 [thread overview]
Message-ID: <YUfwmdWTylRidtkq@zeniv-ca.linux.org.uk> (raw)
In-Reply-To: <YUSUc7AyCq/P3SLR@redhat.com>
On Fri, Sep 17, 2021 at 09:13:23AM -0400, Vivek Goyal wrote:
> --- redhat-linux.orig/init/do_mounts.c 2021-09-15 08:46:33.801689806 -0400
> +++ redhat-linux/init/do_mounts.c 2021-09-17 08:44:40.781430167 -0400
> @@ -338,20 +338,19 @@ __setup("rootflags=", root_data_setup);
> __setup("rootfstype=", fs_names_setup);
> __setup("rootdelay=", root_delay_setup);
>
> -static int __init split_fs_names(char *page, char *names)
> +/* This can return zero length strings. Caller should check */
> +static int __init split_fs_names(char *page, size_t size, char *names)
> {
> - int count = 0;
> + int count = 1;
> char *p = page;
>
> - strcpy(p, root_fs_names);
> + strlcpy(p, root_fs_names, size);
> while (*p++) {
> - if (p[-1] == ',')
> + if (p[-1] == ',') {
> p[-1] = '\0';
> + count++;
> + }
> }
> - *p = '\0';
> -
> - for (p = page; *p; p += strlen(p)+1)
> - count++;
>
> return count;
> }
> @@ -404,12 +403,16 @@ void __init mount_block_root(char *name,
> scnprintf(b, BDEVNAME_SIZE, "unknown-block(%u,%u)",
> MAJOR(ROOT_DEV), MINOR(ROOT_DEV));
> if (root_fs_names)
> - num_fs = split_fs_names(fs_names, root_fs_names);
> + num_fs = split_fs_names(fs_names, PAGE_SIZE, root_fs_names);
> else
> num_fs = list_bdev_fs_names(fs_names, PAGE_SIZE);
> retry:
> for (i = 0, p = fs_names; i < num_fs; i++, p += strlen(p)+1) {
> - int err = do_mount_root(name, p, flags, root_mount_data);
> + int err;
> +
> + if (!*p)
> + continue;
> + err = do_mount_root(name, p, flags, root_mount_data);
> switch (err) {
> case 0:
> goto out;
> @@ -543,10 +546,12 @@ static int __init mount_nodev_root(void)
> fs_names = (void *)__get_free_page(GFP_KERNEL);
> if (!fs_names)
> return -EINVAL;
> - num_fs = split_fs_names(fs_names, root_fs_names);
> + num_fs = split_fs_names(fs_names, PAGE_SIZE, root_fs_names);
>
> for (i = 0, fstype = fs_names; i < num_fs;
> i++, fstype += strlen(fstype) + 1) {
> + if (!*fstype)
> + continue;
> if (!fs_is_nodev(fstype))
> continue;
> err = do_mount_root(root_device_name, fstype, root_mountflags,
Applied.
prev parent reply other threads:[~2021-09-20 2:23 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-09-17 13:13 [PATCH v3] init/do_mounts.c: Harden split_fs_names() against buffer overflow Vivek Goyal
2021-09-20 2:23 ` Al Viro [this message]
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=YUfwmdWTylRidtkq@zeniv-ca.linux.org.uk \
--to=viro@zeniv.linux.org.uk \
--cc=christian.brauner@ubuntu.com \
--cc=hch@infradead.org \
--cc=jack@suse.cz \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=vgoyal@redhat.com \
--cc=xu.xin16@zte.com.cn \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.