Received-SPF: pass (google.com: domain of linux-kernel+bounces-91259-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) client-ip=2604:1380:4601:e00::3;
From: Armin Wolf <W_Armin@gmx.de>
To: Shyam-sundar.S-k@amd.com
Cc: hdegoede@redhat.com,
	ilpo.jarvinen@linux.intel.com,
	platform-driver-x86@vger.kernel.org,
	linux-kernel@vger.kernel.org
Subject: [PATCH v3 4/4] platform/x86/amd/pmf: Fix possible out-of-bound memory accesses
Date: Mon,  4 Mar 2024 21:50:05 +0100
Message-Id: <20240304205005.10078-5-W_Armin@gmx.de>
In-Reply-To: <20240304205005.10078-1-W_Armin@gmx.de>
References: <20240304205005.10078-1-W_Armin@gmx.de>
Precedence: bulk
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
UI-OutboundReport: notjunk:1;M01:P0:nE75bobHrC4=;Nobj9OwVmbhnUnr/40vGxXz1VOM
 D5HIS0HO6t8QIe21y5D0kNnKlUMn31fzP9vZ/9dXMrugwdFTBTKF+KWDn6SAo2qaiXog4p0ga
 W/8AkDzETwosbuW7gz/Pa375qdnyWW4tZt/PYFMYds/TN/oVgEpvNcvGtP0DHroVOajfDUuHg
 RiF+laPFkBxJzItarPKotGtKTejzwgVcQ78Cl0PXwYNUbbU+KcfQASjlSuf7TirfQMdLUiH/C
 qH0oNo1qmhkN3jDNnq23MdxO1N3U259/MNOQCPKhXhIe5bsZbukT85AshMblyOdTcF3c2ekBQ
 5vb6SO1/EnwzkIYb2Zdrtu+5w4UxO2zyJ8PxCAhTciIynH4V7AE/6IkfLos+aE7m4+EKlloQn
 70he4WpO40jkKSqQgiOH2vpJEVXrs1S39vJ5wdbxoCTfrrTeXoVC/GqUjE+3xnXmmqroJvNRe
 HDo3TngxR/NmaI3D0Vdr4zt3o8MQydkfGFVYf8mbrtZ2JJNVtFjAwd7X37Gd8kI9uYm3xPmT/
 s1K2plQ6VF3r6/0oE7brgPb8JGyR9WzrEdm3iq42+q6ZWZYgbfQpTfE8cCM7BHnOsaFCtBxFn
 gH+SaZuku7lrfJ6UizUgZdTxI/9XGf72/ZQMwUl0kRML3yp5rvg1IENuHb95Ge9CHFJig1Dzr
 7PINWIkpQVggje7YglZanEjmqwNXIhjAJBfiuH2iuMvXxBr/xj/LNsIvASn5FgS4itVdm/vpX
 iPCGsmUpzLAIMKSLtt5lnECtFxv4/PFyxOaM5iEQAuNr9S9soQHUnlqR50BG876taRIClcOuw
 4dAtSyz2lhr8ugFaq7ylYW/ut70s6g/4bqlcxgBiY4z3I=

The length of the policy buffer is not validated before accessing it,
which means that multiple out-of-bounds memory accesses can occur.

This is especially bad since userspace can load policy binaries over
debugfs.

Compile-tested only.

Fixes: 7c45534afa44 ("platform/x86/amd/pmf: Add support for PMF Policy Bin=
ary")
Signed-off-by: Armin Wolf <W_Armin@gmx.de>
=2D--
 drivers/platform/x86/amd/pmf/tee-if.c | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/drivers/platform/x86/amd/pmf/tee-if.c b/drivers/platform/x86/=
amd/pmf/tee-if.c
index 71ea7eefc211..75370431a82e 100644
=2D-- a/drivers/platform/x86/amd/pmf/tee-if.c
+++ b/drivers/platform/x86/amd/pmf/tee-if.c
@@ -249,11 +249,17 @@ static int amd_pmf_start_policy_engine(struct amd_pm=
f_dev *dev)
 	struct cookie_header *header;
 	int res;

+	if (dev->policy_sz < POLICY_COOKIE_OFFSET + sizeof(*header))
+		return -EINVAL;
+
 	header =3D (struct cookie_header *)(dev->policy_buf + POLICY_COOKIE_OFFS=
ET);

 	if (header->sign !=3D POLICY_SIGN_COOKIE || !header->length)
 		return -EINVAL;

+	if (dev->policy_sz < header->length + 512)
+		return -EINVAL;
+
 	/* Update the actual length */
 	dev->policy_sz =3D header->length + 512;
 	res =3D amd_pmf_invoke_cmd_init(dev);
=2D-
2.39.2