* [PATCH AUTOSEL 5.10 02/11] ASoC: Intel: sof_sdw: Add quirks for some new Dell laptops [not found] <20240728160954.2054068-1-sashal@kernel.org> @ 2024-07-28 16:09 ` Sasha Levin 2024-07-29 7:30 ` Pavel Machek 2024-07-28 16:09 ` [PATCH AUTOSEL 5.10 11/11] ALSA: usb: Fix UBSAN warning in parse_audio_unit() Sasha Levin 1 sibling, 1 reply; 4+ messages in thread From: Sasha Levin @ 2024-07-28 16:09 UTC (permalink / raw) To: linux-kernel, stable Cc: Charles Keepax, Bard Liao, Pierre-Louis Bossart, Mark Brown, Sasha Levin, cezary.rojewski, liam.r.girdwood, peter.ujfalusi, ranjani.sridharan, kai.vehmanen, perex, tiwai, alsa-devel, linux-sound From: Charles Keepax <ckeepax@opensource.cirrus.com> [ Upstream commit 91cdecaba791c74df6da0650e797fe1192cf2700 ] Add quirks for some new Dell laptops using Cirrus amplifiers in a bridge configuration. Reviewed-by: Bard Liao <yung-chuan.liao@linux.intel.com> Signed-off-by: Charles Keepax <ckeepax@opensource.cirrus.com> Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com> Link: https://msgid.link/r/20240527193552.165567-11-pierre-louis.bossart@linux.intel.com Signed-off-by: Mark Brown <broonie@kernel.org> Signed-off-by: Sasha Levin <sashal@kernel.org> --- sound/soc/intel/boards/sof_sdw.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/sound/soc/intel/boards/sof_sdw.c b/sound/soc/intel/boards/sof_sdw.c index 25bf73a7e7bfa..ad3694d36d969 100644 --- a/sound/soc/intel/boards/sof_sdw.c +++ b/sound/soc/intel/boards/sof_sdw.c @@ -234,6 +234,22 @@ static const struct dmi_system_id sof_sdw_quirk_table[] = { }, .driver_data = (void *)(RT711_JD2_100K), }, + { + .callback = sof_sdw_quirk_cb, + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc"), + DMI_EXACT_MATCH(DMI_PRODUCT_SKU, "0CE3") + }, + .driver_data = (void *)(SOF_SIDECAR_AMPS), + }, + { + .callback = sof_sdw_quirk_cb, + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc"), + DMI_EXACT_MATCH(DMI_PRODUCT_SKU, "0CE4") + }, + .driver_data = (void *)(SOF_SIDECAR_AMPS), + }, {} }; -- 2.43.0 ^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH AUTOSEL 5.10 02/11] ASoC: Intel: sof_sdw: Add quirks for some new Dell laptops 2024-07-28 16:09 ` [PATCH AUTOSEL 5.10 02/11] ASoC: Intel: sof_sdw: Add quirks for some new Dell laptops Sasha Levin @ 2024-07-29 7:30 ` Pavel Machek 2024-08-10 9:13 ` Sasha Levin 0 siblings, 1 reply; 4+ messages in thread From: Pavel Machek @ 2024-07-29 7:30 UTC (permalink / raw) To: Sasha Levin Cc: linux-kernel, stable, Charles Keepax, Bard Liao, Pierre-Louis Bossart, Mark Brown, cezary.rojewski, liam.r.girdwood, peter.ujfalusi, ranjani.sridharan, kai.vehmanen, perex, tiwai, alsa-devel, linux-sound [-- Attachment #1: Type: text/plain, Size: 1718 bytes --] Hi! > From: Charles Keepax <ckeepax@opensource.cirrus.com> > > [ Upstream commit 91cdecaba791c74df6da0650e797fe1192cf2700 ] > > Add quirks for some new Dell laptops using Cirrus amplifiers in a bridge > configuration. This is queued for 5.10, but not for 6.1. Mistake? Best regards, Pavel > Reviewed-by: Bard Liao <yung-chuan.liao@linux.intel.com> > Signed-off-by: Charles Keepax <ckeepax@opensource.cirrus.com> > Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com> > Link: https://msgid.link/r/20240527193552.165567-11-pierre-louis.bossart@linux.intel.com > Signed-off-by: Mark Brown <broonie@kernel.org> > Signed-off-by: Sasha Levin <sashal@kernel.org> > --- > sound/soc/intel/boards/sof_sdw.c | 16 ++++++++++++++++ > 1 file changed, 16 insertions(+) > > diff --git a/sound/soc/intel/boards/sof_sdw.c b/sound/soc/intel/boards/sof_sdw.c > index 25bf73a7e7bfa..ad3694d36d969 100644 > --- a/sound/soc/intel/boards/sof_sdw.c > +++ b/sound/soc/intel/boards/sof_sdw.c > @@ -234,6 +234,22 @@ static const struct dmi_system_id sof_sdw_quirk_table[] = { > }, > .driver_data = (void *)(RT711_JD2_100K), > }, > + { > + .callback = sof_sdw_quirk_cb, > + .matches = { > + DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc"), > + DMI_EXACT_MATCH(DMI_PRODUCT_SKU, "0CE3") > + }, > + .driver_data = (void *)(SOF_SIDECAR_AMPS), > + }, > + { > + .callback = sof_sdw_quirk_cb, > + .matches = { > + DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc"), > + DMI_EXACT_MATCH(DMI_PRODUCT_SKU, "0CE4") > + }, > + .driver_data = (void *)(SOF_SIDECAR_AMPS), > + }, > {} > }; > -- People of Russia, stop Putin before his war on Ukraine escalates. [-- Attachment #2: signature.asc --] [-- Type: application/pgp-signature, Size: 195 bytes --] ^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH AUTOSEL 5.10 02/11] ASoC: Intel: sof_sdw: Add quirks for some new Dell laptops 2024-07-29 7:30 ` Pavel Machek @ 2024-08-10 9:13 ` Sasha Levin 0 siblings, 0 replies; 4+ messages in thread From: Sasha Levin @ 2024-08-10 9:13 UTC (permalink / raw) To: Pavel Machek Cc: linux-kernel, stable, Charles Keepax, Bard Liao, Pierre-Louis Bossart, Mark Brown, cezary.rojewski, liam.r.girdwood, peter.ujfalusi, ranjani.sridharan, kai.vehmanen, perex, tiwai, alsa-devel, linux-sound On Mon, Jul 29, 2024 at 09:30:19AM +0200, Pavel Machek wrote: >Hi! > >> From: Charles Keepax <ckeepax@opensource.cirrus.com> >> >> [ Upstream commit 91cdecaba791c74df6da0650e797fe1192cf2700 ] >> >> Add quirks for some new Dell laptops using Cirrus amplifiers in a bridge >> configuration. > >This is queued for 5.10, but not for 6.1. Mistake? Yup, needs to get dropped from everywhere. Thanks! -- Thanks, Sasha ^ permalink raw reply [flat|nested] 4+ messages in thread
* [PATCH AUTOSEL 5.10 11/11] ALSA: usb: Fix UBSAN warning in parse_audio_unit() [not found] <20240728160954.2054068-1-sashal@kernel.org> 2024-07-28 16:09 ` [PATCH AUTOSEL 5.10 02/11] ASoC: Intel: sof_sdw: Add quirks for some new Dell laptops Sasha Levin @ 2024-07-28 16:09 ` Sasha Levin 1 sibling, 0 replies; 4+ messages in thread From: Sasha Levin @ 2024-07-28 16:09 UTC (permalink / raw) To: linux-kernel, stable Cc: Takashi Iwai, syzbot+78d5b129a762182225aa, Sasha Levin, perex, tiwai, xristos.thes, kl, peter.ujfalusi, linux-sound From: Takashi Iwai <tiwai@suse.de> [ Upstream commit 2f38cf730caedaeacdefb7ff35b0a3c1168117f9 ] A malformed USB descriptor may pass the lengthy mixer description with a lot of channels, and this may overflow the 32bit integer shift size, as caught by syzbot UBSAN test. Although this won't cause any real trouble, it's better to address. This patch introduces a sanity check of the number of channels to bail out the parsing when too many channels are found. Reported-by: syzbot+78d5b129a762182225aa@syzkaller.appspotmail.com Closes: https://lore.kernel.org/0000000000000adac5061d3c7355@google.com Link: https://patch.msgid.link/20240715123619.26612-1-tiwai@suse.de Signed-off-by: Takashi Iwai <tiwai@suse.de> Signed-off-by: Sasha Levin <sashal@kernel.org> --- sound/usb/mixer.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/sound/usb/mixer.c b/sound/usb/mixer.c index b598f8f0d06ec..8826a588f5ab8 100644 --- a/sound/usb/mixer.c +++ b/sound/usb/mixer.c @@ -1932,6 +1932,13 @@ static int parse_audio_feature_unit(struct mixer_build *state, int unitid, bmaControls = ftr->bmaControls; } + if (channels > 32) { + usb_audio_info(state->chip, + "usbmixer: too many channels (%d) in unit %d\n", + channels, unitid); + return -EINVAL; + } + /* parse the source unit */ err = parse_audio_unit(state, hdr->bSourceID); if (err < 0) -- 2.43.0 ^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2024-08-10 9:14 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
[not found] <20240728160954.2054068-1-sashal@kernel.org>
2024-07-28 16:09 ` [PATCH AUTOSEL 5.10 02/11] ASoC: Intel: sof_sdw: Add quirks for some new Dell laptops Sasha Levin
2024-07-29 7:30 ` Pavel Machek
2024-08-10 9:13 ` Sasha Levin
2024-07-28 16:09 ` [PATCH AUTOSEL 5.10 11/11] ALSA: usb: Fix UBSAN warning in parse_audio_unit() Sasha Levin
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox