Received: from smtp-out2.suse.de (smtp-out2.suse.de [195.135.223.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 39A4C22D78F for ; Thu, 14 Aug 2025 08:12:49 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=195.135.223.131 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1755159171; cv=none; b=iA9ETNzAysDEnjOlEYbDkGTkbOgU7cR804rxQp+BxPIoKcj46F72G02IL8LL5yUViu3rV0xjobeQhanAwxKK9rNRCWoa6wZfrmNIfr729cQhxPM3LZ/NTuaT5hv1fGRWY948vzDmwyYTD+M6Zk30N75z7HBf9z/C9u5vKNCW+Bw= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1755159171; c=relaxed/simple; bh=TN03GQhIdAUsm+dMxiDQVW4fkBYRiHzUp6H1H0Zpv7Q=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=AxhX9MQ+kYtLaPEP3nAI34QV9YE09psNysCqAhAT1ovel3NQ/cesbE/SDqj20x8Brd56bDhY7LMLmDIqovTUk/2yljKtIWo39Vi9JZEccO3YqSE78TMjucEQripVB1YLnMemRKo3Jb+BQbat3cNPySHDBFkBnbV8Qg6SJmdoO/g= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=suse.de; spf=pass smtp.mailfrom=suse.de; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.b=x0LHlVDy; dkim=permerror (0-bit key) header.d=suse.de header.i=@suse.de header.b=ZBPKBaRy; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.b=x0LHlVDy; dkim=permerror (0-bit key) header.d=suse.de header.i=@suse.de header.b=ZBPKBaRy; arc=none smtp.client-ip=195.135.223.131 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=suse.de Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=suse.de Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.b="x0LHlVDy"; dkim=permerror (0-bit key) header.d=suse.de header.i=@suse.de header.b="ZBPKBaRy"; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.b="x0LHlVDy"; dkim=permerror (0-bit key) header.d=suse.de header.i=@suse.de header.b="ZBPKBaRy" Received: from imap1.dmz-prg2.suse.org (imap1.dmz-prg2.suse.org [IPv6:2a07:de40:b281:104:10:150:64:97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp-out2.suse.de (Postfix) with ESMTPS id 6DB4F1F7CB; Thu, 14 Aug 2025 08:12:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1755159168; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=yd+ibQbX3xcUWvHv+2npjpBbLeXM4qGCPncTKBZb2fY=; b=x0LHlVDy3UbklrZr2/pnOgGyL2cKYiUTZOpKdznYOKrJ/nuLpnzOZKPEvkjJSnE3quJH3e 8+P+f+OmlY8UQofLnKDD5TFL0Rer1PXUL0YKs/AGykHnlZuTCDn5wuBZGWypAReYY0W06W LspWuu4NiewGzY5oW7XjvWt0ISXYkTQ= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1755159168; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=yd+ibQbX3xcUWvHv+2npjpBbLeXM4qGCPncTKBZb2fY=; b=ZBPKBaRyl9OWbKKrwqiSiaEoNifnEmZYp4OpWMKJPIsbtlPdKbdIc+7sx+WjAWbzUDeRGm K6GKJc1qxmiUuBDg== Authentication-Results: smtp-out2.suse.de; dkim=pass header.d=suse.de header.s=susede2_rsa header.b=x0LHlVDy; dkim=pass header.d=suse.de header.s=susede2_ed25519 header.b=ZBPKBaRy DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1755159168; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=yd+ibQbX3xcUWvHv+2npjpBbLeXM4qGCPncTKBZb2fY=; b=x0LHlVDy3UbklrZr2/pnOgGyL2cKYiUTZOpKdznYOKrJ/nuLpnzOZKPEvkjJSnE3quJH3e 8+P+f+OmlY8UQofLnKDD5TFL0Rer1PXUL0YKs/AGykHnlZuTCDn5wuBZGWypAReYY0W06W LspWuu4NiewGzY5oW7XjvWt0ISXYkTQ= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1755159168; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=yd+ibQbX3xcUWvHv+2npjpBbLeXM4qGCPncTKBZb2fY=; b=ZBPKBaRyl9OWbKKrwqiSiaEoNifnEmZYp4OpWMKJPIsbtlPdKbdIc+7sx+WjAWbzUDeRGm K6GKJc1qxmiUuBDg== Received: from imap1.dmz-prg2.suse.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by imap1.dmz-prg2.suse.org (Postfix) with ESMTPS id 4B20313995; Thu, 14 Aug 2025 08:12:48 +0000 (UTC) Received: from dovecot-director2.suse.de ([2a07:de40:b281:106:10:150:64:167]) by imap1.dmz-prg2.suse.org with ESMTPSA id kEwwEYCanWj2CwAAD6G6ig (envelope-from ); Thu, 14 Aug 2025 08:12:48 +0000 From: Takashi Iwai To: linux-sound@vger.kernel.org Cc: Youngjun Lee Subject: [PATCH 2/2] ALSA: usb-audio: Validate UAC3 cluster segment descriptors Date: Thu, 14 Aug 2025 10:12:43 +0200 Message-ID: <20250814081245.8902-2-tiwai@suse.de> X-Mailer: git-send-email 2.50.1 In-Reply-To: <20250814081245.8902-1-tiwai@suse.de> References: <20250814081245.8902-1-tiwai@suse.de> Precedence: bulk X-Mailing-List: linux-sound@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Level: X-Spam-Flag: NO X-Rspamd-Queue-Id: 6DB4F1F7CB X-Rspamd-Action: no action X-Rspamd-Server: rspamd1.dmz-prg2.suse.org X-Spamd-Result: default: False [-3.01 / 50.00]; BAYES_HAM(-3.00)[100.00%]; NEURAL_HAM_LONG(-1.00)[-1.000]; MID_CONTAINS_FROM(1.00)[]; R_MISSING_CHARSET(0.50)[]; R_DKIM_ALLOW(-0.20)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; NEURAL_HAM_SHORT(-0.20)[-1.000]; MIME_GOOD(-0.10)[text/plain]; MX_GOOD(-0.01)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; ARC_NA(0.00)[]; FUZZY_RATELIMITED(0.00)[rspamd.com]; MIME_TRACE(0.00)[0:+]; RBL_SPAMHAUS_BLOCKED_OPENRESOLVER(0.00)[2a07:de40:b281:104:10:150:64:97:from]; TO_DN_SOME(0.00)[]; RCVD_COUNT_TWO(0.00)[2]; RECEIVED_SPAMHAUS_BLOCKED_OPENRESOLVER(0.00)[2a07:de40:b281:106:10:150:64:167:received]; FROM_HAS_DN(0.00)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; DBL_BLOCKED_OPENRESOLVER(0.00)[suse.de:dkim,suse.de:mid,suse.de:email,imap1.dmz-prg2.suse.org:rdns,imap1.dmz-prg2.suse.org:helo,samsung.com:email]; RCVD_TLS_ALL(0.00)[]; FROM_EQ_ENVFROM(0.00)[]; RCPT_COUNT_TWO(0.00)[2]; DKIM_SIGNED(0.00)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; SPAMHAUS_XBL(0.00)[2a07:de40:b281:104:10:150:64:97:from]; DKIM_TRACE(0.00)[suse.de:+] X-Spam-Score: -3.01 UAC3 class segment descriptors need to be verified whether their sizes match with the declared lengths and whether they fit with the allocated buffer sizes, too. Otherwise malicious firmware may lead to the unexpected OOB accesses. Fixes: 11785ef53228 ("ALSA: usb-audio: Initial Power Domain support") Reported-and-tested-by: Youngjun Lee Cc: Signed-off-by: Takashi Iwai --- sound/usb/stream.c | 25 ++++++++++++++++++++++--- 1 file changed, 22 insertions(+), 3 deletions(-) diff --git a/sound/usb/stream.c b/sound/usb/stream.c index ad6ced780634..acf3dc2d79e0 100644 --- a/sound/usb/stream.c +++ b/sound/usb/stream.c @@ -341,20 +341,28 @@ snd_pcm_chmap_elem *convert_chmap_v3(struct uac3_cluster_header_descriptor len = le16_to_cpu(cluster->wLength); c = 0; - p += sizeof(struct uac3_cluster_header_descriptor); + p += sizeof(*cluster); + len -= sizeof(*cluster); - while (((p - (void *)cluster) < len) && (c < channels)) { + while (len > 0 && (c < channels)) { struct uac3_cluster_segment_descriptor *cs_desc = p; u16 cs_len; u8 cs_type; + if (len < sizeof(*p)) + break; cs_len = le16_to_cpu(cs_desc->wLength); + if (len < cs_len) + break; cs_type = cs_desc->bSegmentType; if (cs_type == UAC3_CHANNEL_INFORMATION) { struct uac3_cluster_information_segment_descriptor *is = p; unsigned char map; + if (cs_len < sizeof(*is)) + break; + /* * TODO: this conversion is not complete, update it * after adding UAC3 values to asound.h @@ -456,6 +464,7 @@ snd_pcm_chmap_elem *convert_chmap_v3(struct uac3_cluster_header_descriptor chmap->map[c++] = map; } p += cs_len; + len -= cs_len; } if (channels < c) @@ -881,7 +890,7 @@ snd_usb_get_audioformat_uac3(struct snd_usb_audio *chip, u64 badd_formats = 0; unsigned int num_channels; struct audioformat *fp; - u16 cluster_id, wLength; + u16 cluster_id, wLength, cluster_wLength; int clock = 0; int err; @@ -1011,6 +1020,16 @@ snd_usb_get_audioformat_uac3(struct snd_usb_audio *chip, return ERR_PTR(-EIO); } + cluster_wLength = le16_to_cpu(cluster->wLength); + if (cluster_wLength < sizeof(*cluster) || + cluster_wLength > wLength) { + dev_err(&dev->dev, + "%u:%d : invalid Cluster Descriptor size\n", + iface_no, altno); + kfree(cluster); + return ERR_PTR(-EIO); + } + num_channels = cluster->bNrChannels; chmap = convert_chmap_v3(cluster); kfree(cluster); -- 2.50.1