From: "Mihai Donțu" <mihai.dontu@gmail.com>
To: Kees Cook <keescook@chromium.org>
Cc: LKML <linux-kernel@vger.kernel.org>,
Darren Hart <dvhart@infradead.org>,
Andy Shevchenko <andy@infradead.org>,
Platform Driver <platform-driver-x86@vger.kernel.org>
Subject: Re: wmi: usercopy: Kernel memory overwrite attempt detected to spans multiple pages (offset 0, size 4104)
Date: Sun, 17 Jun 2018 22:30:27 +0300 [thread overview]
Message-ID: <1529263827.6069.4.camel@gmail.com> (raw)
In-Reply-To: <CAGXu5jLwA37YJWi50i7bQZ6N7MtctvbXjsVg337zgD11AQ=9SA@mail.gmail.com>
On Sun, 2018-06-17 at 10:36 -0700, Kees Cook wrote:
> On Sat, Jun 16, 2018 at 3:04 PM, Mihai Donțu wrote:
> > On Sun, 2018-06-17 at 00:01 +0300, Mihai Donțu wrote:
> > > While trying to adjust the keyboard backlight mode, I hit this BUG:
> > >
> > > Jun 16 22:16:07 mdontu-l kernel: usercopy: Kernel memory overwrite attempt detected to spans multiple pages (offset 0, size 4104)!
>
> CONFIG_HARDENED_USERCOPY_PAGESPAN=y is really only useful for
> debugging special cases. For now, I recommend leaving it disabled,
> since there are a lot of cases it still trips over.
>
> > I eventually sprinkled some printk-s and got this:
> >
> > 855 if (copy_from_user(buf, input, wblock->req_buf_size)) {
> > 856 dev_dbg(&wblock->dev.dev, "Copy %llu from user failed\n",
> > 857 wblock->req_buf_size);
> > 858 ret = -EFAULT;
> > 859 goto out_ioctl;
> > 860 }
>
> However, since you tracked this one down, I think this would be fixed
> by adjusting the handler_data allocation:
>
>
> diff --git a/drivers/platform/x86/wmi.c b/drivers/platform/x86/wmi.c
> index 8e3d0146ff8c..ea6bf98f197a 100644
> --- a/drivers/platform/x86/wmi.c
> +++ b/drivers/platform/x86/wmi.c
> @@ -918,8 +918,8 @@ static int wmi_dev_probe(struct device *dev)
> }
>
> count = get_order(wblock->req_buf_size);
> - wblock->handler_data = (void *)__get_free_pages(GFP_KERNEL,
> - count);
> + wblock->handler_data = (void *)
> + __get_free_pages(GFP_KERNEL | __GFP_COMP, count);
> if (!wblock->handler_data) {
> ret = -ENOMEM;
> goto probe_failure;
>
Your patch works OK for me, thank you. The libsmbios tool, however, not
so much. It appears to be behind latest developments.
# echo "+keyboard" >/sys/class/leds/dell\:\:kbd_backlight/start_triggers
is all that is needed today.
Regards,
> But in looking further, I don't know why this is using
> __get_free_pages() instead of kmalloc? In fact, there is a kfree() in
> the error path, which looks wrong:
>
> kfree(wblock->handler_data);
>
> I think this should just be converted to using kmalloc/kfree everywhere.
--
Mihai Donțu
next prev parent reply other threads:[~2018-06-17 19:30 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-06-16 21:01 wmi: usercopy: Kernel memory overwrite attempt detected to spans multiple pages (offset 0, size 4104) Mihai Donțu
2018-06-16 22:04 ` Mihai Donțu
2018-06-17 17:36 ` Kees Cook
2018-06-17 19:30 ` Mihai Donțu [this message]
2018-06-17 23:03 ` valdis.kletnieks
2018-06-18 13:34 ` Mario.Limonciello
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=1529263827.6069.4.camel@gmail.com \
--to=mihai.dontu@gmail.com \
--cc=andy@infradead.org \
--cc=dvhart@infradead.org \
--cc=keescook@chromium.org \
--cc=linux-kernel@vger.kernel.org \
--cc=platform-driver-x86@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