All of lore.kernel.org
 help / color / mirror / Atom feed
From: Peilin Ye <yepeilin.cs@gmail.com>
To: Mauro Carvalho Chehab <mchehab@kernel.org>
Cc: "Peilin Ye" <yepeilin.cs@gmail.com>,
	"Greg Kroah-Hartman" <gregkh@linuxfoundation.org>,
	syzkaller-bugs@googlegroups.com,
	"Hans Verkuil" <hverkuil-cisco@xs4all.nl>,
	"Sakari Ailus" <sakari.ailus@linux.intel.com>,
	"Arnd Bergmann" <arnd@arndb.de>,
	"Laurent Pinchart" <laurent.pinchart@ideasonboard.com>,
	"Vandana BN" <bnvandana@gmail.com>,
	"Ezequiel Garcia" <ezequiel@collabora.com>,
	"Niklas Söderlund" <niklas.soderlund+renesas@ragnatech.se>,
	linux-kernel-mentees@lists.linuxfoundation.org,
	linux-media@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: [Linux-kernel-mentees] [PATCH] media/v4l2-core: Fix kernel-infoleak in video_put_user()
Date: Sun, 26 Jul 2020 12:44:39 -0400	[thread overview]
Message-ID: <20200726164439.48973-1-yepeilin.cs@gmail.com> (raw)

video_put_user() is copying uninitialized stack memory to userspace. Fix
it by initializing `vb32` using memset().

Reported-and-tested-by: syzbot+79d751604cb6f29fbf59@syzkaller.appspotmail.com
Link: https://syzkaller.appspot.com/bug?extid=79d751604cb6f29fbf59
Signed-off-by: Peilin Ye <yepeilin.cs@gmail.com>
---
 drivers/media/v4l2-core/v4l2-ioctl.c | 32 +++++++++++++++-------------
 1 file changed, 17 insertions(+), 15 deletions(-)

diff --git a/drivers/media/v4l2-core/v4l2-ioctl.c b/drivers/media/v4l2-core/v4l2-ioctl.c
index a556880f225a..08909f58dc80 100644
--- a/drivers/media/v4l2-core/v4l2-ioctl.c
+++ b/drivers/media/v4l2-core/v4l2-ioctl.c
@@ -3210,21 +3210,23 @@ static int video_put_user(void __user *arg, void *parg, unsigned int cmd)
 	case VIDIOC_DQBUF_TIME32:
 	case VIDIOC_PREPARE_BUF_TIME32: {
 		struct v4l2_buffer *vb = parg;
-		struct v4l2_buffer_time32 vb32 = {
-			.index		= vb->index,
-			.type		= vb->type,
-			.bytesused	= vb->bytesused,
-			.flags		= vb->flags,
-			.field		= vb->field,
-			.timestamp.tv_sec	= vb->timestamp.tv_sec,
-			.timestamp.tv_usec	= vb->timestamp.tv_usec,
-			.timecode	= vb->timecode,
-			.sequence	= vb->sequence,
-			.memory		= vb->memory,
-			.m.userptr	= vb->m.userptr,
-			.length		= vb->length,
-			.request_fd	= vb->request_fd,
-		};
+		struct v4l2_buffer_time32 vb32;
+
+		memset(&vb32, 0, sizeof(vb32));
+
+		vb32.index	= vb->index;
+		vb32.type	= vb->type;
+		vb32.bytesused	= vb->bytesused;
+		vb32.flags	= vb->flags;
+		vb32.field	= vb->field;
+		vb32.timestamp.tv_sec	= vb->timestamp.tv_sec;
+		vb32.timestamp.tv_usec	= vb->timestamp.tv_usec;
+		vb32.timecode	= vb->timecode;
+		vb32.sequence	= vb->sequence;
+		vb32.memory	= vb->memory;
+		vb32.m.userptr	= vb->m.userptr;
+		vb32.length	= vb->length;
+		vb32.request_fd	= vb->request_fd;
 
 		if (copy_to_user(arg, &vb32, sizeof(vb32)))
 			return -EFAULT;
-- 
2.25.1


WARNING: multiple messages have this Message-ID (diff)
From: Peilin Ye <yepeilin.cs@gmail.com>
To: Mauro Carvalho Chehab <mchehab@kernel.org>
Cc: "Niklas Söderlund" <niklas.soderlund+renesas@ragnatech.se>,
	"Arnd Bergmann" <arnd@arndb.de>,
	syzkaller-bugs@googlegroups.com, linux-kernel@vger.kernel.org,
	"Laurent Pinchart" <laurent.pinchart@ideasonboard.com>,
	"Sakari Ailus" <sakari.ailus@linux.intel.com>,
	"Vandana BN" <bnvandana@gmail.com>,
	"Hans Verkuil" <hverkuil-cisco@xs4all.nl>,
	linux-media@vger.kernel.org,
	"Ezequiel Garcia" <ezequiel@collabora.com>,
	"Peilin Ye" <yepeilin.cs@gmail.com>,
	linux-kernel-mentees@lists.linuxfoundation.org
Subject: [Linux-kernel-mentees] [PATCH] media/v4l2-core: Fix kernel-infoleak in video_put_user()
Date: Sun, 26 Jul 2020 12:44:39 -0400	[thread overview]
Message-ID: <20200726164439.48973-1-yepeilin.cs@gmail.com> (raw)

video_put_user() is copying uninitialized stack memory to userspace. Fix
it by initializing `vb32` using memset().

Reported-and-tested-by: syzbot+79d751604cb6f29fbf59@syzkaller.appspotmail.com
Link: https://syzkaller.appspot.com/bug?extid=79d751604cb6f29fbf59
Signed-off-by: Peilin Ye <yepeilin.cs@gmail.com>
---
 drivers/media/v4l2-core/v4l2-ioctl.c | 32 +++++++++++++++-------------
 1 file changed, 17 insertions(+), 15 deletions(-)

diff --git a/drivers/media/v4l2-core/v4l2-ioctl.c b/drivers/media/v4l2-core/v4l2-ioctl.c
index a556880f225a..08909f58dc80 100644
--- a/drivers/media/v4l2-core/v4l2-ioctl.c
+++ b/drivers/media/v4l2-core/v4l2-ioctl.c
@@ -3210,21 +3210,23 @@ static int video_put_user(void __user *arg, void *parg, unsigned int cmd)
 	case VIDIOC_DQBUF_TIME32:
 	case VIDIOC_PREPARE_BUF_TIME32: {
 		struct v4l2_buffer *vb = parg;
-		struct v4l2_buffer_time32 vb32 = {
-			.index		= vb->index,
-			.type		= vb->type,
-			.bytesused	= vb->bytesused,
-			.flags		= vb->flags,
-			.field		= vb->field,
-			.timestamp.tv_sec	= vb->timestamp.tv_sec,
-			.timestamp.tv_usec	= vb->timestamp.tv_usec,
-			.timecode	= vb->timecode,
-			.sequence	= vb->sequence,
-			.memory		= vb->memory,
-			.m.userptr	= vb->m.userptr,
-			.length		= vb->length,
-			.request_fd	= vb->request_fd,
-		};
+		struct v4l2_buffer_time32 vb32;
+
+		memset(&vb32, 0, sizeof(vb32));
+
+		vb32.index	= vb->index;
+		vb32.type	= vb->type;
+		vb32.bytesused	= vb->bytesused;
+		vb32.flags	= vb->flags;
+		vb32.field	= vb->field;
+		vb32.timestamp.tv_sec	= vb->timestamp.tv_sec;
+		vb32.timestamp.tv_usec	= vb->timestamp.tv_usec;
+		vb32.timecode	= vb->timecode;
+		vb32.sequence	= vb->sequence;
+		vb32.memory	= vb->memory;
+		vb32.m.userptr	= vb->m.userptr;
+		vb32.length	= vb->length;
+		vb32.request_fd	= vb->request_fd;
 
 		if (copy_to_user(arg, &vb32, sizeof(vb32)))
 			return -EFAULT;
-- 
2.25.1

_______________________________________________
Linux-kernel-mentees mailing list
Linux-kernel-mentees@lists.linuxfoundation.org
https://lists.linuxfoundation.org/mailman/listinfo/linux-kernel-mentees

             reply	other threads:[~2020-07-26 16:45 UTC|newest]

Thread overview: 76+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-07-26 16:44 Peilin Ye [this message]
2020-07-26 16:44 ` [Linux-kernel-mentees] [PATCH] media/v4l2-core: Fix kernel-infoleak in video_put_user() Peilin Ye
2020-07-26 17:30 ` Laurent Pinchart
2020-07-26 17:30   ` Laurent Pinchart
2020-07-26 18:07   ` Peilin Ye
2020-07-26 18:07     ` Peilin Ye
2020-07-26 22:08     ` Laurent Pinchart
2020-07-26 22:08       ` Laurent Pinchart
2020-07-26 22:15       ` Peilin Ye
2020-07-26 22:15         ` Peilin Ye
2020-07-26 18:12   ` Peilin Ye
2020-07-26 18:12     ` Peilin Ye
2020-07-26 22:05 ` [Linux-kernel-mentees] [PATCH v2] " Peilin Ye
2020-07-26 22:05   ` Peilin Ye
2020-07-26 22:10   ` Laurent Pinchart
2020-07-26 22:10     ` Laurent Pinchart
2020-07-26 22:16     ` Peilin Ye
2020-07-26 22:16       ` Peilin Ye
2020-07-26 22:27   ` [Linux-kernel-mentees] [PATCH v3] " Peilin Ye
2020-07-26 22:27     ` Peilin Ye
2020-07-27  7:25     ` Arnd Bergmann
2020-07-27  7:25       ` Arnd Bergmann
2020-07-27  7:56       ` Peilin Ye
2020-07-27  7:56         ` Peilin Ye
2020-07-27 13:16       ` Dan Carpenter
2020-07-27 13:16         ` Dan Carpenter
2020-07-27 14:05         ` Arnd Bergmann
2020-07-27 14:05           ` Arnd Bergmann
2020-07-27 14:14           ` Peilin Ye
2020-07-27 14:14             ` Peilin Ye
2020-07-27 14:20             ` Arnd Bergmann
2020-07-27 14:20               ` Arnd Bergmann
2020-07-27 14:46             ` Dan Carpenter
2020-07-27 14:46               ` Dan Carpenter
2020-07-27 15:30               ` Peilin Ye
2020-07-27 15:30                 ` Peilin Ye
2020-07-27 14:43           ` Dan Carpenter
2020-07-27 14:43             ` Dan Carpenter
2020-07-27 14:55             ` Arnd Bergmann
2020-07-27 14:55               ` Arnd Bergmann
2020-07-27 22:04         ` Peilin Ye
2020-07-27 22:04           ` Peilin Ye
2020-07-28  9:00           ` Arnd Bergmann
2020-07-28  9:00             ` Arnd Bergmann
2020-07-28 10:02           ` Dan Carpenter
2020-07-28 10:02             ` Dan Carpenter
2020-07-27 22:33         ` Peilin Ye
2020-07-27 22:33           ` Peilin Ye
2020-07-28  9:10           ` Arnd Bergmann
2020-07-28  9:10             ` Arnd Bergmann
2020-07-28  9:47           ` Dan Carpenter
2020-07-28  9:47             ` Dan Carpenter
2020-07-28 13:13             ` Peilin Ye
2020-07-28 13:13               ` Peilin Ye
2020-07-28 12:22         ` Linus Walleij
2020-07-28 12:22           ` Linus Walleij
2020-07-28 13:06           ` Dan Carpenter
2020-07-28 13:06             ` Dan Carpenter
2020-07-28 13:58             ` Arnd Bergmann
2020-07-28 13:58               ` Arnd Bergmann
2020-07-30  8:07               ` Bartosz Golaszewski
2020-07-30  8:07                 ` Bartosz Golaszewski
2020-07-30  8:15                 ` Arnd Bergmann
2020-07-30  8:15                   ` Arnd Bergmann
2020-07-30  8:38                   ` Andy Shevchenko
2020-07-30  8:38                     ` Andy Shevchenko
2020-07-30  9:18                     ` Arnd Bergmann
2020-07-30  9:18                       ` Arnd Bergmann
2020-07-30 11:48                       ` Andy Shevchenko
2020-07-30 11:48                         ` Andy Shevchenko
2020-07-30 13:49                         ` Arnd Bergmann
2020-07-30 13:49                           ` Arnd Bergmann
2020-08-02 16:55         ` Peilin Ye
2020-08-02 16:55           ` Peilin Ye
2020-07-27  8:00     ` [Linux-kernel-mentees] [PATCH v4] " Peilin Ye
2020-07-27  8:00       ` Peilin Ye

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=20200726164439.48973-1-yepeilin.cs@gmail.com \
    --to=yepeilin.cs@gmail.com \
    --cc=arnd@arndb.de \
    --cc=bnvandana@gmail.com \
    --cc=ezequiel@collabora.com \
    --cc=gregkh@linuxfoundation.org \
    --cc=hverkuil-cisco@xs4all.nl \
    --cc=laurent.pinchart@ideasonboard.com \
    --cc=linux-kernel-mentees@lists.linuxfoundation.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-media@vger.kernel.org \
    --cc=mchehab@kernel.org \
    --cc=niklas.soderlund+renesas@ragnatech.se \
    --cc=sakari.ailus@linux.intel.com \
    --cc=syzkaller-bugs@googlegroups.com \
    /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.