From nobody Tue Sep 29 02:34:31 2026 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id D800435975 for ; Thu, 13 Aug 2026 07:07:09 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=170.10.133.124 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1786604832; cv=none; b=rs7NJl2b1MpnN4/ZIULpswszMWwqRK+r3qfxR36DdxZQUAzzGc3IwsuhARa5YdDnTq5O4dKLu2KKjqmOn/qmm+Y+1ZQFD6Se2zpqCKVSeuNl123xJy+/k8vFkh5yorT5FCP8fwJkOE15FB642yaca9pa+zJpvx18oAN6Ozv5ZoY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1786604832; c=relaxed/simple; bh=wOyFqwRT3urixhQakJtAvzNxo0cbYKSUpRn7y74plxY=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:To:Cc; b=uyvDdWGhN+wCqhVAUdPlbN/G/3JBsD/Xv7QWv437osjNMGWOpXWdm8A5y9dP6sS+QMmDWNfnSr+YNhhFhqYTX74IfdOP2SGBeBmdMAngZ04ah+o6las0Rs2cmGaCgJaEwplU6DJLuXMIUsNYXibYuzUsovDzEq7v3l2KXjqdC5M= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com; spf=pass smtp.mailfrom=redhat.com; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b=IwbXggek; dkim=pass (2048-bit key) header.d=redhat.com header.i=@redhat.com header.b=nfjE3LTh; arc=none smtp.client-ip=170.10.133.124 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=redhat.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="IwbXggek"; dkim=pass (2048-bit key) header.d=redhat.com header.i=@redhat.com header.b="nfjE3LTh" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1786604828; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=JiBEcYiE+KLh8+0hM55F9Ni/cU6OIiWXkgr39dKJ+1Q=; b=IwbXggek0Lx80Ce4b6zZqvM/5s28sUnK9oRlYD5dBlKd+pmEXd7hMPjLG7SLGvwxrp4+D8 MzVgugu+Nu5yDbLfkcnLgakaLLsHqj2D3HGj9sKh25smDCEven4sJLkrpckkuUnmDzyzQS MMK47GsgPCtAMPfLQOsPILalJA4a88s= Received: from mail-pl1-f198.google.com (mail-pl1-f198.google.com [209.85.214.198]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-526-UiD7VViVN0KWqc43KZe-9w-1; Thu, 13 Aug 2026 03:07:07 -0400 X-MC-Unique: UiD7VViVN0KWqc43KZe-9w-1 X-Mimecast-MFC-AGG-ID: UiD7VViVN0KWqc43KZe-9w_1786604827 Received: by mail-pl1-f198.google.com with SMTP id d9443c01a7336-2cd01a14e81so8483325ad.1 for ; Thu, 13 Aug 2026 00:07:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=google; t=1786604826; x=1787209626; darn=vger.kernel.org; h=cc:to:message-id:content-transfer-encoding:content-type :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to:content-type; bh=JiBEcYiE+KLh8+0hM55F9Ni/cU6OIiWXkgr39dKJ+1Q=; b=nfjE3LTh94GJOr6WuSTRJsNeOT/WrZ5jbmjPDSModsKk38D8qJRsNxkGZ9bBmv8q6l DphVGdG/fVCs6Kh87eqXkfVd1vffloyCOe2x4Vc0L5AS7g/e7RHaFIbn1i6iAlQl0rky asJHzmkr4EryrRDP7oTNRYACQtMDITf8DHfI9XRO8eE5103pw6hclXCob/F8skkfZkuT /o5Iwgn6phFcdQ+O+2yiW5T0Tv233zdr7EGs3GNvgdtsS2iO9ZUNWH4YIlAi8cdjUyYH KErI07piroU+n27r4C8qkn3BINPAN2ymkTjVPVftGhkquydQUtFPEAgCnEKAxpe3Hx0u xobg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1786604826; x=1787209626; h=cc:to:message-id:content-transfer-encoding:content-type :mime-version:subject:date:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to:content-type; bh=JiBEcYiE+KLh8+0hM55F9Ni/cU6OIiWXkgr39dKJ+1Q=; b=avEqQ8FYL0Wq1TOgXcvydvGiCg5jMFGcezC8dBo2ll/9IwreN0wHsZVvcQSvKZe7b5 L7+wc8uW4dN+DZ49D5punj5JXqQX6vmWVOppeH/3ICmKhgcdSatC7FTD23UsDcf6Cbsd AY/R0GBD3GUCpPxQxBDMZEl8bdCsmap+p7kW1+lsQiGHHvWNr7PksjhMt8j+jjEWfP2b zdtt+1A2lsuxtxKd9OX3C5xJ+4bq+O4kYSx2pAERCqOk4wNKGQRS7qBF3DCKXSh9X5aE ednMeKxsMq4jUlYUbZC5yW/juKsMJDg/6iDhNY+SHqR5J9CXanc4/kGCW/FSZZETYg6h rsZw== X-Forwarded-Encrypted: i=1; AHgh+RqayPJWk7QrZ9meS930pu/JvljCP02JJG/li0hF5MIIQIiPoOyh2eF2dHtlBNAYB94FZzmt3C8ukSPWUFA=@vger.kernel.org X-Gm-Message-State: AOJu0Yy5iopjr+aGDpF8TSX96f3aJRiUgBBQyUiVFy5lGeV3CouT/Z6Z 8M3+yTg+f++MY2TwC1YdATNBrc2Hbc4uNtUQLzMcveIWAfJ8/fBTIzsUU/BcQAbOZ/5yezBW4fk 2Hg7alkHAs3zvZdWFTJIHkcE29cj642ousxrPiiQo8e5ShMbob3j3ZxRA6/imBhZCxg== X-Gm-Gg: AR+sD103RnY6k7QMz0qk8RptH6XVh41qKR7IAsSF9PRvAH4S6R+kpJZNmru6mzyIuDR HNnPCjr3zOcQCwyg+bpWkjDsPXWcqAaeTQ1ttz8ly6skSMUiGjKYZCVhaTYrTNkRNHWKFhnfrpS ogPHs3B2z+oaL9YPv6KxiHRbvxtfwQi/9FR1+zqQ6LORKTV4qsXVJWQ2MuK8e6N58ZtlFL6J94D x9bzImyT/bACWeobwH0TbMFvYZJJ8pFufKM5clWKMr1fje7pD3w4h9E2LSi7BtRnRWJh4I7f+Tk P602IO/uqTeFL/5e1hCEHetK9Z1D6o+xDu7VfcHVKqt710nk5c0qTYm9ukAeNXG4dRAfGtJOEzs APIeHxHroqRD48KJW X-Received: by 2002:a17:903:234a:b0:2ca:d975:5bbd with SMTP id d9443c01a7336-2d37e8a4f49mr38123815ad.20.1786604826425; Thu, 13 Aug 2026 00:07:06 -0700 (PDT) X-Received: by 2002:a17:903:234a:b0:2ca:d975:5bbd with SMTP id d9443c01a7336-2d37e8a4f49mr38123275ad.20.1786604825987; Thu, 13 Aug 2026 00:07:05 -0700 (PDT) Received: from [127.0.0.1] ([115.110.157.234]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2d37c48e438sm4877315ad.60.2026.08.13.00.06.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 13 Aug 2026 00:07:05 -0700 (PDT) From: Mukesh Pilaniya Date: Thu, 13 Aug 2026 12:36:29 +0530 Subject: [PATCH] kexec: return -ENOEXEC from image probe functions on mismatch 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: quoted-printable Message-Id: <20260813-mpilaniy-v1-1-777d4d0e30f7@redhat.com> X-B4-Tracking: v=1; b=H4sIAAAAAAAC/6tWKk4tykwtVrJSqFYqSi3LLM7MzwNyDHUUlJIzE vPSU3UzU4B8JSMDIzMDC0Nj3dyCzJzEvMxK3bS0JIPkZEujZGNDYyWg8oKi1LTMCrBR0bEQfnF pUlZqcglIv1JtLQC+l4AzbAAAAA== X-Change-ID: 20260813-mpilaniy-ffb0cc92c313 To: Catalin Marinas , Will Deacon , Mark Rutland , Huacai Chen , WANG Xuerui , Paul Walmsley , Palmer Dabbelt , Albert Ou , Alexandre Ghiti , Andrew Morton , Baoquan He , Mike Rapoport , Pasha Tatashin , Pratyush Yadav , Tao Liu , Philipp Rudo Cc: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, loongarch@lists.linux.dev, linux-riscv@lists.infradead.org, kexec@lists.infradead.org, Mukesh Pilaniya X-Mailer: b4 0.15.2 Several kexec_file_load() image probe functions return -EINVAL when they do not recognize the image format. A probe function that rejects an image should return -ENOEXEC to indicate that the image is not a recognized executable format. -EINVAL implies a problem with the syscall parameters, not with image recognition. kexec_image_probe_default() iterates through registered loaders and returns the last probe's error code to the caller. That error propagates as the kexec_file_load() return value to userspace. Returning -EINVAL from a probe when no loader matches is semantically incorrect and misleads userspace about the nature of the failure. Return -ENOEXEC from all probe functions and their helpers when the image format is not recognized. Signed-off-by: Mukesh Pilaniya Reviewed-by: Philipp Rudo --- branch: next-20260812 base commit: 28d012efb4327f9c75d5e042a7c91e9a542efa98 --- arch/arm64/kernel/kexec_image.c | 4 ++-- arch/loongarch/kernel/kexec_efi.c | 4 ++-- arch/riscv/kernel/kexec_image.c | 4 ++-- kernel/kexec_elf.c | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/arch/arm64/kernel/kexec_image.c b/arch/arm64/kernel/kexec_imag= e.c index b70f4df15a1a..101259874d44 100644 --- a/arch/arm64/kernel/kexec_image.c +++ b/arch/arm64/kernel/kexec_image.c @@ -25,10 +25,10 @@ static int image_probe(const char *kernel_buf, unsigned= long kernel_len) (const struct arm64_image_header *)(kernel_buf); =20 if (!h || (kernel_len < sizeof(*h))) - return -EINVAL; + return -ENOEXEC; =20 if (memcmp(&h->magic, ARM64_IMAGE_MAGIC, sizeof(h->magic))) - return -EINVAL; + return -ENOEXEC; =20 return 0; } diff --git a/arch/loongarch/kernel/kexec_efi.c b/arch/loongarch/kernel/kexe= c_efi.c index 5ee78ebb1546..28a1d0420ba3 100644 --- a/arch/loongarch/kernel/kexec_efi.c +++ b/arch/loongarch/kernel/kexec_efi.c @@ -24,12 +24,12 @@ static int efi_kexec_probe(const char *kernel_buf, unsi= gned long kernel_len) =20 if (!h || (kernel_len < sizeof(*h))) { kexec_dprintk("No LoongArch image header.\n"); - return -EINVAL; + return -ENOEXEC; } =20 if (!loongarch_header_check_dos_sig(h)) { kexec_dprintk("No LoongArch PE image header.\n"); - return -EINVAL; + return -ENOEXEC; } =20 return 0; diff --git a/arch/riscv/kernel/kexec_image.c b/arch/riscv/kernel/kexec_imag= e.c index 51dc89259f16..963a25f5b55b 100644 --- a/arch/riscv/kernel/kexec_image.c +++ b/arch/riscv/kernel/kexec_image.c @@ -20,7 +20,7 @@ static int image_probe(const char *kernel_buf, unsigned l= ong kernel_len) const struct riscv_image_header *h =3D (const struct riscv_image_header *= )kernel_buf; =20 if (!h || kernel_len < sizeof(*h)) - return -EINVAL; + return -ENOEXEC; =20 /* According to Documentation/arch/riscv/boot-image-header.rst, * use "magic2" field to check when version >=3D 0.2. @@ -28,7 +28,7 @@ static int image_probe(const char *kernel_buf, unsigned l= ong kernel_len) =20 if (h->version >=3D RISCV_HEADER_VERSION && memcmp(&h->magic2, RISCV_IMAGE_MAGIC2, sizeof(h->magic2))) - return -EINVAL; + return -ENOEXEC; =20 return 0; } diff --git a/kernel/kexec_elf.c b/kernel/kexec_elf.c index 3a5c25b2adc9..89a444a00693 100644 --- a/kernel/kexec_elf.c +++ b/kernel/kexec_elf.c @@ -172,7 +172,7 @@ static int elf_read_ehdr(const char *buf, size_t len, s= truct elfhdr *ehdr) =20 default: pr_debug("Unknown ELF class.\n"); - return -EINVAL; + return -ENOEXEC; } =20 return elf_is_ehdr_sane(ehdr, len) ? 0 : -ENOEXEC; @@ -236,7 +236,7 @@ static int elf_read_phdr(const char *buf, size_t len, =20 default: pr_debug("Unknown ELF class.\n"); - return -EINVAL; + return -ENOEXEC; } =20 return elf_is_phdr_sane(phdr, len) ? 0 : -ENOEXEC; --- base-commit: 28d012efb4327f9c75d5e042a7c91e9a542efa98 change-id: 20260813-mpilaniy-ffb0cc92c313 Best regards, -- =20 Mukesh Pilaniya