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 C134237DBE5; Mon, 5 May 2025 23:07:45 +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=1746486465; cv=none; b=Qde++t2KVQmlHbb26q74S7Xeo2e4z6CpbjwPCjf5c2HvDYl1B8E06qI7uyHT/3MqbQTyiO/Uur5tsWXh3Gb+H3+vD+9pKrn3pZ6KTugka63XnUVhkd3+SGWtywALXPrxfX/xl4mcWJHSNkE1f9cxWOz2/XzT+Rwv/WbBhjWyGMg= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1746486465; c=relaxed/simple; bh=o6vPQm8ORAMEIjP7fhptjMtwSNq9nMRVlWGY99NWjZw=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=M4Cil7W7QSo92gwEMnb3NcLuEcjqwPg/JKyfZP5oHZR02qyLz/48kNoX8WQKIGYWIb20FfX/vsc/R+LVGsRSIdPng/6ozzIgVhNaT8EeIMCQrOXibxE1pjxRr2CeGUKrfH0EDTAcL3Uqt6YNGHKcdOXT+nVc9fVDQFJvlGx33us= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=YJkvB/WF; 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="YJkvB/WF" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 2723DC4CEE4; Mon, 5 May 2025 23:07:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1746486465; bh=o6vPQm8ORAMEIjP7fhptjMtwSNq9nMRVlWGY99NWjZw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=YJkvB/WFqaQckMsxUmHd6lyoc8jegZliByGrhww8MOaIMKFoFvRHvgyB9fev6elPh XbBRLTN1rIAPJH0uVUiqqc+nQ5PSsUxWBXToTd0epH1XDlL7W8cOlvzfIULO/wTE6T qMtLXi6bRpRvwvB6J5qWHQH+n5eGD6yW4ZwXrUWaG88y7KdWFMbsnhZJU1bvEtdxhB Skjc6a2InmYIw8yApzGEqiX43le/CgD5+BNiX/NRnFvb0coSpF0/ui2pwV6rU7Ffen b4W9k31chfqFkGCBxaB+MF4Dfvj2HEEbzEk8apb9uAL38/FdBI48zwRN/bZLzMOu20 o6veLcSAMc/4Q== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Benjamin Berg , Johannes Berg , Sasha Levin , richard@nod.at, anton.ivanov@cambridgegreys.com, johannes@sipsolutions.net, tglx@linutronix.de, mingo@redhat.com, bp@alien8.de, dave.hansen@linux.intel.com, x86@kernel.org, linux-um@lists.infradead.org Subject: [PATCH AUTOSEL 6.1 044/212] um: Store full CSGSFS and SS register from mcontext Date: Mon, 5 May 2025 19:03:36 -0400 Message-Id: <20250505230624.2692522-44-sashal@kernel.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250505230624.2692522-1-sashal@kernel.org> References: <20250505230624.2692522-1-sashal@kernel.org> Precedence: bulk X-Mailing-List: stable@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.1.136 Content-Transfer-Encoding: 8bit From: Benjamin Berg [ Upstream commit cef721e0d53d2b64f2ba177c63a0dfdd7c0daf17 ] Doing this allows using registers as retrieved from an mcontext to be pushed to a process using PTRACE_SETREGS. It is not entirely clear to me why CSGSFS was masked. Doing so creates issues when using the mcontext as process state in seccomp and simply copying the register appears to work perfectly fine for ptrace. Signed-off-by: Benjamin Berg Link: https://patch.msgid.link/20250224181827.647129-2-benjamin@sipsolutions.net Signed-off-by: Johannes Berg Signed-off-by: Sasha Levin --- arch/x86/um/os-Linux/mcontext.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/arch/x86/um/os-Linux/mcontext.c b/arch/x86/um/os-Linux/mcontext.c index 49c3744cac371..81b9d1f9f4e68 100644 --- a/arch/x86/um/os-Linux/mcontext.c +++ b/arch/x86/um/os-Linux/mcontext.c @@ -26,7 +26,6 @@ void get_regs_from_mc(struct uml_pt_regs *regs, mcontext_t *mc) COPY(RIP); COPY2(EFLAGS, EFL); COPY2(CS, CSGSFS); - regs->gp[CS / sizeof(unsigned long)] &= 0xffff; - regs->gp[CS / sizeof(unsigned long)] |= 3; + regs->gp[SS / sizeof(unsigned long)] = mc->gregs[REG_CSGSFS] >> 48; #endif } -- 2.39.5