From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id F1A59C636D6 for ; Fri, 3 Feb 2023 10:21:38 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232262AbjBCKVh (ORCPT ); Fri, 3 Feb 2023 05:21:37 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43816 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232070AbjBCKVg (ORCPT ); Fri, 3 Feb 2023 05:21:36 -0500 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 99E0493AFA for ; Fri, 3 Feb 2023 02:21:12 -0800 (PST) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 7E0C961EC3 for ; Fri, 3 Feb 2023 10:20:13 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 6D70DC433D2; Fri, 3 Feb 2023 10:20:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1675419612; bh=zwtqva3GzXiNPxJOGFRsMukrpm+AyyqIGGPA0PRQ97M=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=e6D22ynwJrHClgfSLryrpY3z53khrUjq/tt7KWoPo+tOriXPRpnqK4X8B1u23XMwf 7GPe1RSVjBffdHQAKD0cK2D+SARHCq5cmiVLVqoktRMGBPKsj5kBDbBWW+J6sWbFsW NHEKP5S+shSe6I8hoPfmytGge330ZXBnWfNd5+qc= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Jan Beulich , Borislav Petkov , Andy Lutomirski Subject: [PATCH 4.19 61/80] x86/entry/64: Add instruction suffix to SYSRET Date: Fri, 3 Feb 2023 11:12:55 +0100 Message-Id: <20230203101017.833731238@linuxfoundation.org> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230203101015.263854890@linuxfoundation.org> References: <20230203101015.263854890@linuxfoundation.org> User-Agent: quilt/0.67 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Jan Beulich commit b2b1d94cdfd4e906d3936dab2850096a4a0c2017 upstream. ignore_sysret() contains an unsuffixed SYSRET instruction. gas correctly interprets this as SYSRETL, but leaving it up to gas to guess when there is no register operand that implies a size is bad practice, and upstream gas is likely to warn about this in the future. Use SYSRETL explicitly. This does not change the assembled output. Signed-off-by: Jan Beulich Signed-off-by: Borislav Petkov Acked-by: Andy Lutomirski Link: https://lkml.kernel.org/r/038a7c35-062b-a285-c6d2-653b56585844@suse.com Signed-off-by: Greg Kroah-Hartman --- arch/x86/entry/entry_64.S | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/arch/x86/entry/entry_64.S +++ b/arch/x86/entry/entry_64.S @@ -1759,7 +1759,7 @@ END(nmi) ENTRY(ignore_sysret) UNWIND_HINT_EMPTY mov $-ENOSYS, %eax - sysret + sysretl END(ignore_sysret) ENTRY(rewind_stack_do_exit)