summaryrefslogtreecommitdiffstats
path: root/drivers/media
diff options
context:
space:
mode:
authorHans Verkuil <hverkuil@xs4all.nl>2019-05-27 05:31:13 -0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2019-07-31 07:28:22 +0200
commit8cc26f962d484def32a5e5f48492baec1bbe8fa4 (patch)
tree2e080b7ec38f479b9a647c6d97d20a94f447add1 /drivers/media
parent457b9eb243425d4269e5c6797436603bb88859cc (diff)
downloadlinux-stable-8cc26f962d484def32a5e5f48492baec1bbe8fa4.tar.gz
linux-stable-8cc26f962d484def32a5e5f48492baec1bbe8fa4.tar.bz2
linux-stable-8cc26f962d484def32a5e5f48492baec1bbe8fa4.zip
media: mc-device.c: don't memset __user pointer contents
[ Upstream commit 518fa4e0e0da97ea2e17c95ab57647ce748a96e2 ] You can't memset the contents of a __user pointer. Instead, call copy_to_user to copy links.reserved (which is zeroed) to the user memory. This fixes this sparse warning: SPARSE:drivers/media/mc/mc-device.c drivers/media/mc/mc-device.c:521:16: warning: incorrect type in argument 1 (different address spaces) Fixes: f49308878d720 ("media: media_device_enum_links32: clean a reserved field") Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl> Reviewed-by: Sakari Ailus <sakari.ailus@linux.intel.com> Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org> Signed-off-by: Sasha Levin <sashal@kernel.org>
Diffstat (limited to 'drivers/media')
-rw-r--r--drivers/media/media-device.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/media/media-device.c b/drivers/media/media-device.c
index a6d56154fac7..4eb51a618fe1 100644
--- a/drivers/media/media-device.c
+++ b/drivers/media/media-device.c
@@ -486,8 +486,9 @@ static long media_device_enum_links32(struct media_device *mdev,
if (ret)
return ret;
- memset(ulinks->reserved, 0, sizeof(ulinks->reserved));
-
+ if (copy_to_user(ulinks->reserved, links.reserved,
+ sizeof(ulinks->reserved)))
+ return -EFAULT;
return 0;
}