mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Will Porter <mrwillporter@gmail.com>
To: Takashi Iwai <tiwai@suse.com>
Cc: "Jaroslav Kysela" <perex@perex.cz>,
	"Geoffrey D. Bennett" <g@b4.vu>,
	"Asahi Lina" <lina@asahilina.net>,
	"Chris J Arges" <chris.j.arges@canonical.com>,
	"Nick Kossifidis" <mickflemm@gmail.com>,
	"Detlef Urban" <onkel@paraair.de>,
	"Roy Vegard Ovesen" <roy.vegard.ovesen@gmail.com>,
	fenugrec <fenugrec@mail.com>,
	"Frederic Popp" <frederic.l.popp@t-online.de>,
	"Cássio Gabriel" <cassiogabrielcontato@gmail.com>,
	"Shipei Qu" <qu@darknavy.com>,
	linux-sound@vger.kernel.org, linux-kernel@vger.kernel.org,
	"Will Porter" <mrwillporter@gmail.com>
Subject: [PATCH 5/6] ALSA: usb-audio: Add PM guards to RME Digiface controls
Date: Thu, 27 Aug 2026 18:21:42 -0500	[thread overview]
Message-ID: <20260827232143.149197-6-mrwillporter@gmail.com> (raw)
In-Reply-To: <20260827232143.149197-1-mrwillporter@gmail.com>

The RME Digiface status and register helpers issue vendor requests
without preventing runtime suspend or disconnect. The volatile status
controls can repeatedly reach these unguarded paths while userspace
polls them.

Protect both helpers with snd_usb_lock. All Digiface get and put
callbacks then resume the device and hold the disconnect reference
across their transfer.

Assisted-by: Codex:gpt-5.6-sol
Signed-off-by: Will Porter <mrwillporter@gmail.com>
---
 sound/usb/mixer_quirks.c | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/sound/usb/mixer_quirks.c b/sound/usb/mixer_quirks.c
index a1f5592cc5d5..fc622eb95dc5 100644
--- a/sound/usb/mixer_quirks.c
+++ b/sound/usb/mixer_quirks.c
@@ -3480,6 +3480,10 @@ static int snd_rme_digiface_write_reg(struct snd_kcontrol *kcontrol, int item, u
 	struct usb_device *dev = chip->dev;
 	int err;
 
+	CLASS(snd_usb_lock, pm)(chip);
+	if (pm.err < 0)
+		return -EIO;
+
 	err = snd_usb_ctl_msg(dev, usb_sndctrlpipe(dev, 0),
 			      item,
 			      USB_DIR_OUT | USB_TYPE_VENDOR | USB_RECIP_DEVICE,
@@ -3499,6 +3503,10 @@ static int snd_rme_digiface_read_status(struct snd_kcontrol *kcontrol, u32 statu
 	__le32 buf[4] = {};
 	int err;
 
+	CLASS(snd_usb_lock, pm)(chip);
+	if (pm.err < 0)
+		return -EIO;
+
 	err = snd_usb_ctl_msg(dev, usb_rcvctrlpipe(dev, 0),
 			      RME_DIGIFACE_READ_STATUS,
 			      USB_DIR_IN | USB_TYPE_VENDOR | USB_RECIP_DEVICE,
-- 
2.47.3


  parent reply	other threads:[~2026-08-27 23:22 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2026-08-24 23:03 [RFC] ALSA: usb-audio: missing PM guards in device mixer paths Will Porter
2026-08-25  8:17 ` Takashi Iwai
2026-08-27 23:21 ` [PATCH 0/6] ALSA: usb-audio: guard device-specific control transfers Will Porter
2026-08-27 23:21   ` [PATCH 1/6] ALSA: usb-audio: Add PM guard to Studio 1810c controls Will Porter
2026-08-27 23:21   ` [PATCH 2/6] ALSA: usb-audio: Add PM guards to US-16x08 transfers Will Porter
2026-08-27 23:21   ` [PATCH 3/6] ALSA: usb-audio: Add PM guard to Scarlett meter reads Will Porter
2026-08-27 23:21   ` [PATCH 4/6] ALSA: usb-audio: Guard Scarlett2 protocol transfers Will Porter
2026-08-27 23:21   ` Will Porter [this message]
2026-08-27 23:21   ` [PATCH 6/6] ALSA: usb-audio: Guard FCP " Will Porter

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20260827232143.149197-6-mrwillporter@gmail.com \
    --to=mrwillporter@gmail.com \
    --cc=cassiogabrielcontato@gmail.com \
    --cc=chris.j.arges@canonical.com \
    --cc=fenugrec@mail.com \
    --cc=frederic.l.popp@t-online.de \
    --cc=g@b4.vu \
    --cc=lina@asahilina.net \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-sound@vger.kernel.org \
    --cc=mickflemm@gmail.com \
    --cc=onkel@paraair.de \
    --cc=perex@perex.cz \
    --cc=qu@darknavy.com \
    --cc=roy.vegard.ovesen@gmail.com \
    --cc=tiwai@suse.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®