From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 39DD130148B; Sat, 30 May 2026 17:29:25 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780162167; cv=none; b=I43NxBpGy8TFwYtMy9+nwBdpeQMEvzxzlRkzv/0LWSYS59OW7cxZYDqOkYQ2+dcq+wDbRCT3r8yJXtoXYX2pq1jB3Q2UWM5UthtAErCYMoRG7vudbzzazC+mudQ1YF2QiKAKW/6TQBmE4u344TpaBb/dpJjnw/L3uOW3+u7L5QI= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780162167; c=relaxed/simple; bh=ZHWz9TAfQQJdcmbMhjuFEMwbaL5mskIe73uYo7IwOhc=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=YpoEJFOPaZnOXZ0xbBFVO2poZOnKpW2fXQtRHZWozdOYl/qE0T5ufAtFqmvcnUCoUCwMsGr9LA3rxhdCMzIJ22cOqc3h3qddXF763mW0h7CL3zsXIXvgFZJpgicsl0oD0IFdzIseW6jBs/ulPw5ogzCjqfJCEiVF1LPMSWnyeu0= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=YzKEQO0H; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="YzKEQO0H" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 426501F00893; Sat, 30 May 2026 17:29:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1780162165; bh=Ncv1RwrtPszFGtdAlv7+u+wB5aUM+rKr+3Gt/a3UujU=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=YzKEQO0HT+tgIQQCOG2vvYm4K4t4ft4pqIY9lC1LErPHSEd44tu5Ck54p00ax3ukJ CtuvuCjf0OCR3zVnNn2VmeveNy8LIB9UygLjtddsSNBb+EKSHCgUy4TVJTQYArz+RR PmvXTbqm8ViDIRehsm4Z3QlfIBbydYXbsrUeT4Uo= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, =?UTF-8?q?C=C3=A1ssio=20Gabriel?= , Takashi Iwai Subject: [PATCH 6.1 841/969] ALSA: ua101: Reject too-short USB descriptors Date: Sat, 30 May 2026 18:06:05 +0200 Message-ID: <20260530160323.878002025@linuxfoundation.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260530160300.485627683@linuxfoundation.org> References: <20260530160300.485627683@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 6.1-stable review patch. If anyone has any objections, please let me know. ------------------ From: Cássio Gabriel commit b59d5c51bb328a60749b4dd5fe7e649bfb4089b4 upstream. find_format_descriptor() walks the class-specific interface extras by advancing with bLength. It rejects descriptors that extend past the remaining buffer, but it does not reject descriptor lengths smaller than a USB descriptor header. Reject too-short descriptors before using bLength to advance the local scan. This keeps the UA-101 parser robust against malformed descriptor data and matches the usual USB descriptor walking rules. Fixes: 63978ab3e3e9 ("sound: add Edirol UA-101 support") Cc: stable@vger.kernel.org Signed-off-by: Cássio Gabriel Link: https://patch.msgid.link/20260519-alsa-ua101-desc-len-v1-1-4307d1a5e054@gmail.com Signed-off-by: Takashi Iwai Signed-off-by: Greg Kroah-Hartman --- sound/usb/misc/ua101.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) --- a/sound/usb/misc/ua101.c +++ b/sound/usb/misc/ua101.c @@ -914,8 +914,9 @@ find_format_descriptor(struct usb_interf struct uac_format_type_i_discrete_descriptor *desc; desc = (struct uac_format_type_i_discrete_descriptor *)extra; - if (desc->bLength > extralen) { - dev_err(&interface->dev, "descriptor overflow\n"); + if (desc->bLength < sizeof(struct usb_descriptor_header) || + desc->bLength > extralen) { + dev_err(&interface->dev, "invalid descriptor length\n"); return NULL; } if (desc->bLength == UAC_FORMAT_TYPE_I_DISCRETE_DESC_SIZE(1) &&