| Message ID | 20191106090731.3152446-1-arnd@arndb.de (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 4adc0423de92cf850d1ef5c0e7cb28fd7a38219e |
| Headers | show |
| Series | media: venus: remove invalid compat_ioctl32 handler | expand |
Hi Arnd, Thanks for the catch! On 11/6/19 11:06 AM, Arnd Bergmann wrote: > 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> > --- > drivers/media/platform/qcom/venus/vdec.c | 3 --- > drivers/media/platform/qcom/venus/venc.c | 3 --- > 2 files changed, 6 deletions(-) > > diff --git a/drivers/media/platform/qcom/venus/vdec.c b/drivers/media/platform/qcom/venus/vdec.c > index 7f4660555ddb..59ae7a1e63bc 100644 > --- a/drivers/media/platform/qcom/venus/vdec.c > +++ b/drivers/media/platform/qcom/venus/vdec.c > @@ -1412,9 +1412,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) > diff --git a/drivers/media/platform/qcom/venus/venc.c b/drivers/media/platform/qcom/venus/venc.c > index 1b7fb2d5887c..30028ceb548b 100644 > --- a/drivers/media/platform/qcom/venus/venc.c > +++ b/drivers/media/platform/qcom/venus/venc.c > @@ -1235,9 +1235,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) >
diff --git a/drivers/media/platform/qcom/venus/vdec.c b/drivers/media/platform/qcom/venus/vdec.c index 7f4660555ddb..59ae7a1e63bc 100644 --- a/drivers/media/platform/qcom/venus/vdec.c +++ b/drivers/media/platform/qcom/venus/vdec.c @@ -1412,9 +1412,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) diff --git a/drivers/media/platform/qcom/venus/venc.c b/drivers/media/platform/qcom/venus/venc.c index 1b7fb2d5887c..30028ceb548b 100644 --- a/drivers/media/platform/qcom/venus/venc.c +++ b/drivers/media/platform/qcom/venus/venc.c @@ -1235,9 +1235,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)
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> --- drivers/media/platform/qcom/venus/vdec.c | 3 --- drivers/media/platform/qcom/venus/venc.c | 3 --- 2 files changed, 6 deletions(-)