Commit 90ddd39b authored Jan 15, 2026 by Yury Norov Committed by Andrew Morton Jan 31, 2026

kernel.h: move VERIFY_OCTAL_PERMISSIONS() to sysfs.h

The macro is related to sysfs, but is defined in kernel.h.  Move it to the
proper header, and unload the generic kernel.h.

Now that the macro is removed from kernel.h, linux/moduleparam.h is
decoupled, and kernel.h inclusion can be removed.

Link: https://lkml.kernel.org/r/20260116042510.241009-4-ynorov@nvidia.com


Signed-off-by: Yury Norov <ynorov@nvidia.com>
Acked-by: Randy Dunlap <rdunlap@infradead.org>
Tested-by: Randy Dunlap <rdunlap@infradead.org>
Reviewed-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Reviewed-by: Petr Pavlu <petr.pavlu@suse.com>
Acked-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Reviewed-by: Joel Fernandes <joelagnelf@nvidia.com>
Cc: Aaron Tomlin <atomlin@atomlin.com>
Cc: Andi Shyti <andi.shyti@linux.intel.com>
Cc: Christophe Leroy (CS GROUP) <chleroy@kernel.org>
Cc: Jani Nikula <jani.nikula@intel.com>
Cc: Steven Rostedt (Google) <rostedt@goodmis.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>

parent 25b66674

Documentation/filesystems/sysfs.rst

+1 −1

Original line number	Diff line number	Diff line
		@@ -120,7 +120,7 @@ is equivalent to doing::
		.store = store_foo,
		};

		Note as stated in include/linux/kernel.h "OTHER_WRITABLE? Generally
		Note as stated in include/linux/sysfs.h "OTHER_WRITABLE? Generally
		considered a bad idea." so trying to set a sysfs file writable for
		everyone will fail reverting to RO mode for "Others".

include/linux/kernel.h

+0 −12

Original line number	Diff line number	Diff line
		@@ -388,16 +388,4 @@ static inline void ftrace_dump(enum ftrace_dump_mode oops_dump_mode) { }
		# define REBUILD_DUE_TO_DYNAMIC_FTRACE
		#endif

		/* Permissions on a sysfs file: you didn't miss the 0 prefix did you? */
		#define VERIFY_OCTAL_PERMISSIONS(perms) \
		(BUILD_BUG_ON_ZERO((perms) < 0) + \
		BUILD_BUG_ON_ZERO((perms) > 0777) + \
		/* USER_READABLE >= GROUP_READABLE >= OTHER_READABLE */ \
		BUILD_BUG_ON_ZERO((((perms) >> 6) & 4) < (((perms) >> 3) & 4)) + \
		BUILD_BUG_ON_ZERO((((perms) >> 3) & 4) < ((perms) & 4)) + \
		/* USER_WRITABLE >= GROUP_WRITABLE */ \
		BUILD_BUG_ON_ZERO((((perms) >> 6) & 2) < (((perms) >> 3) & 2)) + \
		/* OTHER_WRITABLE? Generally considered a bad idea. */ \
		BUILD_BUG_ON_ZERO((perms) & 2) + \
		(perms))
		#endif

include/linux/moduleparam.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -8,7 +8,7 @@
		#include <linux/compiler.h>
		#include <linux/init.h>
		#include <linux/stringify.h>
		#include <linux/kernel.h>
		#include <linux/sysfs.h>
		#include <linux/types.h>

		/*

include/linux/sysfs.h

+13 −0

Original line number	Diff line number	Diff line
		@@ -808,4 +808,17 @@ static inline void sysfs_put(struct kernfs_node *kn)
		kernfs_put(kn);
		}

		/* Permissions on a sysfs file: you didn't miss the 0 prefix did you? */
		#define VERIFY_OCTAL_PERMISSIONS(perms) \
		(BUILD_BUG_ON_ZERO((perms) < 0) + \
		BUILD_BUG_ON_ZERO((perms) > 0777) + \
		/* USER_READABLE >= GROUP_READABLE >= OTHER_READABLE */ \
		BUILD_BUG_ON_ZERO((((perms) >> 6) & 4) < (((perms) >> 3) & 4)) + \
		BUILD_BUG_ON_ZERO((((perms) >> 3) & 4) < ((perms) & 4)) + \
		/* USER_WRITABLE >= GROUP_WRITABLE */ \
		BUILD_BUG_ON_ZERO((((perms) >> 6) & 2) < (((perms) >> 3) & 2)) + \
		/* OTHER_WRITABLE? Generally considered a bad idea. */ \
		BUILD_BUG_ON_ZERO((perms) & 2) + \
		(perms))

		#endif /* _SYSFS_H_ */