]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
media: venus: remove invalid compat_ioctl32 handler
authorArnd Bergmann <arnd@arndb.de>
Wed, 6 Nov 2019 09:06:54 +0000 (10:06 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 17 Dec 2019 19:06:47 +0000 (20:06 +0100)
commit 4adc0423de92cf850d1ef5c0e7cb28fd7a38219e upstream.

v4l2_compat_ioctl32() is the function that calls into
v4l2_file_operations->compat_ioctl32(), so setting that back to the same
function leads to a trivial endless loop, followed by a kernel
stack overrun.

Remove the incorrect assignment.

Cc: stable@vger.kernel.org
Fixes: 7472c1c69138 ("[media] media: venus: vdec: add video decoder files")
Fixes: aaaa93eda64b ("[media] media: venus: venc: add video encoder files")
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Acked-by: Stanimir Varbanov <stanimir.varbanov@linaro.org>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/media/platform/qcom/venus/vdec.c
drivers/media/platform/qcom/venus/venc.c

index e1f998656c07f2b50e45b02023d08b43a3607f76..fb399586a3ec6042baf291c4a84108b360e6d275 100644 (file)
@@ -1104,9 +1104,6 @@ static const struct v4l2_file_operations vdec_fops = {
        .unlocked_ioctl = video_ioctl2,
        .poll = v4l2_m2m_fop_poll,
        .mmap = v4l2_m2m_fop_mmap,
-#ifdef CONFIG_COMPAT
-       .compat_ioctl32 = v4l2_compat_ioctl32,
-#endif
 };
 
 static int vdec_probe(struct platform_device *pdev)
index a5f3d2c46bea6ba8456397ac2eeef4e578f66765..114e14e4e41c7413a883ea8f0ce5c8e5b7f15434 100644 (file)
@@ -1230,9 +1230,6 @@ static const struct v4l2_file_operations venc_fops = {
        .unlocked_ioctl = video_ioctl2,
        .poll = v4l2_m2m_fop_poll,
        .mmap = v4l2_m2m_fop_mmap,
-#ifdef CONFIG_COMPAT
-       .compat_ioctl32 = v4l2_compat_ioctl32,
-#endif
 };
 
 static int venc_probe(struct platform_device *pdev)