diff options
| -rw-r--r-- | queue-6.1/media-uvcvideo-rollback-non-processed-entities-on-error.patch | 116 | ||||
| -rw-r--r-- | queue-6.1/series | 1 |
2 files changed, 117 insertions, 0 deletions
diff --git a/queue-6.1/media-uvcvideo-rollback-non-processed-entities-on-error.patch b/queue-6.1/media-uvcvideo-rollback-non-processed-entities-on-error.patch new file mode 100644 index 0000000000..69a8d53fa2 --- /dev/null +++ b/queue-6.1/media-uvcvideo-rollback-non-processed-entities-on-error.patch @@ -0,0 +1,116 @@ +From a70705d3c020d0d5c3ab6a5cc93e011ac35e7d48 Mon Sep 17 00:00:00 2001 +From: Ricardo Ribalda <ribalda@chromium.org> +Date: Mon, 24 Feb 2025 10:34:55 +0000 +Subject: media: uvcvideo: Rollback non processed entities on error + +From: Ricardo Ribalda <ribalda@chromium.org> + +commit a70705d3c020d0d5c3ab6a5cc93e011ac35e7d48 upstream. + +If we fail to commit an entity, we need to restore the +UVC_CTRL_DATA_BACKUP for the other uncommitted entities. Otherwise the +control cache and the device would be out of sync. + +Cc: stable@kernel.org +Fixes: b4012002f3a3 ("[media] uvcvideo: Add support for control events") +Reported-by: Hans de Goede <hdegoede@redhat.com> +Closes: https://lore.kernel.org/linux-media/fe845e04-9fde-46ee-9763-a6f00867929a@redhat.com/ +Signed-off-by: Ricardo Ribalda <ribalda@chromium.org> +Message-ID: <20250224-uvc-data-backup-v2-3-de993ed9823b@chromium.org> +Signed-off-by: Hans de Goede <hdegoede@redhat.com> +Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl> +Signed-off-by: Ricardo Ribalda <ribalda@chromium.org> +Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> +--- + drivers/media/usb/uvc/uvc_ctrl.c | 40 +++++++++++++++++++++++++-------------- + 1 file changed, 26 insertions(+), 14 deletions(-) + +--- a/drivers/media/usb/uvc/uvc_ctrl.c ++++ b/drivers/media/usb/uvc/uvc_ctrl.c +@@ -1752,7 +1752,7 @@ static int uvc_ctrl_commit_entity(struct + unsigned int processed_ctrls = 0; + struct uvc_control *ctrl; + unsigned int i; +- int ret; ++ int ret = 0; + + if (entity == NULL) + return 0; +@@ -1781,8 +1781,6 @@ static int uvc_ctrl_commit_entity(struct + dev->intfnum, ctrl->info.selector, + uvc_ctrl_data(ctrl, UVC_CTRL_DATA_CURRENT), + ctrl->info.size); +- else +- ret = 0; + + if (!ret) + processed_ctrls++; +@@ -1794,17 +1792,24 @@ static int uvc_ctrl_commit_entity(struct + + ctrl->dirty = 0; + +- if (ret < 0) { ++ if (!rollback && handle && !ret && ++ ctrl->info.flags & UVC_CTRL_FLAG_ASYNCHRONOUS) ++ uvc_ctrl_set_handle(handle, ctrl, handle); ++ ++ if (ret < 0 && !rollback) { + if (err_ctrl) + *err_ctrl = ctrl; +- return ret; ++ /* ++ * If we fail to set a control, we need to rollback ++ * the next ones. ++ */ ++ rollback = 1; + } +- +- if (!rollback && handle && +- ctrl->info.flags & UVC_CTRL_FLAG_ASYNCHRONOUS) +- uvc_ctrl_set_handle(handle, ctrl, handle); + } + ++ if (ret) ++ return ret; ++ + return processed_ctrls; + } + +@@ -1835,7 +1840,8 @@ int __uvc_ctrl_commit(struct uvc_fh *han + struct uvc_video_chain *chain = handle->chain; + struct uvc_control *err_ctrl; + struct uvc_entity *entity; +- int ret = 0; ++ int ret_out = 0; ++ int ret; + + /* Find the control. */ + list_for_each_entry(entity, &chain->entities, chain) { +@@ -1846,17 +1852,23 @@ int __uvc_ctrl_commit(struct uvc_fh *han + ctrls->error_idx = + uvc_ctrl_find_ctrl_idx(entity, ctrls, + err_ctrl); +- goto done; ++ /* ++ * When we fail to commit an entity, we need to ++ * restore the UVC_CTRL_DATA_BACKUP for all the ++ * controls in the other entities, otherwise our cache ++ * and the hardware will be out of sync. ++ */ ++ rollback = 1; ++ ++ ret_out = ret; + } else if (ret > 0 && !rollback) { + uvc_ctrl_send_events(handle, entity, + ctrls->controls, ctrls->count); + } + } + +- ret = 0; +-done: + mutex_unlock(&chain->ctrl_mutex); +- return ret; ++ return ret_out; + } + + int uvc_ctrl_get(struct uvc_video_chain *chain, diff --git a/queue-6.1/series b/queue-6.1/series index 7404afaef6..28586a8f9f 100644 --- a/queue-6.1/series +++ b/queue-6.1/series @@ -121,3 +121,4 @@ fbdev-hyperv_fb-convert-comma-to-semicolon.patch eth-bnxt-fix-one-of-the-w-1-warnings-about-fortified-memcpy.patch bnxt_en-fix-w-1-warning-in-bnxt_dcb.c-from-fortify-memcpy.patch bnxt_en-fix-w-stringop-overflow-warning-in-bnxt_dcb.c.patch +media-uvcvideo-rollback-non-processed-entities-on-error.patch |