From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.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 01D3549503A for ; Fri, 21 Aug 2026 13:50:24 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=170.10.129.124 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1787320226; cv=none; b=pdNE6Mt9FhgOpAxNMWIqr6AUv7QLCJhiAZ6F+nxL30SELu2k9/Hilj7SkJy98RFn2d5L//9v3CH1uYFDhrpyRaRBEupsnePVtDxHuhoy7uOwi/8pKnNfQbExfYUDhhRhFmaZsgkZlQ49xdIvtzJNZbBxju38WJYmk488rKetlig= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1787320226; c=relaxed/simple; bh=AjWp1TjMRLUGqxdS72hdqYmC5bBQJLPPnhM97ee5Dh8=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=J41smcWj1tzoR5OsAwDmDo3Jg95NcemIHZRN9VELUd1vsiWe7eDqa7l4NcSvRfmcgUgiCaaSiSfOyW4E6JSFhSBID6+tJ0WWIsLNrASOpzaRAdJB7gQwAjqGVQ2aeK+ECsE/umG5rHnQ40pAfqeyRxH71byMRyWUsy42K1iCca4= 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=N4cT5YSi; dkim=pass (2048-bit key) header.d=redhat.com header.i=@redhat.com header.b=huAYynZS; arc=none smtp.client-ip=170.10.129.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="N4cT5YSi"; dkim=pass (2048-bit key) header.d=redhat.com header.i=@redhat.com header.b="huAYynZS" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1787320224; 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: in-reply-to:in-reply-to:references:references; bh=BpYJaQfkL/fXy91zs4mgPaYnWE9uvAuTxt0XGGUcMwU=; b=N4cT5YSi54d0WaPOkOQ9bigNNc3SdHIDhXvYF+jRio2Q6CMvou/sYLIiOH2dcFD5OZ2CuZ PioMTaoAUlawczLN1kQxZ8zIIERaG1kMg44JR1W3YsERoSLKAKw9ybK4EQj8kBt8oIkSON jVPC5PVwziTUB3kGnPYgcCqKb4UH2xU= Received: from mail-pj1-f72.google.com (mail-pj1-f72.google.com [209.85.216.72]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-473-n23mTED_OsWIZ1YtbRvcvQ-1; Fri, 21 Aug 2026 09:50:22 -0400 X-MC-Unique: n23mTED_OsWIZ1YtbRvcvQ-1 X-Mimecast-MFC-AGG-ID: n23mTED_OsWIZ1YtbRvcvQ_1787320222 Received: by mail-pj1-f72.google.com with SMTP id 98e67ed59e1d1-38e54b6556aso1168670a91.2 for ; Fri, 21 Aug 2026 06:50:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=google; t=1787320221; x=1787925021; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :content-type:mime-version:subject:date:from:from:to:cc:subject:date :message-id:reply-to:content-type; bh=BpYJaQfkL/fXy91zs4mgPaYnWE9uvAuTxt0XGGUcMwU=; b=huAYynZSRvR8sZrUv2iJFwOGJQyO2vsqXKpfwgVdwB2+NP+kFPAf6q4d+EtVKwJT/R h0faM2L3F5omcWu+v5F4onjazYM9MM7sD8xgQwszDVEoZrwlizEqDLQI71S12WzJFlo3 WjOT55YJBzRtYLimdnTNmGkEju4CbZoCAkByqynWdf/PokMGfYsPiNp38IAHH9KmdNIc pXWnzN3mtE6PiMlhjLTgro5HT6xc4VSpiPnyr/XMoImcJt/jSIeW8aEzz7bcv2Wftmtz BCkJZbRhfydilDYQ8zbk8v80xxlCHduFg0EZs74ZZH2Ou6sdgryx5pNuLsssXozF4mFQ g62g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1787320221; x=1787925021; h=cc:to:in-reply-to:references: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=BpYJaQfkL/fXy91zs4mgPaYnWE9uvAuTxt0XGGUcMwU=; b=rtoNm+EH9cyam8asyL5/LIrPP018p81KMmwiSyRZeFt5dXH4Tl0EDlY/wEuJeVR7WK F1WyWNYS0OP2+Ux5J4BEWWechiCx6+7le9MbM+As7efzPQsBvVJc7z4khE1OXzJ9aL+r j/GhmsJZEzzeP7o1ps6NqVEwPlXAblJSzwv+LQev2dY+21n8dZXmAHZsKFLY1OleBsfj bulbdBJWkzZuwRYq67vK87cP1NYq3vWQoo17RXPuanAcK7tyNcP9b+AxeE2khMRHCuny OqK8I3u+vGcehUJ+Mh/xts1hUouP/sjuejTGZpRpwLF/5YlYHTlXOptZ05VyML6+J6LQ wlkQ== X-Forwarded-Encrypted: i=1; AHgh+RpAisocGlBEDdcMSr3qfa0T5tAFQj6S8e7/6AE3nyFkLVWqs9ynnmF184pTACaMAsFxWNYUyOpS2/QMeYs=@vger.kernel.org X-Gm-Message-State: AFuF++mRGTmgRsOkU2R0gitRSXnuBnJcldJRxi9VpMZzTvM+gikH6h+E 97NMLxWUx7na038YB24z3/eC4hAQTpGIM7dOg5BDx3J4CfcHG+IxzNvhr70sMBhekgsc/uQJS6j ZUbiL0+C3a3BmBX6qE+pcMwBuOqrBYds99xdTNJji6vtBBTWXkpn8gdHdO130WqPWpA== X-Gm-Gg: AR+sD126vBqTgpnBuLcz+x3r5OE/WtN9bFJrxFgevONZMhRbGo6PK9pVpRZlrFAB652 CTgR0CMcMIuTLSX2VJCfm8XJmhbKS9V67bm7oKiTnhK/LyAI2p13D/ArnIVNTP+L1Ld3nildgsw Jyy49RQ/bT8v4n7kjJpMs33Bag4CAaYMIJvarvMxT6NbET4bn+Y64gj6IBXi5bfaocRums2HrMH le4yyPmyo6mlhzgGOqSzs9PWdlR45n1VRRscUec8KrsTTf9prvutnjPNW0eJJ07TDzDp5DElc4C cQkyZiPxzIEY9EN6CIW/b+TKVLG+RxK6/sHfbfg7UVummHUT+cdjqi2sD9PSDOR6lMzhbQBSRt8 0umbobwUwhtawrlcyc0zmiHbhaea6AYaQ X-Received: by 2002:a17:90b:384d:b0:393:19a3:4e5 with SMTP id 98e67ed59e1d1-395c386a056mr10527508a91.16.1787320221494; Fri, 21 Aug 2026 06:50:21 -0700 (PDT) X-Received: by 2002:a17:90b:384d:b0:393:19a3:4e5 with SMTP id 98e67ed59e1d1-395c386a056mr10527444a91.16.1787320220942; Fri, 21 Aug 2026 06:50:20 -0700 (PDT) Received: from mpilaniy-mac.redhat.corp ([122.171.22.116]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-395c4c194d2sm3300502a91.15.2026.08.21.06.50.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 21 Aug 2026 06:50:20 -0700 (PDT) From: Mukesh Pilaniya Date: Fri, 21 Aug 2026 19:19:57 +0530 Subject: [PATCH v3 1/2] 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: 7bit Message-Id: <20260821-mpilaniy-v3-1-76b355399d2e@redhat.com> References: <20260821-mpilaniy-v3-0-76b355399d2e@redhat.com> In-Reply-To: <20260821-mpilaniy-v3-0-76b355399d2e@redhat.com> 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 , Bradley Morgan 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 Reviewed-by: Pratyush Yadav Reviewed-by: Bradley Morgan --- 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_image.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); if (!h || (kernel_len < sizeof(*h))) - return -EINVAL; + return -ENOEXEC; if (memcmp(&h->magic, ARM64_IMAGE_MAGIC, sizeof(h->magic))) - return -EINVAL; + return -ENOEXEC; return 0; } diff --git a/arch/loongarch/kernel/kexec_efi.c b/arch/loongarch/kernel/kexec_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, unsigned long kernel_len) if (!h || (kernel_len < sizeof(*h))) { kexec_dprintk("No LoongArch image header.\n"); - return -EINVAL; + return -ENOEXEC; } if (!loongarch_header_check_dos_sig(h)) { kexec_dprintk("No LoongArch PE image header.\n"); - return -EINVAL; + return -ENOEXEC; } return 0; diff --git a/arch/riscv/kernel/kexec_image.c b/arch/riscv/kernel/kexec_image.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 long kernel_len) const struct riscv_image_header *h = (const struct riscv_image_header *)kernel_buf; if (!h || kernel_len < sizeof(*h)) - return -EINVAL; + return -ENOEXEC; /* According to Documentation/arch/riscv/boot-image-header.rst, * use "magic2" field to check when version >= 0.2. @@ -28,7 +28,7 @@ static int image_probe(const char *kernel_buf, unsigned long kernel_len) if (h->version >= RISCV_HEADER_VERSION && memcmp(&h->magic2, RISCV_IMAGE_MAGIC2, sizeof(h->magic2))) - return -EINVAL; + return -ENOEXEC; 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, struct elfhdr *ehdr) default: pr_debug("Unknown ELF class.\n"); - return -EINVAL; + return -ENOEXEC; } return elf_is_ehdr_sane(ehdr, len) ? 0 : -ENOEXEC; @@ -236,7 +236,7 @@ static int elf_read_phdr(const char *buf, size_t len, default: pr_debug("Unknown ELF class.\n"); - return -EINVAL; + return -ENOEXEC; } return elf_is_phdr_sane(phdr, len) ? 0 : -ENOEXEC; -- Git-155)