From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 16 Jul 2024 21:24:29 +0000 (-0700)
Subject: Merge tag 'sysctl-6.11-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/sysctl... 
X-Git-Url: https://repo.jachan.dev/J-linux.git/commitdiff_plain/f8a8b94d0698ccc56c44478169c91ca774540d9f

Merge tag 'sysctl-6.11-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/sysctl/sysctl

Pull sysctl updates from Joel Granados:

 - Remove "->procname == NULL" check when iterating through sysctl table
   arrays

   Removing sentinels in ctl_table arrays reduces the build time size
   and runtime memory consumed by ~64 bytes per array. With all
   ctl_table sentinels gone, the additional check for ->procname == NULL
   that worked in tandem with the ARRAY_SIZE to calculate the size of
   the ctl_table arrays is no longer needed and has been removed. The
   sysctl register functions now returns an error if a sentinel is used.

 - Preparation patches for sysctl constification

   Constifying ctl_table structs prevents the modification of
   proc_handler function pointers as they would reside in .rodata. The
   ctl_table arguments in sysctl utility functions are const qualified
   in preparation for a future treewide proc_handler argument
   constification commit.

 - Misc fixes

   Increase robustness of set_ownership by providing sane default
   ownership values in case the callee doesn't set them. Bound check
   proc_dou8vec_minmax to avoid loading buggy modules and give sysctl
   testing module a name to avoid compiler complaints.

* tag 'sysctl-6.11-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/sysctl/sysctl:
  sysctl: Warn on an empty procname element
  sysctl: Remove ctl_table sentinel code comments
  sysctl: Remove "child" sysctl code comments
  sysctl: Remove superfluous empty allocations from sysctl internals
  sysctl: Replace nr_entries with ctl_table_size in new_links
  sysctl: Remove check for sentinel element in ctl_table arrays
  mm profiling: Remove superfluous sentinel element from ctl_table
  locking: Remove superfluous sentinel element from kern_lockdep_table
  sysctl: Add module description to sysctl-testing
  sysctl: constify ctl_table arguments of utility function
  utsname: constify ctl_table arguments of utility function
  sysctl: move the extra1/2 boundary check of u8 to sysctl_check_table_array
  sysctl: always initialize i_uid/i_gid
---

f8a8b94d0698ccc56c44478169c91ca774540d9f
diff --cc lib/alloc_tag.c
index c347b8b72d78,7293cd54d1b1..81e5f9a70f22
--- a/lib/alloc_tag.c
+++ b/lib/alloc_tag.c
@@@ -239,20 -238,8 +239,19 @@@ static struct ctl_table memory_allocati
  #endif
  		.proc_handler	= proc_do_static_key,
  	},
- 	{ }
  };
  
 +static void __init sysctl_init(void)
 +{
 +	if (!mem_profiling_support)
 +		memory_allocation_profiling_sysctls[0].mode = 0444;
 +
 +	register_sysctl_init("vm", memory_allocation_profiling_sysctls);
 +}
 +#else /* CONFIG_SYSCTL */
 +static inline void sysctl_init(void) {}
 +#endif /* CONFIG_SYSCTL */
 +
  static int __init alloc_tag_init(void)
  {
  	const struct codetag_type_desc desc = {