Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c8d550da authored by Hans Verkuil's avatar Hans Verkuil Committed by Greg Kroah-Hartman
Browse files

media: vivid: free bitmap_cap when updating std/timings/etc. 



commit 560ccb75c2caa6b1039dec1a53cd2ef526f5bf03 upstream.

When vivid_update_format_cap() is called it should free any overlay
bitmap since the compose size will change.

Signed-off-by: default avatarHans Verkuil <hverkuil-cisco@xs4all.nl>
Reported-by: default avatar <syzbot+0cc8e3cc63ca373722c6@syzkaller.appspotmail.com>
Cc: <stable@vger.kernel.org>      # for v3.18 and up
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab+samsung@kernel.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 468b4fb5

drivers/media/platform/vivid/vivid-vid-cap.c

+2 −0
Original line number Diff line number Diff line
@@ -452,6 +452,8 @@ void vivid_update_format_cap(struct vivid_dev *dev, bool keep_controls) 
		tpg_s_rgb_range(&dev->tpg, v4l2_ctrl_g_ctrl(dev->rgb_range_cap));

		break;

	}

	vfree(dev->bitmap_cap);

	dev->bitmap_cap = NULL;

	vivid_update_quality(dev);

	tpg_reset_source(&dev->tpg, dev->src_rect.width, dev->src_rect.height, dev->field_cap);

	dev->crop_cap = dev->src_rect;