From: Matthew Wilcox <mawilcox@microsoft.com>
Date: Thu, 7 Jun 2018 14:57:17 +0000 (-0700)
Subject: Convert v4l2 event to struct_size
X-Git-Tag: microblaze-v4.19-rc1~121^2~22
X-Git-Url: http://git.monstr.eu/?a=commitdiff_plain;h=c817e6ccb2c36b8f564209d474bc6c8308c498e2;p=linux-2.6-microblaze.git

Convert v4l2 event to struct_size

Signed-off-by: Matthew Wilcox <mawilcox@microsoft.com>
Signed-off-by: Kees Cook <keescook@chromium.org>
---

diff --git a/drivers/media/v4l2-core/v4l2-event.c b/drivers/media/v4l2-core/v4l2-event.c
index 968c2eb08b5a..127fe6eb91d9 100644
--- a/drivers/media/v4l2-core/v4l2-event.c
+++ b/drivers/media/v4l2-core/v4l2-event.c
@@ -215,8 +215,7 @@ int v4l2_event_subscribe(struct v4l2_fh *fh,
 	if (elems < 1)
 		elems = 1;
 
-	sev = kvzalloc(sizeof(*sev) + sizeof(struct v4l2_kevent) * elems,
-		       GFP_KERNEL);
+	sev = kvzalloc(struct_size(sev, events, elems), GFP_KERNEL);
 	if (!sev)
 		return -ENOMEM;
 	for (i = 0; i < elems; i++)