aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <[email protected]>2021-05-03 13:56:30 +0200
committerGreg Kroah-Hartman <[email protected]>2021-05-13 17:29:55 +0200
commit3e465fc3846734e9489273d889f19cc17b4cf4bd (patch)
treeb89a912e26fe32b3aac6fd5c0ca376d15caf27d6
parent6a3239a738d86c5e9b5aad17fefe2c2bfd6ced83 (diff)
Revert "media: rcar_drif: fix a memory disclosure"
This reverts commit d39083234c60519724c6ed59509a2129fd2aed41. Because of recent interactions with developers from @umn.edu, all commits from them have been recently re-reviewed to ensure if they were correct or not. Upon review, it was determined that this commit is not needed at all as the media core already prevents memory disclosure on this codepath, so just drop the extra memset happening here. Cc: Kangjie Lu <[email protected]> Cc: Geert Uytterhoeven <[email protected]> Cc: Hans Verkuil <[email protected]> Cc: Mauro Carvalho Chehab <[email protected]> Fixes: d39083234c60 ("media: rcar_drif: fix a memory disclosure") Cc: stable <[email protected]> Reviewed-by: Mauro Carvalho Chehab <[email protected]> Reviewed-by: Fabrizio Castro <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Greg Kroah-Hartman <[email protected]>
-rw-r--r--drivers/media/platform/rcar_drif.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/media/platform/rcar_drif.c b/drivers/media/platform/rcar_drif.c
index 83bd9a412a56..1e3b68a8743a 100644
--- a/drivers/media/platform/rcar_drif.c
+++ b/drivers/media/platform/rcar_drif.c
@@ -915,7 +915,6 @@ static int rcar_drif_g_fmt_sdr_cap(struct file *file, void *priv,
{
struct rcar_drif_sdr *sdr = video_drvdata(file);
- memset(f->fmt.sdr.reserved, 0, sizeof(f->fmt.sdr.reserved));
f->fmt.sdr.pixelformat = sdr->fmt->pixelformat;
f->fmt.sdr.buffersize = sdr->fmt->buffersize;