]> git.proxmox.com Git - mirror_ubuntu-bionic-kernel.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)
committerMarcelo Henrique Cerri <marcelo.cerri@canonical.com>
Fri, 17 Jan 2020 17:22:31 +0000 (14:22 -0300)
BugLink: https://bugs.launchpad.net/bugs/1857158
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>
Signed-off-by: Kamal Mostafa <kamal@canonical.com>
Signed-off-by: Kleber Sacilotto de Souza <kleber.souza@canonical.com>
drivers/media/platform/qcom/venus/vdec.c
drivers/media/platform/qcom/venus/venc.c

index c9e9576bb08a4e1f568aec1ea55ad003e66dded6..5f0965593a0d13c2b1235aa01cabbbd51d610241 100644 (file)
@@ -1060,9 +1060,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 e3a10a852cade9cb8eca6b1768a73ce4cab8d0b0..9a952050239bbab06ea919fdc712905171dc25d2 100644 (file)
@@ -1204,9 +1204,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)