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 X-Spam-Level: X-Spam-Status: No, score=-10.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 88612C2BB57 for ; Sun, 8 Mar 2020 08:09:47 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 57472217F4 for ; Sun, 8 Mar 2020 08:09:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1583654987; bh=SaEhDcvYVntNwVbKRTvlXMyzobCO4PJVj69U+i8AD4g=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=RRAFjj/MjTe+/pksxM5kBi9e+a/NXxxFxPKpZlzEtavc20wPPW+erJp3avwObuzks Va8WmOrs4gcoFtu4edxtaqs49qSAX0h3M9d75Tt8M8qTnDiOIT2ptUJm7MqYJXpw4U YT6PY7QOqZ6NbEMzvXP8YdgOGEVJ8f8gKbQ5l9uk= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726523AbgCHIJq (ORCPT ); Sun, 8 Mar 2020 04:09:46 -0400 Received: from mail.kernel.org ([198.145.29.99]:37046 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726437AbgCHIJm (ORCPT ); Sun, 8 Mar 2020 04:09:42 -0400 Received: from e123331-lin.home (amontpellier-657-1-18-247.w109-210.abo.wanadoo.fr [109.210.65.247]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id B101621741; Sun, 8 Mar 2020 08:09:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1583654981; bh=SaEhDcvYVntNwVbKRTvlXMyzobCO4PJVj69U+i8AD4g=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=kIErOA+PMYAnbMVUbGrCZbKXWmnzrexMVUHhGVlPXk5I92Yq9vyYSk8aJfufQS+QA rZmwK3sxqNpXcBg+uwchvcJv8PNAnYbg9zWXKJZovg5NyEnPAw2KfHAdH+boZklBF2 0bOpG+bxt0gwe3bfguDIzqFqermANsUHqxb74Lo4= From: Ard Biesheuvel To: linux-efi@vger.kernel.org, Ingo Molnar , Thomas Gleixner Cc: Ard Biesheuvel , linux-kernel@vger.kernel.org, Arvind Sankar , Christoph Hellwig , David Hildenbrand , Davidlohr Bueso , Guenter Roeck , Heinrich Schuchardt , Jonathan Corbet , Lukas Bulwahn , Masahiro Yamada , Nikolai Merinov , Tom Lendacky , Vladis Dronov Subject: [PATCH 10/28] efi/x86: Respect 32-bit ABI in efi32_pe_entry Date: Sun, 8 Mar 2020 09:08:41 +0100 Message-Id: <20200308080859.21568-11-ardb@kernel.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200308080859.21568-1-ardb@kernel.org> References: <20200308080859.21568-1-ardb@kernel.org> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Arvind Sankar verify_cpu clobbers BX and DI. In case we have to return error, we need to preserve them to respect 32-bit calling convention. Signed-off-by: Arvind Sankar Link: https://lore.kernel.org/r/20200301230436.2246909-3-nivedita@alum.mit.edu Signed-off-by: Ard Biesheuvel --- arch/x86/boot/compressed/head_64.S | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/arch/x86/boot/compressed/head_64.S b/arch/x86/boot/compressed/head_64.S index 86c97797bf78..25fa763f4e83 100644 --- a/arch/x86/boot/compressed/head_64.S +++ b/arch/x86/boot/compressed/head_64.S @@ -660,7 +660,11 @@ SYM_DATA(efi_is64, .byte 1) SYM_FUNC_START(efi32_pe_entry) pushl %ebp + pushl %ebx + pushl %edi call verify_cpu // check for long mode support + popl %edi + popl %ebx testl %eax, %eax movl $0x80000003, %eax // EFI_UNSUPPORTED jnz 3f -- 2.17.1