linux-kernel - [PATCH v3 7/7] arm64/signal: Only read new data when parsing the ZT context

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-Id: <20221212-arm64-signal-cleanup-v3-7-4545c94b20ff@kernel.org>
Date:   Tue, 31 Jan 2023 22:20:45 +0000
From:   Mark Brown <broonie@...nel.org>
To:     Catalin Marinas <catalin.marinas@....com>,
        Will Deacon <will@...nel.org>
Cc:     linux-arm-kernel@...ts.infradead.org, linux-kernel@...r.kernel.org,
        Mark Brown <broonie@...nel.org>
Subject: [PATCH v3 7/7] arm64/signal: Only read new data when parsing the
 ZT context

When we parse the ZT signal context we read the entire context from
userspace, including the generic signal context header which was already
read by parse_user_sigframe() and padding bytes that we ignore. Avoid the
possibility of relying on the second read of the data read twice by only
reading the data which we are actually going to use.

Signed-off-by: Mark Brown <broonie@...nel.org>
---
 arch/arm64/kernel/signal.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/arch/arm64/kernel/signal.c b/arch/arm64/kernel/signal.c
index 7810d090c025..d7b5ed8a9b7f 100644
--- a/arch/arm64/kernel/signal.c
+++ b/arch/arm64/kernel/signal.c
@@ -521,7 +521,7 @@ static int preserve_zt_context(struct zt_context __user *ctx)
 static int restore_zt_context(struct user_ctxs *user)
 {
 	int err;
-	struct zt_context zt;
+	u16 nregs;
 
 	/* ZA must be restored first for this check to be valid */
 	if (!thread_za_enabled(&current->thread))
@@ -530,10 +530,10 @@ static int restore_zt_context(struct user_ctxs *user)
 	if (user->zt_size != ZT_SIG_CONTEXT_SIZE(1))
 		return -EINVAL;
 
-	if (__copy_from_user(&zt, user->zt, sizeof(zt)))
+	if (__copy_from_user(&nregs, &(user->zt->nregs), sizeof(nregs)))
 		return -EFAULT;
 
-	if (zt.nregs != 1)
+	if (nregs != 1)
 		return -EINVAL;
 
 	/*

-- 
2.30.2