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 D56CD33B6C4; Sat, 30 May 2026 17:28:09 +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=1780162090; cv=none; b=OGHxKWzXuzbZrg04cf6vjUgnCku5a3c6CEGmRygr7n1RFLtDasNKEbi6AflcL5Y1ymW/KG4TmUJs9BTICcwBg5NYic4lMWFjWUJj2+pftHU4N3nMcqzh+B8dZ9znLXY+Zhv69eJmgUM4T5E99B+kcPlejeVe4fhdFD6TVHnZSLE= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780162090; c=relaxed/simple; bh=ILMde/bEhk0rxIuuoH9kq06Hqomgvc2b2cW5A0iYNEY=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=kaOaBU9D6OrVGsbx+tZSQijoH3RBj5+vMWT1jGr3QB56uijfdNTRR+W0HEaLDI66NqLGZ6KYDLMPu+Dkkat4xMnyw93S25sHS39mm+kX/5mQ2vvoTLv0CYHk0rXuVUxF5JS26PcQaILeWZ+drVEu9746+qIhsLvSpDVY5RHv0rk= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=MxAoajz8; 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="MxAoajz8" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 237901F00893; Sat, 30 May 2026 17:28:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1780162089; bh=0dPNziJ+zld+yXkUeugTGffaDWoAnGKOdWxGEClXrfg=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=MxAoajz8NuCKUdWjsYk+D4jqUhGu3pJaH2VMknkmNj/2AINy8dUHn216J/iB/VsF6 D+HEBejpkdUD/ZTAGj4s5JM0C4weHbGU6PcbTRghi2uGw/jv79R9R5BsB1t6T4n00R 5rO6VMQSkqNa63m2auWImn6s2I/XWKz0IRsC3Pvk= 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 817/969] ALSA: usb-audio: Bound MIDI endpoint descriptor scans Date: Sat, 30 May 2026 18:05:41 +0200 Message-ID: <20260530160323.201017941@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 d6854daa67be623860f4e1873fd3d3c275aba4ed upstream. snd_usbmidi_get_ms_info() validates the internal MIDIStreaming endpoint descriptor size before using baAssocJackID[], but the descriptor walker can still return a class-specific endpoint descriptor whose bLength exceeds the remaining bytes in the endpoint-extra scan. That leaves later flexible-array reads bounded by bLength, but not by the remaining bytes in the endpoint-extra scan. Stop walking when bLength is zero or extends past the remaining endpoint-extra scan. Fixes: 5c6cd7021a05 ("ALSA: usb-audio: Fix case when USB MIDI interface has more than one extra endpoint descriptor") Cc: stable@vger.kernel.org Signed-off-by: Cássio Gabriel Link: https://patch.msgid.link/20260507-usb-midi-endpoint-scan-bounds-v1-1-329d7348160e@gmail.com Signed-off-by: Takashi Iwai Signed-off-by: Greg Kroah-Hartman --- sound/usb/midi.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) --- a/sound/usb/midi.c +++ b/sound/usb/midi.c @@ -1974,15 +1974,17 @@ static struct usb_ms_endpoint_descriptor while (extralen > 3) { struct usb_ms_endpoint_descriptor *ms_ep = (struct usb_ms_endpoint_descriptor *)extra; + int length = ms_ep->bLength; - if (ms_ep->bLength > 3 && + if (!length || length > extralen) + break; + + if (length > 3 && ms_ep->bDescriptorType == USB_DT_CS_ENDPOINT && ms_ep->bDescriptorSubtype == UAC_MS_GENERAL) return ms_ep; - if (!extra[0]) - break; - extralen -= extra[0]; - extra += extra[0]; + extralen -= length; + extra += length; } return NULL; }