From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pg1-f182.google.com (mail-pg1-f182.google.com [209.85.215.182]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 78E4133F59E for ; Tue, 28 Apr 2026 04:02:30 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.215.182 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777348951; cv=none; b=sT7OeEtXjwNgztPqNQmPdJ5j3wb69WHGBrFDtkNY6wU/x31j/oQrwOpJlli63N7y1nvuZaM43M+sirqu9W0h56oitNbKolYbDhjaf5nzBMMYxti+pzNzDcCTP7Vhhmx/EzunzVNSon8ZCgw1dFHH4XuhX0UHG2Nj6Sfgo+DTRzs= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777348951; c=relaxed/simple; bh=BBDy81e7f+H5HTwVt9xBxcupTBb51CUnDJ6rTPApRes=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=VkLC1VrNeSAgqK8YampUVC9L5q+993Be+gBBdNDpsTlCWXqY/X4Ud+seS0bjb1V2UQufvwt4JYP73TFJFwK+kfaWHTQPjoBxvf+3/eJQiSDRu3OtXikyz5NDHSDM75gnXw7KrPRjqaPvB1iSTcvblx809x1dFo8hRwydy9JVE+A= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=hev.cc; spf=pass smtp.mailfrom=hev.cc; dkim=pass (2048-bit key) header.d=hev-cc.20251104.gappssmtp.com header.i=@hev-cc.20251104.gappssmtp.com header.b=BH2YVVrp; arc=none smtp.client-ip=209.85.215.182 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=hev.cc Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=hev.cc Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=hev-cc.20251104.gappssmtp.com header.i=@hev-cc.20251104.gappssmtp.com header.b="BH2YVVrp" Received: by mail-pg1-f182.google.com with SMTP id 41be03b00d2f7-c7971d0d97dso6617142a12.1 for ; Mon, 27 Apr 2026 21:02:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=hev-cc.20251104.gappssmtp.com; s=20251104; t=1777348950; x=1777953750; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=6+xcb2ORv56/m7G9kcRuXp28eD7jaH11XygDbCbx8JY=; b=BH2YVVrpEXR3v8Mazm3oOXPjq0L2ORzpZeVX8/E6hLlUZ0SR00N3b7FncH6YsbLSbx dnEBvHHkaNAUIUwSqzGYjlSrD32ZAygWSD0pIy5uj0UuWQ+z/gCm+e+ux/nI/SRfZpsK G6oUxMc/6V2/C/SQaodMNG6NWHdP05P3SHfH8WMlbUXGeW7fbppSb0/GDcBuSDDAvKh+ 2b56B9xdLDUXXUN0iiceH6QE/8GRWv8U6uGVM3+qwNORnCVsfH4bGUQx103Tq8wanvjB 70eudLLlbw1sGMv7NqRtx9BW8dH4NdQvrqYKEPbAcC00iwJTc1u+D265q6vhIgMrDz/g DHaw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1777348950; x=1777953750; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=6+xcb2ORv56/m7G9kcRuXp28eD7jaH11XygDbCbx8JY=; b=nwuQxdFzp2RBWpJ3Fh4eZwu4lrXTxSAzG1hBnxGmdzsyHnE1+E47GPyRpO3roTX7hg /QDPJB2VpsZpF9unDhC2avaaE+69ooTNGfWmke5sT6K3fQ2SPiDaRK0nlyHclGqGSoBf T3FKtM/8keGpl/+TZ0FHfmw/S5ijnJJoVGU9LpaCKzr9280TRajQX83jqvzkRBKNlCpr /3veSIfwkK73kbMkNHxxr7FN5HROb4mrepUAIV3gBuyH4XBOoVUQTkr05pUxDEOopzq5 2kCvd/tQ//H0C6ujFwV+0IFYbutk7alyWX7VwndjUAeUsE2dw4uOYb+IPNaBZKDJm/Qb LoGA== X-Forwarded-Encrypted: i=1; AFNElJ9Dkcsbof0hgEfHoD55bdcT5CywRdxf+KEAX7XkEJQ9VjslBWbsiiv2gstpSutA+azPQr9eFWLdrETIC14=@vger.kernel.org X-Gm-Message-State: AOJu0YyelnIXZQoOuFL3q2mmRoDWgMXuU+tqovhb21WQLTrwg+WDAHoC ABaNsgAwth8c44EVuiOB2uMAWxPJifoHzMosKaJ4yYyYPix14RvQb3SJsHMKNG14C3k= X-Gm-Gg: AeBDies33Xl/U0VQbBVSEp1CE0Vpeu/3WmjJv4UCcRNJ1+l12AGc7YIdb2TNeLaktAA y1cgYS0ec5HI/kCaJ3txN0tg7DqN8ooCrmjH+scfTuKr4RamY3P31lHQX5iuXGJzc7zowGDuOzT cmKZc57cKKr9DGJ/oJ7XVuIWjIxdVrUK8rbCiMO0klJwhC3LoFauEFQ+dFb2ixqcJ3D5d89YZXf LPc7Ba1zZTU38E+myOwnAy9MPWhqZMtPQHmefe8fkopGlW2vhfAk1SSasEktOJgoabDq/8nGEsu lhDkeYvdkQMfxg+5sywMNk1tGExD47Ppi00q2CYT9tp1JZbJXuT81T33TPyNYlaBLchlEYcr56J J1sHDDHPtfEaV4FUp9LIC5nzwqsmDQDin4s+/lmJTpJRomroj/fEwN4r0bDTf1IscIYX5elFeWp 45K6UdvTh39AhlbZ11jQ== X-Received: by 2002:a17:903:1aa4:b0:2b9:7051:2c18 with SMTP id d9443c01a7336-2b97c039e5fmr13515095ad.0.1777348949793; Mon, 27 Apr 2026 21:02:29 -0700 (PDT) Received: from localhost ([2400:8902:e002:de33:3dbd:69cf:4a22:309]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2b97ac8cd29sm10131365ad.61.2026.04.27.21.02.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 27 Apr 2026 21:02:29 -0700 (PDT) From: WANG Rui To: Huacai Chen , Ard Biesheuvel Cc: WANG Xuerui , Ilias Apalodimas , Lisa Robinson , loongarch@lists.linux.dev, linux-efi@vger.kernel.org, linux-kernel@vger.kernel.org, WANG Rui Subject: [PATCH v2 1/2] efi/loongarch: Randomize kernel preferred address for KASLR Date: Tue, 28 Apr 2026 12:01:58 +0800 Message-ID: <20260428040159.1065822-2-r@hev.cc> X-Mailer: git-send-email 2.54.0 In-Reply-To: <20260428040159.1065822-1-r@hev.cc> References: <20260428040159.1065822-1-r@hev.cc> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Introduce efi_get_kimg_kaslr_address() to compute the preferred kernel image address dynamically when CONFIG_RANDOMIZE_BASE is enabled. The function derives a random offset using EFI-provided randomness combined with the timer value, and constrains it within CONFIG_RANDOMIZE_BASE_MAX_OFFSET. Update EFI_KIMG_PREFERRED_ADDRESS to call this helper so that the EFI stub can select a randomized load address when KASLR is active, while preserving the original base address behavior when KASLR is disabled or nokaslr is specified. Signed-off-by: WANG Rui --- arch/loongarch/Kconfig | 2 +- arch/loongarch/include/asm/efi.h | 4 +++- drivers/firmware/efi/libstub/loongarch.c | 16 ++++++++++++++++ 3 files changed, 20 insertions(+), 2 deletions(-) diff --git a/arch/loongarch/Kconfig b/arch/loongarch/Kconfig index 3b042dbb2c41..a5afb70f73d9 100644 --- a/arch/loongarch/Kconfig +++ b/arch/loongarch/Kconfig @@ -730,7 +730,7 @@ config RANDOMIZE_BASE config RANDOMIZE_BASE_MAX_OFFSET hex "Maximum KASLR offset" if EXPERT depends on RANDOMIZE_BASE - range 0x0 0x10000000 + range 0x20000 0x10000000 default "0x01000000" help When KASLR is active, this provides the maximum offset that will diff --git a/arch/loongarch/include/asm/efi.h b/arch/loongarch/include/asm/efi.h index eddc8e79b3fa..f831320efd41 100644 --- a/arch/loongarch/include/asm/efi.h +++ b/arch/loongarch/include/asm/efi.h @@ -30,6 +30,8 @@ static inline unsigned long efi_get_kimg_min_align(void) return SZ_2M; } -#define EFI_KIMG_PREFERRED_ADDRESS PHYSADDR(VMLINUX_LOAD_ADDRESS) +unsigned long efi_get_kimg_kaslr_address(void); + +#define EFI_KIMG_PREFERRED_ADDRESS efi_get_kimg_kaslr_address() #endif /* _ASM_LOONGARCH_EFI_H */ diff --git a/drivers/firmware/efi/libstub/loongarch.c b/drivers/firmware/efi/libstub/loongarch.c index 9825f5218137..c44be5d3dc04 100644 --- a/drivers/firmware/efi/libstub/loongarch.c +++ b/drivers/firmware/efi/libstub/loongarch.c @@ -38,6 +38,22 @@ static efi_status_t exit_boot_func(struct efi_boot_memmap *map, void *priv) return EFI_SUCCESS; } +unsigned long efi_get_kimg_kaslr_address(void) +{ + unsigned int random_offset = 0; + +#ifdef CONFIG_RANDOMIZE_BASE + if (!efi_nokaslr) { + efi_get_random_bytes(sizeof(random_offset), (u8 *)&random_offset); + random_offset ^= (random_get_entropy() << 16); + random_offset &= (CONFIG_RANDOMIZE_BASE_MAX_OFFSET - SZ_64K - 1); + random_offset = ALIGN(random_offset, SZ_64K) + SZ_64K; + } +#endif + + return PHYSADDR(VMLINUX_LOAD_ADDRESS) + random_offset; +} + unsigned long __weak kernel_entry_address(unsigned long kernel_addr, efi_loaded_image_t *image) { -- 2.54.0