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 68AB51C287; Mon, 15 Jan 2024 23:24:24 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="uRDpK0dC" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 60E2BC433F1; Mon, 15 Jan 2024 23:24:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1705361064; bh=pGGBRDwKPQsgICX+Gp2vBlcwQ0JgR164d4rsVT7OX4Q=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=uRDpK0dCxpeE82xC3GSb0QFje5HLKB13Af13GTwptt0/653l2P3tTU38AnH2h5GAh oYT8OoFwabdcaO5L7ULBARcMxQ8c804fwyxUViESB+KgqkaK3Y5Bs47wJE72icFOrZ nQLddSeI/u3zHlj3ljDm3e0drI/GuahAJUpnvjfKEDUxL9UUlexkRhV1MKC4qNRBJ5 RiGBHM4bYD9mWVWCcTVWEWtIz5p31mAOo1L/wnuJLK8hv3SGP6oLLDRkK2Ti89do3H k9Y4nwuuSAqVHTH76W/ru+6dB+koZlvjBILGrIS577iEYhfJ09O0D4HnxhdkwrzLGf 2NYGqf5LJlNvg== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Naveen N Rao , "Gustavo A . R . Silva" , Michael Ellerman , Sasha Levin , christophe.leroy@csgroup.eu, linuxppc-dev@lists.ozlabs.org Subject: [PATCH AUTOSEL 6.7 11/14] powerpc/lib: Validate size for vector operations Date: Mon, 15 Jan 2024 18:23:25 -0500 Message-ID: <20240115232351.208489-11-sashal@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240115232351.208489-1-sashal@kernel.org> References: <20240115232351.208489-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 X-stable-base: Linux 6.7 Content-Transfer-Encoding: 8bit From: Naveen N Rao [ Upstream commit 8f9abaa6d7de0a70fc68acaedce290c1f96e2e59 ] Some of the fp/vmx code in sstep.c assume a certain maximum size for the instructions being emulated. The size of those operations however is determined separately in analyse_instr(). Add a check to validate the assumption on the maximum size of the operations, so as to prevent any unintended kernel stack corruption. Signed-off-by: Naveen N Rao Reviewed-by: Gustavo A. R. Silva Build-tested-by: Gustavo A. R. Silva Signed-off-by: Michael Ellerman Link: https://msgid.link/20231123071705.397625-1-naveen@kernel.org Signed-off-by: Sasha Levin --- arch/powerpc/lib/sstep.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/arch/powerpc/lib/sstep.c b/arch/powerpc/lib/sstep.c index a4ab8625061a..6af97dc0f6d5 100644 --- a/arch/powerpc/lib/sstep.c +++ b/arch/powerpc/lib/sstep.c @@ -586,6 +586,8 @@ static int do_fp_load(struct instruction_op *op, unsigned long ea, } u; nb = GETSIZE(op->type); + if (nb > sizeof(u)) + return -EINVAL; if (!address_ok(regs, ea, nb)) return -EFAULT; rn = op->reg; @@ -636,6 +638,8 @@ static int do_fp_store(struct instruction_op *op, unsigned long ea, } u; nb = GETSIZE(op->type); + if (nb > sizeof(u)) + return -EINVAL; if (!address_ok(regs, ea, nb)) return -EFAULT; rn = op->reg; @@ -680,6 +684,9 @@ static nokprobe_inline int do_vec_load(int rn, unsigned long ea, u8 b[sizeof(__vector128)]; } u = {}; + if (size > sizeof(u)) + return -EINVAL; + if (!address_ok(regs, ea & ~0xfUL, 16)) return -EFAULT; /* align to multiple of size */ @@ -707,6 +714,9 @@ static nokprobe_inline int do_vec_store(int rn, unsigned long ea, u8 b[sizeof(__vector128)]; } u; + if (size > sizeof(u)) + return -EINVAL; + if (!address_ok(regs, ea & ~0xfUL, 16)) return -EFAULT; /* align to multiple of size */ -- 2.43.0