Received: from list by lists.gnu.org with archive (Exim 4.90_1) id 1qEVFD-0005Bx-31 for mharc-grub-devel@gnu.org; Wed, 28 Jun 2023 09:30:03 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qEVEy-0005AF-5i for grub-devel@gnu.org; Wed, 28 Jun 2023 09:29:49 -0400 Received: from mx0b-00069f02.pphosted.com ([205.220.177.32]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qEVEw-0000QK-AX for grub-devel@gnu.org; Wed, 28 Jun 2023 09:29:47 -0400 Received: from pps.filterd (m0246630.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 35SBT8Xs001876; Wed, 28 Jun 2023 13:29:43 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : content-type : mime-version; s=corp-2023-03-30; bh=kb6sM3cylrQ1pjFShaFrRW0mRugEiilSjrSTJRxTeuE=; b=xYwjDwJ8hWfhHSqR4O4DzjnnJYmHGv60Zj1WDz4oMjPvbaXFXwTfaMSkHYaejgGnniq2 5FtMyUA4EqqdbeyHuXrYEu0FtUcDnwCRXG4pu3U4vS9X8Ij5Osv2EamGJnDodWIYfe8x 4zZDpDPsfKDseowVWmKyEvrUNmVPJ5xZU21gJjPLtXrHR5ewpmEQSbr9iD2WJq20OUiM kYk5i48wYwQtYifzi8c5ZIQkgdVlYhNKBqP/+xHiyRlIG9pBgenBZVZZd4ONAdgximVa 0CN6nwC2CPwJHSPXfnzzYVij1ibcSz+hkFFBKb/f+RMlrF2w2Trwtuck3jCq0CV0WN8u ZQ== Received: from iadpaimrmta01.imrmtpd1.prodappiadaev1.oraclevcn.com (iadpaimrmta01.appoci.oracle.com [130.35.100.223]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 3rdpwdffsv-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 28 Jun 2023 13:29:43 +0000 Received: from pps.filterd (iadpaimrmta01.imrmtpd1.prodappiadaev1.oraclevcn.com [127.0.0.1]) by iadpaimrmta01.imrmtpd1.prodappiadaev1.oraclevcn.com (8.17.1.19/8.17.1.19) with ESMTP id 35SCrIfd004006; Wed, 28 Jun 2023 13:29:42 GMT Received: from nam12-dm6-obe.outbound.protection.outlook.com (mail-dm6nam12lp2172.outbound.protection.outlook.com [104.47.59.172]) by iadpaimrmta01.imrmtpd1.prodappiadaev1.oraclevcn.com (PPS) with ESMTPS id 3rdpxc15ef-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 28 Jun 2023 13:29:42 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=dLRs9O0tfBLx2x4YaQJKgyP/XtMA1VbHZ3jxv4fqCJJgAqumyRO9w1BHSaeM9FR26+CN1Z+hJ2dNavwik2XK0ZGYEMl8La6Wf01VZy5CzpTPrXh66r/HjTJ6DS2jZSYE+h5D8vvdYOnCWkPwuHQ9Y5025zeD9SzYyCQA+Ta1fFuSMPKjh11wySFImcrVwQh4qIK7f9sM1pLMyTTTRY71dJjguakhpa/h17mQ6iuDf1nbk8dkfcqKqBtExzx6EjqyRLRKIJQYr/lROMJ2gezVw6b/VfNYSYhM3VBaNvDzmjdcX2sfT/JDayITvHEk12yyGoftDZWmrer3bEkIJrJ7Uw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=kb6sM3cylrQ1pjFShaFrRW0mRugEiilSjrSTJRxTeuE=; b=jJF0tG7TUPE9WaSx5M/ydxc++qsAXzEnr0rSj/4KsFtCdHTGHAjW7vHS8k9AINYml214hop40Iz55atYBmI7KfqhCJfV5socoICIYql8AkCJ+LFjDcCy6RpKzETBh5dB/AQ6l5Ng69WKw2M0fFzH51u02FXjuCcK2cE1nA3GGp+W3tyC/PYuVd5XBAf51hcCQizmSBX/DgO8qecxEqPFT0hTxhoWbMAMyRyp1qIkAz0NQrYqFsCyo+zgz5guNLPVNGQWmbhRgcZh19FJI+K2s2O9AvKkDqhf0nQcPP87CRQTyNtfAr09L/0vSIXb55d3JtIqBJB9ZT3jITihlyHT+g== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=oracle.com; dmarc=pass action=none header.from=oracle.com; dkim=pass header.d=oracle.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.onmicrosoft.com; s=selector2-oracle-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=kb6sM3cylrQ1pjFShaFrRW0mRugEiilSjrSTJRxTeuE=; b=z2roi3YlO+eY5KlEQ3FR3Ggf56hUxYIDIYcssF/ODlcw/3FDEM/eaU1bZhIIMUS6EPMe55mg9QSyPjRnHTW9fRislaUmd5l/yCO1Did/2CAhgwl+W86k7uFA0Iz5r5e/ZuavKf2zNZjLh33xj2N0Ayf4Vez0pTITf7xetj8kC9E= Received: from BN0PR10MB4822.namprd10.prod.outlook.com (2603:10b6:408:124::13) by IA0PR10MB6817.namprd10.prod.outlook.com (2603:10b6:208:43a::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6521.26; Wed, 28 Jun 2023 13:29:40 +0000 Received: from BN0PR10MB4822.namprd10.prod.outlook.com ([fe80::86ed:de25:a973:cae6]) by BN0PR10MB4822.namprd10.prod.outlook.com ([fe80::86ed:de25:a973:cae6%2]) with mapi id 15.20.6521.026; Wed, 28 Jun 2023 13:29:40 +0000 From: Daniel Kiper To: grub-devel@gnu.org Cc: ardb@kernel.org, development@efficientek.com, dimitri.ledkov@canonical.com, julian.klode@canonical.com, mjg59@srcf.ucam.org, pjones@redhat.com, rshailu.yash@gmail.com, tobias.powalowski@googlemail.com, thomas.frauendorfer@gmail.com Subject: [PATCH 1/2] efi: Drop __grub_efi_api attribute from shim_lock->verify() call Date: Wed, 28 Jun 2023 15:29:14 +0200 Message-Id: <20230628132915.28651-2-daniel.kiper@oracle.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20230628132915.28651-1-daniel.kiper@oracle.com> References: <20230628132915.28651-1-daniel.kiper@oracle.com> Content-Type: text/plain X-ClientProxiedBy: BE1P281CA0314.DEUP281.PROD.OUTLOOK.COM (2603:10a6:b10:85::15) To BN0PR10MB4822.namprd10.prod.outlook.com (2603:10b6:408:124::13) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BN0PR10MB4822:EE_|IA0PR10MB6817:EE_ X-MS-Office365-Filtering-Correlation-Id: dd02adc6-73ab-487b-6465-08db77dbb9a8 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: rdTcJv9zlMPvzbyd+z+SqIidwL53OMyT9An34UIKIpEVWcdoYJ+ij5KslIuhE/27Nx5Kw9PGABf1SfGHCbbZ9D9rVhL9Z0HV0SQBmBd8NIIQj/2SnUJK/c8L3O0SYqE6+eWoE0dWUBLyRWBxO3B5vrG5aO058a1BKZy7O9+5ucBVE7slzKh3BH/HSsdIaKvCFSQupyQhQ/WfkZsvQPwEFTByuVoeNOEYD9WtSQlp/Twp/jAByb7lXEIxJ9Rb4ncMfdeEfXAWHNNHrWRf85vTfnpEv6rX+xsGR4S/GIo5UgUCLMGeyCQX8FwuBe+b4PfZLlnnOJSVxp6dUZBABi2RBLkQ9+FZdVl7beoLG+qosQwvDmMJEcHszwoufIZjCUFcsBtYK8OcTyJvvqGmp1EOAQJINSkv5UuGjN58QjRZNOh66yghriij7/rFa3GA2lD4DK/2YKxI25u/Jghruq+126nIzzUjNtRcbmhbI71UqZBbe7+a5+eWrdyX0sBDvjW5PHCx5kzmlV6y2yHJcnh/8YtkODyo1Xq5VYunUz4sIiwiNNMEfenMkpzXqpHmQTQT X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:BN0PR10MB4822.namprd10.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230028)(366004)(396003)(376002)(346002)(136003)(39860400002)(451199021)(26005)(36756003)(6916009)(44832011)(5660300002)(7416002)(4326008)(86362001)(8936002)(66946007)(66556008)(66476007)(41300700001)(38100700002)(316002)(8676002)(6486002)(4744005)(1076003)(6512007)(186003)(6506007)(15650500001)(2906002)(478600001)(6666004)(83380400001)(2616005); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?3dMItpWiqUQW3LmczOH3SzZR0W/fJbfGNuGIPoQmcPYxb4dHSZm6IOganlfo?= =?us-ascii?Q?IvxaFpJGhm/OBEEW1ejjrShOcJMh1cHaiintahcGTjBAgFieG1fmLucEVBcj?= =?us-ascii?Q?qyPwOrSs7oZU5KBJsxh1NraHt2f61IW2V8cU5PbTKCqQDcGb4Oo4PZ9wA7Ps?= =?us-ascii?Q?SFryyvLyIvi5p+rGOuInMk29PeQ1p+N6SY8LcmwBTMzu8K+1TdozZNOll0r1?= =?us-ascii?Q?z3tVzsy3cYYCibC9Z9nSytz2GFhUc6UoIAah//opD1UYE1gUQ9VWUt2vvtTg?= =?us-ascii?Q?6i11fiyCaZ9S0nLlVQYUhPpcMJzrzfU5QSnXb4qW+HS5i+WcxKx6zLpexf3d?= =?us-ascii?Q?BWSzqKyXUg1sco7jpbD+F0YTYajwctHcnQ8D2dhtJ4q/VkwUtspsiC5vaLSA?= =?us-ascii?Q?KDw38BOOsjkHQBiOIhc3u8GaAGotABk08+Pt6k6ZBKQshLjyvZmLP89qT+vc?= =?us-ascii?Q?CRhP4Ihs+6kO/P8TC0qqZgNzrnNu0l4K/tx6rAopAj1hv3RFrOHjXLIaRt3n?= =?us-ascii?Q?yOuXvlez8QlWr10I1X27Kp9NM7E5ZmKH8JpopKf/U9KHLIrs+zKrHSIugUvt?= =?us-ascii?Q?pKGcM9zPIPy8W7MTm7oqodfTZBu8kNVfjp2Hmp0S2ZeusERWzs1gEPbwIpIw?= =?us-ascii?Q?ArJ3aHnZQ3cp9y5jT2aclQoL5kzBI2bZJ+jXPAyUQEuOx+E1nDNmVC2m+GVs?= =?us-ascii?Q?Z7nlX0wuG438FnIAC5bsML8gBkDu4dYX9Xk1pBwXQou2WrBK0fOx6u8aI/Br?= =?us-ascii?Q?9iV6vQMsBB3gvNXDkkZ2L0u9HxLNLs6TsqO3QFKy/m5B/lRLp9VP+sBtKnlD?= =?us-ascii?Q?tUkqWbGA6Xpqz80kI6dBktjWk1JR+0T+fKtNwE1r1ES5niI2J1ZT2LxxHBmw?= =?us-ascii?Q?neGTVl5oEmfllXI4U0emjULHKiRA2gcb4bCqimIVKJGIYJIUAejJsMgEYBWa?= =?us-ascii?Q?1Zizbd8ixJEMjV29+n9n5y5SNQdIdDC0KSzL9A1JWgqEMdjXmxmW+/GL2viN?= =?us-ascii?Q?D6lcoRgds+7TuT8mGYUyUJepGdBUoFRUNO7lm1X/wRLO2Rf6b9rv27+x7Vxg?= =?us-ascii?Q?x03cuZO1FJ3rjelsyONu7VOSug2pUUwoJsFqaxOBSYkURpHF+Bh1BIpXEOut?= =?us-ascii?Q?XdyMSfSk0Eny+JAvEg4UPPbNFnZjMIAifqLMHhORoC/+OfRHUzLjre/6gXTV?= =?us-ascii?Q?X85Mcg6DEb910gFkP5UVtOAI6D7f+oq32Ma9JYZ8DTesAwa42R6HCITrL91A?= =?us-ascii?Q?JTL5+Bpr9Ml1RCwBlTmccEk6AGVMA+fYwk7REP0SWGzdf+fPOkeBNNaeRcwc?= =?us-ascii?Q?+q9PwFy+1Qg2kWIOqdXtBVc3jKAu/tFVAiYKJ4n7pJgcMy0Kfv7XzYc3ZvMH?= =?us-ascii?Q?aJxdAOGof1VFjA6yCRCe0p9f1vYAJDfWHkXAEjiQUN8g2biNzltekM77j9JI?= =?us-ascii?Q?7FCU/7WY1GDuOYWAJ9CO13ySj++rjlnodqmqeLPHXy+cnaFWQ4x0I3B6D1NK?= =?us-ascii?Q?jq9Yj7tfTTlk4mIPaUcaAQi5j2r2Rik2O6yplFBU7WJnKeXNvO3excxhix5J?= =?us-ascii?Q?IK3XxiIGMJvCMJLM+t3/HLQiZwo+pKitRTZ9op0Z?= X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: =?us-ascii?Q?2FwR06sVCD+CRy8YmS7iArjEXOEtofhF98+laHygtgrK01rhrj+psyu3VtYn?= =?us-ascii?Q?mhbufESv34FQXoXCqXeRuHO3a3XzeD/vAZfmpKlfWd1qi8fbGklf7lpvemNM?= =?us-ascii?Q?tV8sLAdIh2swqBWAyYgbcw690dDBuxsQTLUNbVXfa4rlLop467ieSP4IRxyD?= =?us-ascii?Q?g9bJS0G7WQ7JiD8z9Bsl2x4S0+4ZswRP8L/cR7xOdDW1JmRr0JhvfjrRPPwC?= =?us-ascii?Q?9KIXWwWZ43/NOipj84adcCzMBUcnmtR0fZsHvx+CP8OItyHJevc33TRxrWjD?= =?us-ascii?Q?aUGrmfYWWZKtrgIbSeFoBacT1IjkVaOxXTeRRC/t94VPTVgt2aBE//uuJ55d?= =?us-ascii?Q?i4x+3jHlH1aurrJ10CaxXluStSE5ba0gI3xNh2AjZ3Hzmj6BHRMmuK6YDMgZ?= =?us-ascii?Q?OYaoZOdvN243cVJ93BFDLpGF7XLd9H8rGgWSH+4chyn4n3Muc4576V4iJUpm?= =?us-ascii?Q?CTzFoa9t4srZbAYfMrqeRLbhEZp7cfEU0dx3DEBuAd5DVgCFrG0JL3lfTR2B?= =?us-ascii?Q?hP7sBeOoaSYAL68o2JB0y8FK99GTAvfUWLFqOjd0QrRLtLJezI/qyLMadWvu?= =?us-ascii?Q?mfSrING65Grt/oI3AzvhZZ69MpPeXMvEe1BGONJFyYJ2tTDvi6IG/t7gGMuY?= =?us-ascii?Q?eqV79qIv5q93f4ETqe4OJ/XwphaPPDbO+E4jrwDXwz8qCpOKeMDJXIsuSNOT?= =?us-ascii?Q?MIqveNlTGMvn1FKg3IKB+gvEGdOSwoxHFt60po4yKtAdQbkPQBdoRt273ODv?= =?us-ascii?Q?bv3j65h1KMBmEDL1NgK4R3q33Co3cLeoYLQcslmBX5S19AzooWFaq8lefCQ2?= =?us-ascii?Q?0eVjXu9apnzPh6l9+6HlbCWes5o0a88WyICeXQKa3PW6em9WiVjOL6R0guuC?= =?us-ascii?Q?ArkTKzxX5vd5eOzfQV8RV3GqTv3AmUMGprNo6EP2dPOx53oSjt1RcU/72kOJ?= =?us-ascii?Q?arMExLXmg9XwIQIM5Hj90jRDcnBedg3kM9U+m66PJTg=3D?= X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: dd02adc6-73ab-487b-6465-08db77dbb9a8 X-MS-Exchange-CrossTenant-AuthSource: BN0PR10MB4822.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 Jun 2023 13:29:40.0135 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 4e2c6054-71cb-48f1-bd6c-3a9705aca71b X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: rR4eBofgEvAjtndnoe2VVPdO3ywJOs+zAqoAH1dXGigxxTchhDRpC5l+mEf8OsbMdAGOUrdwgx0G10IM1Mn+lw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: IA0PR10MB6817 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.254,Aquarius:18.0.957,Hydra:6.0.591,FMLib:17.11.176.26 definitions=2023-06-28_09,2023-06-27_01,2023-05-22_02 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 adultscore=0 malwarescore=0 mlxscore=0 mlxlogscore=999 bulkscore=0 spamscore=0 phishscore=0 suspectscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2305260000 definitions=main-2306280120 X-Proofpoint-GUID: y7yKXV5S_HEE3notSFtPtEwqPS3bq5Sn X-Proofpoint-ORIG-GUID: y7yKXV5S_HEE3notSFtPtEwqPS3bq5Sn Received-SPF: pass client-ip=205.220.177.32; envelope-from=daniel.kiper@oracle.com; helo=mx0b-00069f02.pphosted.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: grub-devel@gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: The development of GNU GRUB List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 28 Jun 2023 13:29:49 -0000 ... because (surprisingly) it uses System V AMD64 ABI on x86-64 architecture... Fixes: 6a080b9cd (efi: Add calling convention annotation to all prototypes) Signed-off-by: Daniel Kiper --- include/grub/efi/api.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/grub/efi/api.h b/include/grub/efi/api.h index 16161e1f0..f3c50ed5d 100644 --- a/include/grub/efi/api.h +++ b/include/grub/efi/api.h @@ -1777,7 +1777,7 @@ typedef struct grub_efi_block_io grub_efi_block_io_t; struct grub_efi_shim_lock_protocol { - grub_efi_status_t (__grub_efi_api *verify) (void *buffer, grub_uint32_t size); + grub_efi_status_t (*verify) (void *buffer, grub_uint32_t size); }; typedef struct grub_efi_shim_lock_protocol grub_efi_shim_lock_protocol_t; -- 2.11.0