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 3EDAE13A89D; Sun, 24 Mar 2024 23:08:06 +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=1711321687; cv=none; b=B9qtocPNSTGnwpOjbC1kvwVprMD5NtYcZwYZXpG+hd3VE86B2NpISejQe63/9vR36iey4lqWLYfg4nq6rvtterOjT6CqZcskB6Fhbn+zzTftVV2Yn2I0de15+ngSxbyBKbRaskU/ytJtPZZY0wnzw/YW2iWeflQAuip2FP8eZ+A= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711321687; c=relaxed/simple; bh=BUaEXJZUG8etbIU7z42ZW4ULk/Wh+ZSN13xgmYO0WqQ=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=CTMQKTO2b1cskZRdKAphA5Spc/51JKIqxg8ySjP7knR5XZZIuCwNsiOpUemWSZhnsBeErbQKV/EoVoYkERTl4UwsYzMcSolhW77/pGM+ISqlQU3geYhFpFHwmIQyyCBcBuITyeDysodusAKozoAdr5qID4nn8aJw1AG4ZE4ZIOQ= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=l0DaaTiz; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="l0DaaTiz" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 7D9C1C433C7; Sun, 24 Mar 2024 23:08:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1711321686; bh=BUaEXJZUG8etbIU7z42ZW4ULk/Wh+ZSN13xgmYO0WqQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=l0DaaTizaVRUrTbYjAerSbukEtqcFSDDPJ7IqfB9yRKdcG4lfsf8AzH+FGOScEIqX SEF1ZrcXJhbt/vDs20JY/uNI7YFUsDjmZwP0x8qkT6ozkv+K966cbZqLuiviTw4/js USC/Rzpqt9Je23KxL0Y72bl5u3qmIcV7ibILBRKE4ylj8GaYCl9eUa2mbcK2fz/whH Q2Md1XqzM9QTFQIkLRTO0B1S1MUHGmv5V9x95IkzRPgqF/UO4esHpZCx2uLns3jx2O gJCVPjbwgzZOouvrDeDfMGTTWcq123fZ4geb5ZTEhuc9ohNqnCzm4NvocaWcfl6nno SAMpr+/tDVjgg== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Dan Carpenter , Mark Brown , Sasha Levin Subject: [PATCH 6.6 414/638] ASoC: SOF: Add some bounds checking to firmware data Date: Sun, 24 Mar 2024 18:57:31 -0400 Message-ID: <20240324230116.1348576-415-sashal@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240324230116.1348576-1-sashal@kernel.org> References: <20240324230116.1348576-1-sashal@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit From: Dan Carpenter [ Upstream commit 98f681b0f84cfc3a1d83287b77697679e0398306 ] Smatch complains about "head->full_size - head->header_size" can underflow. To some extent, we're always going to have to trust the firmware a bit. However, it's easy enough to add a check for negatives, and let's add a upper bounds check as well. Fixes: d2458baa799f ("ASoC: SOF: ipc3-loader: Implement firmware parsing and loading") Signed-off-by: Dan Carpenter Link: https://msgid.link/r/5593d147-058c-4de3-a6f5-540ecb96f6f8@moroto.mountain Signed-off-by: Mark Brown Signed-off-by: Sasha Levin --- sound/soc/sof/ipc3-loader.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sound/soc/sof/ipc3-loader.c b/sound/soc/sof/ipc3-loader.c index 28218766d2114..6e3ef06721106 100644 --- a/sound/soc/sof/ipc3-loader.c +++ b/sound/soc/sof/ipc3-loader.c @@ -148,6 +148,8 @@ static size_t sof_ipc3_fw_parse_ext_man(struct snd_sof_dev *sdev) head = (struct sof_ext_man_header *)fw->data; remaining = head->full_size - head->header_size; + if (remaining < 0 || remaining > sdev->basefw.fw->size) + return -EINVAL; ext_man_size = ipc3_fw_ext_man_size(sdev, fw); /* Assert firmware starts with extended manifest */ -- 2.43.0