media: videobuf2: add WARN_ON_ONCE if bytesused is bigger than buffer length
authorDafna Hirschfeld <dafna.hirschfeld@collabora.com>
Wed, 1 Dec 2021 22:56:51 +0000 (23:56 +0100)
committerMauro Carvalho Chehab <mchehab+huawei@kernel.org>
Tue, 7 Dec 2021 10:29:56 +0000 (11:29 +0100)
In function vb2_set_plane_payload, report if the given bytesused is
bigger than the buffer size, and clamp it to the buffer size.

Signed-off-by: Dafna Hirschfeld <dafna.hirschfeld@collabora.com>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
include/media/videobuf2-core.h

index 2467284e5f26dd3c998c383428223593cb02f4ff..5468b633b9d2093eb258e2c1c83cf8dd0e31ce8a 100644 (file)
@@ -1155,8 +1155,15 @@ static inline void *vb2_get_drv_priv(struct vb2_queue *q)
 static inline void vb2_set_plane_payload(struct vb2_buffer *vb,
                                 unsigned int plane_no, unsigned long size)
 {
-       if (plane_no < vb->num_planes)
+       /*
+        * size must never be larger than the buffer length, so
+        * warn and clamp to the buffer length if that's the case.
+        */
+       if (plane_no < vb->num_planes) {
+               if (WARN_ON_ONCE(size > vb->planes[plane_no].length))
+                       size = vb->planes[plane_no].length;
                vb->planes[plane_no].bytesused = size;
+       }
 }
 
 /**