From nobody Sun Feb 8 05:23:19 2026 Received: from mail-wm1-f42.google.com (mail-wm1-f42.google.com [209.85.128.42]) (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 AF50D20F063 for ; Thu, 6 Mar 2025 13:15:31 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.42 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741266933; cv=none; b=qpNMdECUJmYHPHDU2S4zuxxa65WCkjYVc7NYxoBaEnRyWHEMIOWJ2R+BGqmpEBWGYjbmkGJHPxFh3T4SXOvLOts6T7EEXqM3ZD28b038g/tv8SPP8C7/l0PgO43tfW2y/jUeuFemMt2UreRvi7wsz2+ZDWIIUmW/FaGkyXspQVE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741266933; c=relaxed/simple; bh=BvSlaG3rLjNuw2XDjvoJaB0XtiXWFz6skWwh3t2ohzk=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Tk3H5nCCTuO8igp6tErj+DmcpWLXenVreuTAGPfHUUV8a+Y5gqwoEAE7D0bM7BQBQnWnSYt+i5C7SSzXfHH0Rnr2hlEX+yq/EFlbaGj9C2zQhIG/s4gi9bhzoDSpyjjjOLHoPZ8Uyb4LslIVwrNGYWZjovVjReL+QefjpSyPJhI= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=suse.com; spf=pass smtp.mailfrom=suse.com; dkim=pass (2048-bit key) header.d=suse.com header.i=@suse.com header.b=OvORDHt+; arc=none smtp.client-ip=209.85.128.42 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=suse.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=suse.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=suse.com header.i=@suse.com header.b="OvORDHt+" Received: by mail-wm1-f42.google.com with SMTP id 5b1f17b1804b1-4393dc02b78so3976505e9.3 for ; Thu, 06 Mar 2025 05:15:31 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=google; t=1741266930; x=1741871730; 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=Pj78PG0pp5n8PTZUVZot4fU7c++ftFca2ezsst8qrio=; b=OvORDHt+NMLiOA+Iolz2wGqz+F4SlpHLd88MJytIqHdLfYYUzFL1FHQEnbdfe0DR+T aJYDJcZq5Xu3a31EuLHW/TsVz0VxJzF3tOveXIL4x7hnIZgy6XoY1bKH4kEJ+0fyTwrL q0P54ei19rJkc5tZgg5W2Th822C1/TjXoZf+u37ASa1D9LZRZTETzFUygTxNOPtrnnvF yL9+9mTT36rPDToP6e9ryvC/Smk2OZ0erN1SauT5WY560NSp5dcHMUzlDGGmUx8EUNlo ydszgzldoB7Z1CBjlaRbo3ltfkkGplru1mdc2Y4Aof+/925O+VRuLvQENco4dT4MZKd2 elqA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741266930; x=1741871730; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Pj78PG0pp5n8PTZUVZot4fU7c++ftFca2ezsst8qrio=; b=mXMbhA1j5+NYIQndiWV8HT/VuudngbZphQugZ57I6ORluZwwEA8dyPfFaB5FKXxdE5 9/edB1nwcrS0FUwWgNGcoJX4I39n/hFSTCSIa7olLWQH9nDZ9Apz7BdQIeZpl1UCpTZX wDb4n8KUVwizFpXkR8VO0w2JiHW+jt3b0+g3GWgTTDAUFpbNroT4bIKp5zLJzuVVqgAT ik5tuqTFHbH34l/AysfQgecXMaT1ZxvE2Pk8d6G3/eDfD2vzu2pC/p3TiqHwZ3BgMi3x WvsbYuyR0o0amBWoV5eJobH8REv3YTve7fBEO+KYxIoOx9Gchr7DcD5jChqXHGs3MChP MjzQ== X-Forwarded-Encrypted: i=1; AJvYcCX/NFe7v5TrHbRQGC8qY30AnJbnNw1zNV0q9OzG3dX/06f/wgaxTXrdUttcyjAMdJToFsseAN/sRuv8jR8=@vger.kernel.org X-Gm-Message-State: AOJu0YzKDPZmH11tUqtwAf46gEgvnaOPrrc69V+aC7rlX0IN7llC5Gtn UV46LJLzoUUBMHL8pEcqBXiUkLD9uqPBXHWJ9iY2fyP481uWb2sDJsF4/xiDmog= X-Gm-Gg: ASbGnct+L89UVuNvVQGVNh34ui9Z3Ai+whs5M8ZOwsTMo7nZKrSvc1TQnMp355MmbVA C0wJJwT/Xcj6tNGMvjljo4xFjeAWWwQJZL9jcEN7Fny5GJRSNgQ6Fj6+ngIYmpU5ThTtn62W8fv KgV0wwVmRqNzbM9zAVp9YRrGdQDyUMvw2oyiUciM2yDBbycx1UOAyvKTLuTcm1BG+iVs/UjXJmg 9U88mLiFBBt/3vwYe9ZreHi8OAMAG2GNqRNJTRzEoPv+9SsY4oCpwCQ7MweN+dXFf4vW/dTWAlY sbH+pluysmJu+SUzNIOeULtcGvySuh4zs0tRkEg1E07oadqk X-Google-Smtp-Source: AGHT+IFr54SyRcHfD64GHzzREo8VdfNOB246KLkodyLGDvF849R5Dk9GM2hPiS0mwZXhRJQCfmy98g== X-Received: by 2002:a05:600c:1d02:b0:439:91dd:cfa3 with SMTP id 5b1f17b1804b1-43bd29d8db3mr54480605e9.29.1741266929975; Thu, 06 Mar 2025 05:15:29 -0800 (PST) Received: from dhcp161.suse.cz ([193.86.92.181]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-43bdd8c327fsm19704485e9.13.2025.03.06.05.15.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 06 Mar 2025 05:15:29 -0800 (PST) From: Petr Pavlu To: Luis Chamberlain , Petr Pavlu , Peter Zijlstra , Josh Poimboeuf , Jason Baron Cc: Sami Tolvanen , Daniel Gomez , Steven Rostedt , Ard Biesheuvel , Christophe Leroy , linux-modules@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v2 1/3] module: Constify parameters of module_enforce_rwx_sections() Date: Thu, 6 Mar 2025 14:13:52 +0100 Message-ID: <20250306131430.7016-2-petr.pavlu@suse.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250306131430.7016-1-petr.pavlu@suse.com> References: <20250306131430.7016-1-petr.pavlu@suse.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Minor cleanup, this is a non-functional change. Signed-off-by: Petr Pavlu Reviewed-by: Luis Chamberlain --- kernel/module/internal.h | 5 +++-- kernel/module/strict_rwx.c | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/kernel/module/internal.h b/kernel/module/internal.h index d09b46ef032f..18f32e791db0 100644 --- a/kernel/module/internal.h +++ b/kernel/module/internal.h @@ -333,8 +333,9 @@ int module_enable_rodata_ro(const struct module *mod); int module_enable_rodata_ro_after_init(const struct module *mod); int module_enable_data_nx(const struct module *mod); int module_enable_text_rox(const struct module *mod); -int module_enforce_rwx_sections(Elf_Ehdr *hdr, Elf_Shdr *sechdrs, - char *secstrings, struct module *mod); +int module_enforce_rwx_sections(const Elf_Ehdr *hdr, const Elf_Shdr *sechd= rs, + const char *secstrings, + const struct module *mod); =20 #ifdef CONFIG_MODULE_SIG int module_sig_check(struct load_info *info, int flags); diff --git a/kernel/module/strict_rwx.c b/kernel/module/strict_rwx.c index 74834ba15615..81278e687055 100644 --- a/kernel/module/strict_rwx.c +++ b/kernel/module/strict_rwx.c @@ -86,8 +86,9 @@ int module_enable_data_nx(const struct module *mod) return 0; } =20 -int module_enforce_rwx_sections(Elf_Ehdr *hdr, Elf_Shdr *sechdrs, - char *secstrings, struct module *mod) +int module_enforce_rwx_sections(const Elf_Ehdr *hdr, const Elf_Shdr *sechd= rs, + const char *secstrings, + const struct module *mod) { const unsigned long shf_wx =3D SHF_WRITE | SHF_EXECINSTR; int i; --=20 2.43.0 From nobody Sun Feb 8 05:23:19 2026 Received: from mail-wr1-f41.google.com (mail-wr1-f41.google.com [209.85.221.41]) (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 510DC20F08F for ; Thu, 6 Mar 2025 13:15:34 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.221.41 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741266936; cv=none; b=ZbUfr/SF2Go0Biy4qNm2j1kV1K5fjAjFxKFY7QGde6R418FsP5sg3m6Py+4jRukZOpMSlfhTn+wdeQXYQYPtECWB4KZk5p/2E2gu1jeTa95nE9y59LcdyF706LZnsNU/6CS9XlHMIKkVvrPmo75+S66ncfdALDoGtcPhPEOJ0ew= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741266936; c=relaxed/simple; bh=0tGSJ2zcfBUxZkyVy6Lyn8LU+JSKx/WFyTwadsmy5nY=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=HwHmH2zimtf0c/oOoTg4QSzKlKdJsnEy76vAwlrYrvrEF4YwLNtKJXdicZRwICY9pJ5gjCdQ6xfSlNLnFIygkywCsU4X+jRsSLs3TclmnO5+sKJe/bWES+a3zEWanCOtRofxtaK1hSD6dlhk2/x/mpgPHrnG22rQftluFDwihwQ= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=suse.com; spf=pass smtp.mailfrom=suse.com; dkim=pass (2048-bit key) header.d=suse.com header.i=@suse.com header.b=PLO2JKdQ; arc=none smtp.client-ip=209.85.221.41 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=suse.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=suse.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=suse.com header.i=@suse.com header.b="PLO2JKdQ" Received: by mail-wr1-f41.google.com with SMTP id ffacd0b85a97d-3912c09bea5so492245f8f.1 for ; Thu, 06 Mar 2025 05:15:34 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=google; t=1741266932; x=1741871732; 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=qz4XRTq2wHtyfxO9Iu3bx9YuJ/6rqBX5vJIg6Ki8YEc=; b=PLO2JKdQv8xHHNAxPqDJZ1qOmIsmGdiKTFD10pGaXcG77RCl/DkLJNZcCimed9BO6c HbYLWTyBF2N0bJXKPWLvmbuz0Zxx2qoTbGXItMyCJhxQr0hhVCygk0TemIY3v3d20gwk AwV/Y1QdDLYXElT6EnwCwZD6y1vB/s7wJta/WNOniEV4uomcytWlYtCLNx06Pj7u1gZa nFUtIhSrnBgDUpejuasxw14UOgRpiR1FedJ1i+DQ4bhpScWjpYrDwAwRi8k+f7ltWAt5 nm0s4mMmN3IsRYP6SeXMPimVb+YD0MgL6HJgLV6KSIyd94fNJaWN5wDAnSeDXqny/Mi9 385Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741266932; x=1741871732; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=qz4XRTq2wHtyfxO9Iu3bx9YuJ/6rqBX5vJIg6Ki8YEc=; b=T4jWEpKuu72zQ8SToKYVDkXxUG9TxmywLpDEiILXutJYuJM1b+2AexCDYldDpKFWLP k38KRO8Biaj64nCeTlVYe3ueF9+LmAa+32o784s+Mv4GDVEKHKcCh5DKORiCmsMogZFg NjH+MPSHNBq+bEKUI3vkcngBNKYFgrsm9+iGvjSFvOR1gymqF2QJULydvR2yUlVDC0FK OLqOewmdx79IQpIFC4/8S/LDWFmMBvd9LhmVy0TYljDva4zTZpfkKiV5R6zEKT7e1aeY qibhDrpevClTfbWyxR7WpGCniDOl6ygAwi1/E9QjFHUHLHacIhyAmhg7l2DKz/Z4swWQ z6UA== X-Forwarded-Encrypted: i=1; AJvYcCVGoiqZnOgvXg2pQUgWwQ/VwgnbXyPLQPf3PFwq8KSw7NSkS8Dz/CB47sNFbRP9sLmo10xz95nR4QWqFdQ=@vger.kernel.org X-Gm-Message-State: AOJu0YyVK+aDYN1GF7Cnl3bEkEEUcvR61GTBnwr+4S2HeNvPeh32gSE1 9APCnk2DJMegtMBgxOU9YNuk3t/APOTI82N6br3e+gonWx/fmLvDIvEJzocNnFQ= X-Gm-Gg: ASbGncusUFb/ohOnFAke321YGfqg6QfVYbCpjkv4xsgZWN/Mtu3R+iy003Ml0F8HyDD 6sXXr3HNbaDt7/VvbkG5X4tZgVQ9Y2a2GOPTAnTC0jfugpLcozVlTUlgpxd7yOKBUshWQVpSbFf mh7opvDWRZ3d5CuXF9bowqDMzLWHx7Io+kVqTQIYMGbd76sd+N3fYUJp0OcGNTVn//JJiK+/SId Dc5fHDnEa+MI+ten5UxQyqf3meDWb3cxJia+vH0/w2kHmpFI+xSIkbubQn63NkxNQ7ML3fdYLOb B8hJYyNb3QiTmDEZMfM9srD/SAB782QVbi5kpp7UsF6HFAKq X-Google-Smtp-Source: AGHT+IHqVig/PZTsgpubptGowxDPhYadgbR/BUVqM7eADw/KYZQQ9lMGwoFbn+PLE/hr3mMmnwG7GQ== X-Received: by 2002:a5d:6d07:0:b0:38f:3224:660b with SMTP id ffacd0b85a97d-3911f7377fdmr5718510f8f.22.1741266932519; Thu, 06 Mar 2025 05:15:32 -0800 (PST) Received: from dhcp161.suse.cz ([193.86.92.181]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-43bdd8c327fsm19704485e9.13.2025.03.06.05.15.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 06 Mar 2025 05:15:30 -0800 (PST) From: Petr Pavlu To: Luis Chamberlain , Petr Pavlu , Peter Zijlstra , Josh Poimboeuf , Jason Baron Cc: Sami Tolvanen , Daniel Gomez , Steven Rostedt , Ard Biesheuvel , Christophe Leroy , linux-modules@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v2 2/3] module: Add a separate function to mark sections as read-only after init Date: Thu, 6 Mar 2025 14:13:53 +0100 Message-ID: <20250306131430.7016-3-petr.pavlu@suse.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250306131430.7016-1-petr.pavlu@suse.com> References: <20250306131430.7016-1-petr.pavlu@suse.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Move the logic to mark special sections as read-only after module initialization into a separate function, along other related code in strict_rwx.c. Use a table with names of such sections to make it easier to add more. Signed-off-by: Petr Pavlu Reviewed-by: Luis Chamberlain --- kernel/module/internal.h | 2 ++ kernel/module/main.c | 18 +++--------------- kernel/module/strict_rwx.c | 33 +++++++++++++++++++++++++++++++++ 3 files changed, 38 insertions(+), 15 deletions(-) diff --git a/kernel/module/internal.h b/kernel/module/internal.h index 18f32e791db0..7cd250ad1b51 100644 --- a/kernel/module/internal.h +++ b/kernel/module/internal.h @@ -336,6 +336,8 @@ int module_enable_text_rox(const struct module *mod); int module_enforce_rwx_sections(const Elf_Ehdr *hdr, const Elf_Shdr *sechd= rs, const char *secstrings, const struct module *mod); +void module_mark_ro_after_init(const Elf_Ehdr *hdr, Elf_Shdr *sechdrs, + const char *secstrings); =20 #ifdef CONFIG_MODULE_SIG int module_sig_check(struct load_info *info, int flags); diff --git a/kernel/module/main.c b/kernel/module/main.c index 1fb9ad289a6f..e66d501d1209 100644 --- a/kernel/module/main.c +++ b/kernel/module/main.c @@ -2791,7 +2791,6 @@ core_param(module_blacklist, module_blacklist, charp,= 0400); static struct module *layout_and_allocate(struct load_info *info, int flag= s) { struct module *mod; - unsigned int ndx; int err; =20 /* Allow arches to frob section contents and sizes. */ @@ -2809,22 +2808,11 @@ static struct module *layout_and_allocate(struct lo= ad_info *info, int flags) info->sechdrs[info->index.pcpu].sh_flags &=3D ~(unsigned long)SHF_ALLOC; =20 /* - * Mark ro_after_init section with SHF_RO_AFTER_INIT so that - * layout_sections() can put it in the right place. + * Mark relevant sections as SHF_RO_AFTER_INIT so layout_sections() can + * put them in the right place. * Note: ro_after_init sections also have SHF_{WRITE,ALLOC} set. */ - ndx =3D find_sec(info, ".data..ro_after_init"); - if (ndx) - info->sechdrs[ndx].sh_flags |=3D SHF_RO_AFTER_INIT; - /* - * Mark the __jump_table section as ro_after_init as well: these data - * structures are never modified, with the exception of entries that - * refer to code in the __init section, which are annotated as such - * at module load time. - */ - ndx =3D find_sec(info, "__jump_table"); - if (ndx) - info->sechdrs[ndx].sh_flags |=3D SHF_RO_AFTER_INIT; + module_mark_ro_after_init(info->hdr, info->sechdrs, info->secstrings); =20 /* * Determine total sizes, and put offsets in sh_entsize. For now diff --git a/kernel/module/strict_rwx.c b/kernel/module/strict_rwx.c index 81278e687055..fa701dad4ed1 100644 --- a/kernel/module/strict_rwx.c +++ b/kernel/module/strict_rwx.c @@ -106,3 +106,36 @@ int module_enforce_rwx_sections(const Elf_Ehdr *hdr, c= onst Elf_Shdr *sechdrs, =20 return 0; } + +static const char *const ro_after_init[] =3D { + /* + * Section .data..ro_after_init holds data explicitly annotated by + * __ro_after_init. + */ + ".data..ro_after_init", + + /* + * Section __jump_table holds data structures that are never modified, + * with the exception of entries that refer to code in the __init + * section, which are marked as such at module load time. + */ + "__jump_table", +}; + +void module_mark_ro_after_init(const Elf_Ehdr *hdr, Elf_Shdr *sechdrs, + const char *secstrings) +{ + int i, j; + + for (i =3D 1; i < hdr->e_shnum; i++) { + Elf_Shdr *shdr =3D &sechdrs[i]; + + for (j =3D 0; j < ARRAY_SIZE(ro_after_init); j++) { + if (strcmp(secstrings + shdr->sh_name, + ro_after_init[j]) =3D=3D 0) { + shdr->sh_flags |=3D SHF_RO_AFTER_INIT; + break; + } + } + } +} --=20 2.43.0 From nobody Sun Feb 8 05:23:19 2026 Received: from mail-wm1-f51.google.com (mail-wm1-f51.google.com [209.85.128.51]) (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 3A7BA20FA99 for ; Thu, 6 Mar 2025 13:15:34 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.51 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741266937; cv=none; b=A3GjsNJJKD7ZuuJmzrH8uzaYOjoTm9cTuECXBVxZOtJuqJfki2fyJQ0KeJPkwgP9ljoTVEOUTP3IXvvShhObaGeMngW/dvmSSFodyBfW0T78LnFdU7yrqWyUWn2i9o0nhzr2rvba1pAeZG2cEINvxK9BBC6nJDKCTlN1Q6ehVWE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741266937; c=relaxed/simple; bh=sqdytAodsHq9QNCvtIZ+Zn5N0QYNPXaH3EIcLQ+sw0Y=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=NYZuRP23zR29x5D7yBgFXhqMF8PIn14nn9Ur+Wyc2Y4jdvpA6FeDCOMw3DsAkdUpX3YF49/ZgYa7Z10Eg+kCIonEXihQW1q7Nf7xP/atfIJChdYjX+wxb0iq+lpfELsYO4mde5OwtkN77qqG2q+7wemvxsyh9x7lPi2k+8B7hEE= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=suse.com; spf=pass smtp.mailfrom=suse.com; dkim=pass (2048-bit key) header.d=suse.com header.i=@suse.com header.b=LgpclZZj; arc=none smtp.client-ip=209.85.128.51 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=suse.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=suse.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=suse.com header.i=@suse.com header.b="LgpclZZj" Received: by mail-wm1-f51.google.com with SMTP id 5b1f17b1804b1-4394036c0efso3725995e9.2 for ; Thu, 06 Mar 2025 05:15:34 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=google; t=1741266933; x=1741871733; 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=2F56/bXpgvW/PQd4WvaaCrrA3/3M+CJr+Y5MI4QmHaE=; b=LgpclZZj3U0fINsuUb75w886HF7sCDLRA8wccWhTlLz++4I+gh61laBhNJlzfGhyVj dnXyn2rAHluoFTus9o+30f/JaoTBE+CoZqFMDBQTkDAqJTfjqAUJq/q9d2az1u1QqMx2 xvbwAS6+tOGPxwh+/PbwlV2MkQWY1Zm51HC3m31Cj6snBoCxd8vLxRm4WduMNHoiWa/S O7flxjnMSZLyKbTw62nsLP9/QTrY/TyrViNioznuVqp1rrp4Oo7Y1nsaz0LCIF3udDAM i/HDxR8c0pOrdViAgJUPfLAXIjLhpJhfRRm0By6bS65QsS4a0Nq4DDzSA6Szjj9saQ3P 80WQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741266933; x=1741871733; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=2F56/bXpgvW/PQd4WvaaCrrA3/3M+CJr+Y5MI4QmHaE=; b=UIjp7KhMKqlMr1RjNaa3V06kFhbSkmK1fdxvuCgOB3o1ZAqjMSWAASL332Kss9fvqM mOoJnEoKQkO7w1JMXk6/1mDGmm9ashT+K9LRAdIBl+67qZLnRbRyuktk+pgSNHx9sULh U+oeis5XG7Fw+NlBKnjSCA4KcpLktWhUdQYXkDKpQMuD6Y8qE41eVLgg3IKJlyVq0fK7 /aIcE9iVMaMAIGQcc+nPskUan6eA+g6ckAUPvUyqD78y5axsVexxOwJEJQ4+YkljbJzQ d8JZPp1R9Fz+T/KJNbbif9VY5uVLUEpr+qsXPav0lo1Cl0bpNG5mXD9rSvZ7CzEQg6xm Rvcg== X-Forwarded-Encrypted: i=1; AJvYcCVvQ8ckGvvdcrHYGKpOPWKx4ptt1Ozg87q6XTrF1a6fHeiY6bbDE03YQqOh5LScIZW0XCyEc+yddW6P6VY=@vger.kernel.org X-Gm-Message-State: AOJu0YzH9ASnn8JCFg6x7jaqQXPdjpJSdUWNHEiSEOoGverLRqJh3IHQ miZSTylwBsSUvP1GRoUPwYO8A/8dnsPzkusI/8yUU/hz1d5LXwQQcOt67n9X0WQ= X-Gm-Gg: ASbGncuin5Xr4b1KIuLpIiny0zlsy+GOkc9tF2MEP1IdOOTFHb6IADEruwRXvxF36t5 xPWQDiOCmKRXCWohdIqCqXv/7I4nIfL4PgJWnpRwhXiranuE+vFW7r005geJfFb+NlROCt6FgCF kRVoKV9xQ4U9LxohtpuCatpJNllkUBMcZ9xNquKrFMtwjnmRCTnlvanA0fc5zzcWzmC4u8Y3Jkw UuwX6LPQN36xY2U7FNAWlPZN7V/ioiuN5DtGTXOiva6/HZJjYTo8pTSP0vqi9nICBcFI35UgXO4 yogiIjytw3fjbEcaaq1sfai1B+r1az8cf3me5ruJwZx9hCBl X-Google-Smtp-Source: AGHT+IHOyulRWsRbaL8sagZbBUzdBihh8XWqd70FOnBN7LQrsvkLlJuS76NdiPbsbr5xA7z7M3wvvQ== X-Received: by 2002:a05:600c:1c29:b0:43b:c94d:e200 with SMTP id 5b1f17b1804b1-43bd2929948mr46520145e9.1.1741266933457; Thu, 06 Mar 2025 05:15:33 -0800 (PST) Received: from dhcp161.suse.cz ([193.86.92.181]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-43bdd8c327fsm19704485e9.13.2025.03.06.05.15.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 06 Mar 2025 05:15:32 -0800 (PST) From: Petr Pavlu To: Luis Chamberlain , Petr Pavlu , Peter Zijlstra , Josh Poimboeuf , Jason Baron Cc: Sami Tolvanen , Daniel Gomez , Steven Rostedt , Ard Biesheuvel , Christophe Leroy , linux-modules@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v2 3/3] module: Make .static_call_sites read-only after init Date: Thu, 6 Mar 2025 14:13:54 +0100 Message-ID: <20250306131430.7016-4-petr.pavlu@suse.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250306131430.7016-1-petr.pavlu@suse.com> References: <20250306131430.7016-1-petr.pavlu@suse.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Section .static_call_sites holds data structures that need to be sorted and processed only at module load time. This initial processing happens in static_call_add_module(), which is invoked as a callback to the MODULE_STATE_COMING notification from prepare_coming_module(). The section is never modified afterwards. Make it therefore read-only after module initialization to avoid any (non-)accidental modifications. Signed-off-by: Petr Pavlu Reviewed-by: Luis Chamberlain Reviewed-by: Sami Tolvanen --- kernel/module/strict_rwx.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/kernel/module/strict_rwx.c b/kernel/module/strict_rwx.c index fa701dad4ed1..a3fc8d603750 100644 --- a/kernel/module/strict_rwx.c +++ b/kernel/module/strict_rwx.c @@ -120,6 +120,15 @@ static const char *const ro_after_init[] =3D { * section, which are marked as such at module load time. */ "__jump_table", + +#ifdef CONFIG_HAVE_STATIC_CALL_INLINE + /* + * Section .static_call_sites holds data structures that need to be + * sorted and processed at module load time but are never modified + * afterwards. + */ + ".static_call_sites", +#endif }; =20 void module_mark_ro_after_init(const Elf_Ehdr *hdr, Elf_Shdr *sechdrs, --=20 2.43.0