* [PATCH][next] media: usb: pwc-uncompress: Use struct_size() helper in pwc_decompress()
@ 2022-01-20 21:24 Gustavo A. R. Silva
2022-01-20 23:22 ` Kees Cook
0 siblings, 1 reply; 2+ messages in thread
From: Gustavo A. R. Silva @ 2022-01-20 21:24 UTC (permalink / raw)
To: Hans Verkuil, Mauro Carvalho Chehab
Cc: linux-media, linux-kernel, Gustavo A. R. Silva, linux-hardening
Make use of the struct_size() helper instead of an open-coded version,
in order to avoid any potential type mistakes or integer overflows that,
in the worst scenario, could lead to heap overflows.
Also, address the following sparse warnings:
drivers/media/usb/pwc/pwc-uncompress.c:44:44: warning: using sizeof on a flexible structure
Link: https://github.com/KSPP/linux/issues/174
Signed-off-by: Gustavo A. R. Silva <gustavoars@kernel.org>
---
drivers/media/usb/pwc/pwc-uncompress.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/media/usb/pwc/pwc-uncompress.c b/drivers/media/usb/pwc/pwc-uncompress.c
index 68bc3829c6b3..faf44cdeb268 100644
--- a/drivers/media/usb/pwc/pwc-uncompress.c
+++ b/drivers/media/usb/pwc/pwc-uncompress.c
@@ -41,7 +41,7 @@ int pwc_decompress(struct pwc_device *pdev, struct pwc_frame_buf *fbuf)
memcpy(raw_frame->cmd, pdev->cmd_buf, 4);
memcpy(raw_frame+1, yuv, pdev->frame_size);
vb2_set_plane_payload(&fbuf->vb.vb2_buf, 0,
- pdev->frame_size + sizeof(struct pwc_raw_frame));
+ struct_size(raw_frame, rawframe, pdev->frame_size));
return 0;
}
--
2.27.0
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH][next] media: usb: pwc-uncompress: Use struct_size() helper in pwc_decompress()
2022-01-20 21:24 [PATCH][next] media: usb: pwc-uncompress: Use struct_size() helper in pwc_decompress() Gustavo A. R. Silva
@ 2022-01-20 23:22 ` Kees Cook
0 siblings, 0 replies; 2+ messages in thread
From: Kees Cook @ 2022-01-20 23:22 UTC (permalink / raw)
To: Gustavo A. R. Silva
Cc: Hans Verkuil, Mauro Carvalho Chehab, linux-media, linux-kernel,
linux-hardening
On Thu, Jan 20, 2022 at 03:24:34PM -0600, Gustavo A. R. Silva wrote:
> Make use of the struct_size() helper instead of an open-coded version,
> in order to avoid any potential type mistakes or integer overflows that,
> in the worst scenario, could lead to heap overflows.
>
> Also, address the following sparse warnings:
> drivers/media/usb/pwc/pwc-uncompress.c:44:44: warning: using sizeof on a flexible structure
>
> Link: https://github.com/KSPP/linux/issues/174
> Signed-off-by: Gustavo A. R. Silva <gustavoars@kernel.org>
Yup, happy to see these getting changed.
Reviewed-by: Kees Cook <keescook@chromium.org>
> ---
> drivers/media/usb/pwc/pwc-uncompress.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/media/usb/pwc/pwc-uncompress.c b/drivers/media/usb/pwc/pwc-uncompress.c
> index 68bc3829c6b3..faf44cdeb268 100644
> --- a/drivers/media/usb/pwc/pwc-uncompress.c
> +++ b/drivers/media/usb/pwc/pwc-uncompress.c
> @@ -41,7 +41,7 @@ int pwc_decompress(struct pwc_device *pdev, struct pwc_frame_buf *fbuf)
> memcpy(raw_frame->cmd, pdev->cmd_buf, 4);
> memcpy(raw_frame+1, yuv, pdev->frame_size);
> vb2_set_plane_payload(&fbuf->vb.vb2_buf, 0,
> - pdev->frame_size + sizeof(struct pwc_raw_frame));
> + struct_size(raw_frame, rawframe, pdev->frame_size));
> return 0;
> }
>
> --
> 2.27.0
>
--
Kees Cook
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2022-01-20 23:22 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-01-20 21:24 [PATCH][next] media: usb: pwc-uncompress: Use struct_size() helper in pwc_decompress() Gustavo A. R. Silva
2022-01-20 23:22 ` Kees Cook
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).