From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (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 C01EE1FB1; Mon, 20 Apr 2026 16:06:27 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1776701187; cv=none; b=u1rGDowfR5WHPZPCaHLh7XRH/FTZKrayNdEiShEhHOvWpD4PYQa9C/l6sLjtXZ7qedC9+/TAK4fH65YyQVi9HhrO+Dycjr+8uH8J2xCg6lrImAVrWVqifrWd62Y7i/2K84olm9WhDCRB2VuEAeTzVuCUqfhLEwcq8LWq5B7+GhY= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1776701187; c=relaxed/simple; bh=IwYzNYcyzfjAxmOLtf9nIHi3h7LgQC0QKuKkuD0hu2I=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=o+/C1qeZhfj1QRTp6Q9SVDdBgAgGqO6uTZQQB5lFIDCs2QTaTslVyAmNU0wkphNR/Tm50mXRxSDy/DWJ1j0SLR3KMPK8Inz9v4vI2kIvVYW+OWK82pCYUd4hPbJO6aLghHwB9ZJwXOhbLi81zogreAgVkn1UmXyAsNnpMf/8R/0= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=IgHEhNTt; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="IgHEhNTt" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 57706C19425; Mon, 20 Apr 2026 16:06:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1776701187; bh=IwYzNYcyzfjAxmOLtf9nIHi3h7LgQC0QKuKkuD0hu2I=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=IgHEhNTtm7Rv968NnWcN39hVgmuJrdrsTvKpatGE277YwNTjaXNklz1ucHueBYS+U dbFangisVH3stchmTiO8YDWsSKD+F2PF0wQcq9l9mqAxAx5sH3U6XRjuLO/CjmaF/S rNer/g3VaZOV52QGnFMLNN2YMFkZra9UyZCTcvsI= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, =?UTF-8?q?C=C3=A1ssio=20Gabriel?= , Peter Ujfalusi , Mark Brown , Sasha Levin Subject: [PATCH 6.12 009/162] ASoC: SOF: topology: reject invalid vendor array size in token parser Date: Mon, 20 Apr 2026 17:40:41 +0200 Message-ID: <20260420153927.352826559@linuxfoundation.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260420153927.006696811@linuxfoundation.org> References: <20260420153927.006696811@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.12-stable review patch. If anyone has any objections, please let me know. ------------------ From: Cássio Gabriel [ Upstream commit 215e5fe75881a7e2425df04aeeed47a903d5cd5d ] sof_parse_token_sets() accepts array->size values that can be invalid for a vendor tuple array header. In particular, a zero size does not advance the parser state and can lead to non-progress parsing on malformed topology data. Validate array->size against the minimum header size and reject values smaller than sizeof(*array) before parsing. This preserves behavior for valid topologies and hardens malformed-input handling. Signed-off-by: Cássio Gabriel Acked-by: Peter Ujfalusi Link: https://patch.msgid.link/20260319-sof-topology-array-size-fix-v1-1-f9191b16b1b7@gmail.com Signed-off-by: Mark Brown Signed-off-by: Sasha Levin --- sound/soc/sof/topology.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/soc/sof/topology.c b/sound/soc/sof/topology.c index 0104257df930e..cdf8e56fd8a02 100644 --- a/sound/soc/sof/topology.c +++ b/sound/soc/sof/topology.c @@ -724,7 +724,7 @@ static int sof_parse_token_sets(struct snd_soc_component *scomp, asize = le32_to_cpu(array->size); /* validate asize */ - if (asize < 0) { /* FIXME: A zero-size array makes no sense */ + if (asize < sizeof(*array)) { dev_err(scomp->dev, "error: invalid array size 0x%x\n", asize); return -EINVAL; -- 2.53.0