diff options
| author | Matthew Wilcox <mawilcox@microsoft.com> | 2018-06-07 10:57:17 -0400 |
|---|---|---|
| committer | Kees Cook <keescook@chromium.org> | 2018-06-12 19:19:22 -0400 |
| commit | c817e6ccb2c36b8f564209d474bc6c8308c498e2 (patch) | |
| tree | 8ea397160d5e13e7f4227226e1680b496df54e36 | |
| parent | 7654cb1ba7d0f312a6841d35d0f576db4723e8a3 (diff) | |
Convert v4l2 event to struct_size
Signed-off-by: Matthew Wilcox <mawilcox@microsoft.com>
Signed-off-by: Kees Cook <keescook@chromium.org>
| -rw-r--r-- | drivers/media/v4l2-core/v4l2-event.c | 3 |
1 files changed, 1 insertions, 2 deletions
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, | |||
| 215 | if (elems < 1) | 215 | if (elems < 1) |
| 216 | elems = 1; | 216 | elems = 1; |
| 217 | 217 | ||
| 218 | sev = kvzalloc(sizeof(*sev) + sizeof(struct v4l2_kevent) * elems, | 218 | sev = kvzalloc(struct_size(sev, events, elems), GFP_KERNEL); |
| 219 | GFP_KERNEL); | ||
| 220 | if (!sev) | 219 | if (!sev) |
| 221 | return -ENOMEM; | 220 | return -ENOMEM; |
| 222 | for (i = 0; i < elems; i++) | 221 | for (i = 0; i < elems; i++) |