From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-wr1-f43.google.com (mail-wr1-f43.google.com [209.85.221.43]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 6A6B1402B91 for ; Tue, 28 Apr 2026 16:05:10 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.221.43 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777392311; cv=none; b=I8Vhz9pG2AhR61ACW58mfwtm7hQUKlTSumT9omaAzjsJIYBxEflv1C5LUf7FhLQ7cCOV9lS0S87fC+KXqJVbmG7Qu/bZsQGXktAcWnTT9X47/PEBrFlT37Y64d6hSdJgYYPwdtFotyoMI3Ln40x9kM2iM30mLCUl3tnCivaj6/k= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777392311; c=relaxed/simple; bh=QwXAtc8Gl2zZ9FTDZj4LbRduYAvq9oPk3kV41EeZ5+M=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=hegnqD7yy1wJUsE9zO9ePPfhLbJGEV+Un+2Ji/bDo7EDWzrC+NE+FccGuBEWN1zNOZzd5YtMMRfJHO46KEHYKRAFnVVGsFTSu0Zfhw64IG3JTeL6Fh9UMNUVszh8YxUGuYRiHxuLBjyHiCBfmGMxwxEJyf7v5693g4k9V5+I390= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=EnxVlge7; arc=none smtp.client-ip=209.85.221.43 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="EnxVlge7" Received: by mail-wr1-f43.google.com with SMTP id ffacd0b85a97d-444826c16ffso2176336f8f.1 for ; Tue, 28 Apr 2026 09:05:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1777392309; x=1777997109; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=DijXe5wsRKt2H83GP34j3hQ6a1KIBLaQi2NiD9WIPxE=; b=EnxVlge7Qc16RoY9sLihRjVOK7/L2GD8sX4wmSdFlt6ig/IXyQ9uOAL0AfiuLSSTXi 5FAXkq8FK6pTm4EmC4vWw04dtHLeN2S/YDmG0ulI+bdKTvoX6mtjLx4/CwHCeMThsqEu vuM9NY48+2gn/5zBL5AUUnoOZb0RLCvgbwn5Z0kAIFdXP/CziVkD/piz6GBFJ5aWMucl EEgV5V634JEYCmXOIE5zd6VzylNqBFQW5tKNX0py/sZtsjZkfisGwF98RE69/1hNbRDf AMt8TZaiBgiNqbo40dh+BJLbjbDEIaqm4lLT6pWejU3pJfqLbw9gGB5qZk8bfZrHTHRx +w+Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1777392309; x=1777997109; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=DijXe5wsRKt2H83GP34j3hQ6a1KIBLaQi2NiD9WIPxE=; b=dlIHcEAgsKF4oS7t1zYKB34iF9JygDPahpBPOCxniR7L/gz9MR+gANAjOiGj9MoDVJ Ag/LALAT8mFcg5uHGQ7WOOVnnJ71v2eiJenwIbX5ng+qL4MowaIuJIuzLxEShtPehZcw e05GS22PLfGwtDzqvavXwhEirWDqlHzW2Z+2XYFyGVfpNEex9sjqkKS8bBfs4T0A4SMN H15mVO9zuXuPCHAO5/E1L8IOhvgws2B5PtvCAaBXVFbLtVJKozAx+LgUBfKE6af1x8Bd tv63LysCELUqrImTBygXMx/PF7xAIL9SuMtk3vOvOcSnUaCe73yBI2YwwQ8W0XiwbiNd Xrfg== X-Forwarded-Encrypted: i=1; AFNElJ/X7jn4/3yWh+BmK+9c4eL+3Q91oENvIyoLj6oWS0+56Ufs/5S2lBRyNCSNFBRizThjX2aAL+VJIeC+1W4=@vger.kernel.org X-Gm-Message-State: AOJu0Yw8qYK5vckltBGGannu+XmcgTd5IHdAB+1ysCsfL0EqCH+TcfIp 9adDKAlbGm1nFNLvysFIxw7GZvPKBiMdO1qqtI+Z77L98dG+n0YxVdp4 X-Gm-Gg: AeBDieuwe0YcK/i6voXBJ5fZIrvRtuZM6Tx1EQb8TEc7C9dl0HiCSj/JezR0VIlc8YG maHQ5BlypcaiMgKQ7j8MSkkChGTxyvI1D7WovIyWiSvr8TcJLhgV58cPU9nD1f2mAboIeLtCLul 7cI8o0tybGqo6KXUeVP6y0pFmF4ZQlCHnfXQdnihmJQwcdTROi3kUAyEHp8zikout+uZ5mCg0pJ 0YOwGZfptnlCWH59S5IInsFQAPKVpmGrvuws9ILqVBDUUc5rZ0dsrbQ91thEqptqGYx4hzhzo0x liOBpMcdqYDJWLJZtqqKLQSW6p3tl3DHj294eVtqQnzvjTowIZnhdEZNLhXvGz4EkrPUUJXGbWW 9AQYJhJU4HOXTfqwEcoDIQ4YZhD4YUZ3pmBXjFSSNl88MCNOziiqKv24oL7A/pcKvO2Jb2i9QQO OKkX0Uj5dvSIZOsXfC7Szd3XhHDz5xi8nUhVBeqqYYNUy02o00zS5W4XXxOhu0d/FCfva1Vvb0i 0AjNANt7r6tteDTbamPdAlMCqN+nxcjuOez1ng53R2Sv7DSjbeXNc4= X-Received: by 2002:a05:6000:26d1:b0:43d:69ff:6898 with SMTP id ffacd0b85a97d-4464761c4c3mr6778923f8f.9.1777392308689; Tue, 28 Apr 2026 09:05:08 -0700 (PDT) Received: from fedora ([46.248.82.114]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-4464004edc8sm7532923f8f.37.2026.04.28.09.05.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 28 Apr 2026 09:05:08 -0700 (PDT) From: Uros Bizjak To: x86@kernel.org, linux-kernel@vger.kernel.org Cc: Uros Bizjak , Oleg Nesterov , Thomas Gleixner , Ingo Molnar , Borislav Petkov , Dave Hansen , "H. Peter Anvin" Subject: [PATCH RESEND -tip v2 4/7] x86/ptrace: Use unsigned short for segment values in get_segment_reg() Date: Tue, 28 Apr 2026 18:03:38 +0200 Message-ID: <20260428160443.3593331-4-ubizjak@gmail.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260428160443.3593331-1-ubizjak@gmail.com> References: <20260428160443.3593331-1-ubizjak@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change the temporary variable in get_segment_reg() from unsigned int to unsigned short to match the function’s return type, making the 16-bit semantics explicit instead of relying on implicit truncation. Also restructure the GS handling for x86_32 to make the special case explicit and easier to follow. This clarifies the control flow and makes the 16-bit semantics explicit without changing behavior. No functional change intended. Signed-off-by: Uros Bizjak Acked-by: Oleg Nesterov Cc: Thomas Gleixner Cc: Ingo Molnar Cc: Borislav Petkov Cc: Dave Hansen Cc: "H. Peter Anvin" --- v2: New patch. --- arch/x86/kernel/ptrace.c | 24 +++++++++--------------- 1 file changed, 9 insertions(+), 15 deletions(-) diff --git a/arch/x86/kernel/ptrace.c b/arch/x86/kernel/ptrace.c index 4cb00aa0645f..58e09a764bcf 100644 --- a/arch/x86/kernel/ptrace.c +++ b/arch/x86/kernel/ptrace.c @@ -182,19 +182,16 @@ static unsigned long *pt_regs_access(struct pt_regs *regs, unsigned long regno) static u16 get_segment_reg(struct task_struct *task, unsigned long offset) { - /* - * Returning the value truncates it to 16 bits. - */ - unsigned int retval; - if (offset != offsetof(struct user_regs_struct, gs)) - retval = *pt_regs_access(task_pt_regs(task), offset); - else { - if (task == current) + unsigned short retval; + + if (offset == offsetof(struct user_regs_struct, gs)) { + if (task == current) { savesegment(gs, retval); - else - retval = task->thread.gs; + return retval; + } + return task->thread.gs; } - return retval; + return *pt_regs_access(task_pt_regs(task), offset); } static int set_segment_reg(struct task_struct *task, @@ -248,10 +245,7 @@ static unsigned long *pt_regs_access(struct pt_regs *regs, unsigned long offset) static u16 get_segment_reg(struct task_struct *task, unsigned long offset) { - /* - * Returning the value truncates it to 16 bits. - */ - unsigned int retval; + unsigned short retval; switch (offset) { case offsetof(struct user_regs_struct, fs): -- 2.53.0