From 8bc76ae0f5ea60ad1e1e616c7d02ca236cf54efa Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Wed, 27 Apr 2022 15:46:50 +0200 Subject: [PATCH] 4.19-stable patches added patches: media-vicodec-upon-release-call-m2m-release-before-freeing-ctrl-handler.patch --- queue-4.14/series | 0 ...-release-before-freeing-ctrl-handler.patch | 39 +++++++++++++++++++ queue-4.19/series | 1 + queue-4.9/series | 0 4 files changed, 40 insertions(+) create mode 100644 queue-4.14/series create mode 100644 queue-4.19/media-vicodec-upon-release-call-m2m-release-before-freeing-ctrl-handler.patch create mode 100644 queue-4.19/series create mode 100644 queue-4.9/series diff --git a/queue-4.14/series b/queue-4.14/series new file mode 100644 index 00000000000..e69de29bb2d diff --git a/queue-4.19/media-vicodec-upon-release-call-m2m-release-before-freeing-ctrl-handler.patch b/queue-4.19/media-vicodec-upon-release-call-m2m-release-before-freeing-ctrl-handler.patch new file mode 100644 index 00000000000..1e6e4f62025 --- /dev/null +++ b/queue-4.19/media-vicodec-upon-release-call-m2m-release-before-freeing-ctrl-handler.patch @@ -0,0 +1,39 @@ +From 4d10452cd1ed619d95fde81cef837069f4c754cd Mon Sep 17 00:00:00 2001 +From: Dafna Hirschfeld +Date: Wed, 6 Mar 2019 16:13:25 -0500 +Subject: media: vicodec: upon release, call m2m release before freeing ctrl handler + +From: Dafna Hirschfeld + +commit 4d10452cd1ed619d95fde81cef837069f4c754cd upstream. + +'v4l2_m2m_ctx_release' calls request complete +so it should be called before 'v4l2_ctrl_handler_free'. + +Signed-off-by: Dafna Hirschfeld +Signed-off-by: Hans Verkuil +Signed-off-by: Mauro Carvalho Chehab +Cc: Minh Yuan +Signed-off-by: Greg Kroah-Hartman +--- + drivers/media/platform/vicodec/vicodec-core.c | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +--- a/drivers/media/platform/vicodec/vicodec-core.c ++++ b/drivers/media/platform/vicodec/vicodec-core.c +@@ -1297,12 +1297,12 @@ static int vicodec_release(struct file * + struct video_device *vfd = video_devdata(file); + struct vicodec_ctx *ctx = file2ctx(file); + +- v4l2_fh_del(&ctx->fh); +- v4l2_fh_exit(&ctx->fh); +- v4l2_ctrl_handler_free(&ctx->hdl); + mutex_lock(vfd->lock); + v4l2_m2m_ctx_release(ctx->fh.m2m_ctx); + mutex_unlock(vfd->lock); ++ v4l2_fh_del(&ctx->fh); ++ v4l2_fh_exit(&ctx->fh); ++ v4l2_ctrl_handler_free(&ctx->hdl); + kfree(ctx); + + return 0; diff --git a/queue-4.19/series b/queue-4.19/series new file mode 100644 index 00000000000..0b928748f73 --- /dev/null +++ b/queue-4.19/series @@ -0,0 +1 @@ +media-vicodec-upon-release-call-m2m-release-before-freeing-ctrl-handler.patch diff --git a/queue-4.9/series b/queue-4.9/series new file mode 100644 index 00000000000..e69de29bb2d -- 2.47.3