Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
From:   Mihai Carabas <mihai.carabas@oracle.com>
To:     ardb@kernel.org
Cc:     mihai.carabas@oracle.com, linux-efi@vger.kernel.org,
        linux-kernel@vger.kernel.org
Subject: [PATCH] efi/libstub: arm64: Fix image check alignment at entry
Date:   Wed, 19 Jan 2022 18:14:27 +0200
Message-Id: <1642608867-21307-1-git-send-email-mihai.carabas@oracle.com>
Content-Type: text/plain
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?UhyLjmyTVLRKMcVcW5B7PkUQMxWfxuW+zCMkT53d8Qm8fYZxZrY1wAVyqQg8?=
 =?us-ascii?Q?LPqrKvCgiF9iZf5M+Sx5a2F9GJ5IYOS/fBa+RSBowwl63q3aFLM5uJacVmo+?=
 =?us-ascii?Q?Ait1ZXe4LTpS5zAbNR58RC436FnxmFiJu4lIcIfxcLoUsWX61pDGTVWSPLGI?=
 =?us-ascii?Q?Bli73LI2bLPoVbNbpC2zO14/HLxhwVSriuYD5RYaztjNJqmd7zkoQjogIClC?=
 =?us-ascii?Q?g1ehb6wywCcZgeq6IATcLxPyu3zr1NuMvdY9jGJQkyvuZMjpdNxHm4nTlzSp?=
 =?us-ascii?Q?q2dH/OmsVzWiIvzl2Y1yTy9p22lPTygwm8WBRE9/LW2MLap6bjuGQ4IElIu5?=
 =?us-ascii?Q?rRH7FmMtiPePUhVao1DiwqiN+VXpm9gUD8LYcJtucN+X1X3uL3LRd3jnuhYw?=
 =?us-ascii?Q?j6BNvlp5PEB68W4kNuTivPeULpPEoD1UN0TMvBWR81jubBbTa4E009rhZ7dd?=
 =?us-ascii?Q?uSXiUWW/lKOi7owMMD13QNSse9Y0lzfthe0CNun1UgQRICM7wAeGKclekpAt?=
 =?us-ascii?Q?vwZJlQLohFcWYDh/olWkGnjzl/wWomJwG7GWE6EsLKyylj5cm/bmRMc763pu?=
 =?us-ascii?Q?vacOfqc9+GiNW3IZhyEaYt3yQgfNSlOKESI2bbCMx+hEltiOX7qUDRt7pZh0?=
 =?us-ascii?Q?+CvhvWDTHyZT12yo8vcPxZxOMRoChEv0VLuIBknxTS9kRWFlhPZXIxUoWh3z?=
 =?us-ascii?Q?f6yEJJ8zdfebrpFfYCpXH057ltZGLVeB5tpTAEZOqzRs27nDld7DbcnrAXw8?=
 =?us-ascii?Q?v2zt761tLoWx6FpHBxq1byn5OwuCd/1zIf/98rxEzMwQ0z8/eXl4gbonXF4h?=
 =?us-ascii?Q?OU6foq8puAz67fwdfsrUkEhHKd6265JRUFJ0RxYm8+qEGpMhTz5fIDVJMYjK?=
 =?us-ascii?Q?OnaaUJFSmS10HnK5ibdubO7yeefeYL9veidkuMHLQMpSRwJ3htVWycf9djQQ?=
 =?us-ascii?Q?nE31tzkv6cZQ5/2Fy0lh0OdZ1emasxy/IQiOFtjs6q52TJpG60eMIYta6ZAt?=
 =?us-ascii?Q?wYFD+lYbDM+U9R+FB/bJ/ooWqvsy4CG1zlfDWSdwFyx+E3Bn5bvEpSgPFoZT?=
 =?us-ascii?Q?1d5M+kR8FnSi/4acCB1JSFfH5NaSElNHS6zFOQAjGXOcUo6Rg4kjiQQkyRuo?=
 =?us-ascii?Q?FojGWhTrS8TOnaBr9mNSVq0EGttlma0cNKwzE9jdqv4QjWSbnAtA8wsJnYfz?=
 =?us-ascii?Q?v+2T74sdRUdItc/tu24nLx0UIapQqzwvsH9Cnm/r2oqsKDY+Rz9Jd6qhwP5/?=
 =?us-ascii?Q?wbL7HPUc6ifTg9PqUXAQKnBMmB9yBGdw1/pvxPt1darNgJbdZb4zClWMCLb+?=
 =?us-ascii?Q?MSCxXH4QIluqYT2yCZqEJljloDs7+ARr3TCIy0mlLDg50MbwjscsMri7KxLo?=
 =?us-ascii?Q?XKm7vbbIWTuYE46xi67ml7aoMtWrdD2HrzsxZj4eMnPlynCxmJ0uZxBAzQRe?=
 =?us-ascii?Q?jicrr/FMIvOmcQZXt2e61X3mOXW4YweKTgojhkfbNF7rEVWsCYX4As7RmF26?=
 =?us-ascii?Q?uap20LcIIGfQAZUNjBla5bAMPcWhjHW8vtum9KsrcJB/0/vqxEmulOSrYNCM?=
 =?us-ascii?Q?Lf5+u3zAywuszKXOaHJLJWp1Cgt5A2d2zWQN8gvH608bHRe7BELsGbAF6mPi?=
 =?us-ascii?Q?9OOrU/zgn5rpp8SUolkul5qUOjdPMp1+M/FksQB5OEXsEqICPOmdHs5tRXrB?=
 =?us-ascii?Q?gPkrPQ=3D=3D?=
X-OriginatorOrg: oracle.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 09ab472d-c438-483d-61dc-08d9db6e8b92
X-MS-Exchange-CrossTenant-AuthSource: PH0PR10MB5894.namprd10.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 Jan 2022 17:10:08.5866
 (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: zOcBiSZMUWzF7Gs4lj0IiVUtattFC70QkiNeWe3Zo4fj+cI4vHTGPu8RtS5emUCel6p3ycYwRoWk7LLgwbu8D+XlbHjGeY+IN4dCOPfF7Mc=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH0PR10MB5099
X-Proofpoint-Virus-Version: vendor=nai engine=6300 definitions=10231 signatures=668683
X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 adultscore=0 mlxscore=0 suspectscore=0
 phishscore=0 malwarescore=0 mlxlogscore=999 spamscore=0 bulkscore=0
 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2110150000
 definitions=main-2201190097
X-Proofpoint-GUID: ozTcPMtgxXl3upv2z5oqzbdr4QAtPYij
X-Proofpoint-ORIG-GUID: ozTcPMtgxXl3upv2z5oqzbdr4QAtPYij
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

The kernel is aligned at SEGMENT_SIZE and this is the size populated in the PE
headers:

arch/arm64/kernel/efi-header.S: .long   SEGMENT_ALIGN // SectionAlignment

EFI_KIMG_ALIGN is defined as: (SEGMENT_ALIGN > THREAD_ALIGN ? SEGMENT_ALIGN :
THREAD_ALIGN)

So it depends on THREAD_ALIGN. On newer builds this message started to appear
even though the loader is taking into account the PE header (which is stating
SEGMENT_ALIGN).

Fixes: c32ac11da3f8 ("efi/libstub: arm64: Double check image alignment at entry")
Signed-off-by: Mihai Carabas <mihai.carabas@oracle.com>
---
 drivers/firmware/efi/libstub/arm64-stub.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/firmware/efi/libstub/arm64-stub.c b/drivers/firmware/efi/libstub/arm64-stub.c
index 2363fee9211c..9cc556013d08 100644
--- a/drivers/firmware/efi/libstub/arm64-stub.c
+++ b/drivers/firmware/efi/libstub/arm64-stub.c
@@ -119,9 +119,9 @@ efi_status_t handle_kernel_image(unsigned long *image_addr,
 	if (image->image_base != _text)
 		efi_err("FIRMWARE BUG: efi_loaded_image_t::image_base has bogus value\n");
 
-	if (!IS_ALIGNED((u64)_text, EFI_KIMG_ALIGN))
-		efi_err("FIRMWARE BUG: kernel image not aligned on %ldk boundary\n",
-			EFI_KIMG_ALIGN >> 10);
+	if (!IS_ALIGNED((u64)_text, SEGMENT_ALIGN))
+		efi_err("FIRMWARE BUG: kernel image not aligned on %dk boundary\n",
+			SEGMENT_ALIGN >> 10);
 
 	kernel_size = _edata - _text;
 	kernel_memsize = kernel_size + (_end - _edata);
-- 
1.8.3.1