]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
ALSA: usb-audio: qcom: Guard sideband endpoint removal
authorCássio Gabriel <cassiogabrielcontato@gmail.com>
Thu, 11 Jun 2026 13:57:22 +0000 (10:57 -0300)
committerTakashi Iwai <tiwai@suse.de>
Fri, 12 Jun 2026 09:01:47 +0000 (11:01 +0200)
qmi_stop_session() conditionally looks up the cached data and sync
endpoints, but removes each endpoint unconditionally.

The data endpoint is always present for an active offload stream, while
the sync endpoint is optional. When no sync endpoint exists, ep still
refers to the data endpoint and the code attempts to remove that endpoint
a second time. The current sideband implementation rejects the duplicate
removal, but the teardown path should not pass an unrelated endpoint for
an absent sync endpoint.

Only look up and remove an endpoint when its cached pipe exists, check the
lookup result, and clear the cached pipe after handling it. This matches
the normal stream-disable path.

Fixes: 326bbc348298 ("ALSA: usb-audio: qcom: Introduce QC USB SND offloading support")
Signed-off-by: Cássio Gabriel <cassiogabrielcontato@gmail.com>
Link: https://patch.msgid.link/20260611-alsa-usb-qcom-guard-sideband-endpoint-removal-v1-1-00e73787c156@gmail.com
Signed-off-by: Takashi Iwai <tiwai@suse.de>
sound/usb/qcom/qc_audio_offload.c

index b2b719238b0b6bf753c0238189b1f781beb5f5ae..a3f90cc7c6cadf46b9e5194b0a1dfcb61e9d7ed9 100644 (file)
@@ -794,15 +794,23 @@ static void qmi_stop_session(void)
                                continue;
                        }
                        /* Release XHCI endpoints */
-                       if (info->data_ep_pipe)
+                       if (info->data_ep_pipe) {
                                ep = usb_pipe_endpoint(uadev[pcm_card_num].udev,
                                                       info->data_ep_pipe);
-                       xhci_sideband_remove_endpoint(uadev[pcm_card_num].sb, ep);
+                               if (ep)
+                                       xhci_sideband_remove_endpoint(uadev[pcm_card_num].sb,
+                                                                     ep);
+                               info->data_ep_pipe = 0;
+                       }
 
-                       if (info->sync_ep_pipe)
+                       if (info->sync_ep_pipe) {
                                ep = usb_pipe_endpoint(uadev[pcm_card_num].udev,
                                                       info->sync_ep_pipe);
-                       xhci_sideband_remove_endpoint(uadev[pcm_card_num].sb, ep);
+                               if (ep)
+                                       xhci_sideband_remove_endpoint(uadev[pcm_card_num].sb,
+                                                                     ep);
+                               info->sync_ep_pipe = 0;
+                       }
 
                        disable_audio_stream(subs);
                }