From: Peilin Ye <yepeilin.cs@gmail.com>
To: David Laight <David.Laight@ACULAB.COM>
Cc: Arnd Bergmann <arnd@arndb.de>, David Airlie <airlied@linux.ie>,
"linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
"dri-devel@lists.freedesktop.org"
<dri-devel@lists.freedesktop.org>,
Daniel Vetter <daniel@ffwll.ch>,
"linux-kernel-mentees@lists.linuxfoundation.org"
<linux-kernel-mentees@lists.linuxfoundation.org>,
Dan Carpenter <dan.carpenter@oracle.com>
Subject: Re: [Linux-kernel-mentees] [PATCH v2] drm/bufs: Prevent kernel-infoleak in copy_one_buf()
Date: Tue, 28 Jul 2020 08:50:21 -0400 [thread overview]
Message-ID: <20200728125021.GA409978@PWN> (raw)
In-Reply-To: <3058d741282b463d8aa7c8aff62e4326@AcuMS.aculab.com>
On Tue, Jul 28, 2020 at 12:35:17PM +0000, David Laight wrote:
> From: Peilin Ye
> > Sent: 28 July 2020 12:52
> > Currently `struct drm_buf_desc` is defined as follows:
> >
> > struct drm_buf_desc {
> > int count;
> > int size;
> > int low_mark;
> > int high_mark;
> > enum {
> > _DRM_PAGE_ALIGN = 0x01,
> > _DRM_AGP_BUFFER = 0x02,
> > _DRM_SG_BUFFER = 0x04,
> > _DRM_FB_BUFFER = 0x08,
> > _DRM_PCI_BUFFER_RO = 0x10
> > } flags;
> > unsigned long agp_start;
> > };
> >
> > copy_one_buf() is potentially copying uninitialized kernel stack memory
> > to userspace, since the compiler may leave such "holes" (around `.flags`
> > and `.agp_start` fields) in this statically allocated structure. Prevent
> > it by initializing `v` with memset().
> >
> > Cc: stable@vger.kernel.org
> > Fixes: 5c7640ab6258 ("switch compat_drm_infobufs() to drm_ioctl_kernel()")
> > Suggested-by: Dan Carpenter <dan.carpenter@oracle.com>
> > Acked-by: Arnd Bergmann <arnd@arndb.de>
> > Signed-off-by: Peilin Ye <yepeilin.cs@gmail.com>
> > ---
> > Change in v2:
> > - Improve commit description. (Suggested by Arnd Bergmann
> > <arnd@arndb.de>)
> >
> > drivers/gpu/drm/drm_bufs.c | 12 ++++++++----
> > 1 file changed, 8 insertions(+), 4 deletions(-)
> >
> > diff --git a/drivers/gpu/drm/drm_bufs.c b/drivers/gpu/drm/drm_bufs.c
> > index a0735fbc144b..f99cd4a3f951 100644
> > --- a/drivers/gpu/drm/drm_bufs.c
> > +++ b/drivers/gpu/drm/drm_bufs.c
> > @@ -1349,10 +1349,14 @@ static int copy_one_buf(void *data, int count, struct drm_buf_entry *from)
> > {
> > struct drm_buf_info *request = data;
> > struct drm_buf_desc __user *to = &request->list[count];
> > - struct drm_buf_desc v = {.count = from->buf_count,
> > - .size = from->buf_size,
> > - .low_mark = from->low_mark,
> > - .high_mark = from->high_mark};
> > + struct drm_buf_desc v;
> > +
> > + memset(&v, 0, sizeof(v));
> > +
> > + v.count = from->buf_count;
> > + v.size = from->buf_size;
> > + v.low_mark = from->low_mark;
> > + v.high_mark = from->high_mark;
> >
> > if (copy_to_user(to, &v, offsetof(struct drm_buf_desc, flags)))
> > return -EFAULT;
>
> The memset() isn't needed.
> The copy_to_user() stops after the 4 'int' values so no 'random'
> kernel stack can get copied.
You are right, I overlooked that. Thank you for pointing this out!
Peilin Ye
> Quite why it is 'right' to leave the remaining part of each
> userspace structure unchanged is another matter.
>
> David.
>
> -
> Registered Address Lakeside, Bramley Road, Mount Farm, Milton Keynes, MK1 1PT, UK
> Registration No: 1397386 (Wales)
>
_______________________________________________
Linux-kernel-mentees mailing list
Linux-kernel-mentees@lists.linuxfoundation.org
https://lists.linuxfoundation.org/mailman/listinfo/linux-kernel-mentees
prev parent reply other threads:[~2020-07-28 12:50 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-07-28 1:43 [Linux-kernel-mentees] [PATCH] drm/bufs: Prevent kernel-infoleak in copy_one_buf() Peilin Ye
2020-07-28 8:11 ` Arnd Bergmann
2020-07-28 11:15 ` Peilin Ye
2020-07-28 11:52 ` [Linux-kernel-mentees] [PATCH v2] " Peilin Ye
2020-07-28 12:35 ` David Laight
2020-07-28 12:50 ` Peilin Ye [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=20200728125021.GA409978@PWN \
--to=yepeilin.cs@gmail.com \
--cc=David.Laight@ACULAB.COM \
--cc=airlied@linux.ie \
--cc=arnd@arndb.de \
--cc=dan.carpenter@oracle.com \
--cc=daniel@ffwll.ch \
--cc=dri-devel@lists.freedesktop.org \
--cc=linux-kernel-mentees@lists.linuxfoundation.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;
as well as URLs for NNTP newsgroup(s).