From: Chukun Pan <amadeus@jmu.edu.cn>
Date: Wed, 4 Jun 2025 13:06:05 +0000 (+0800)
Subject: cryptodev-linux: fix sysctl warning for kernel 6.12
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F19100%2Fhead;p=thirdparty%2Fopenwrt.git

cryptodev-linux: fix sysctl warning for kernel 6.12

Fix sysctl warning when running kernel 6.12:

[    8.722212] sysctl table check failed: ioctl/(null) procname is null
[    8.728584] sysctl table check failed: ioctl/(null) No proc_handler

Signed-off-by: Chukun Pan <amadeus@jmu.edu.cn>
Link: https://github.com/openwrt/openwrt/pull/19100
Signed-off-by: Robert Marko <robimarko@gmail.com>
---

diff --git a/package/kernel/cryptodev-linux/patches/001-Fix-cryptodev_verbosity-sysctl-for-Linux-6.11-rc1.patch b/package/kernel/cryptodev-linux/patches/001-Fix-cryptodev_verbosity-sysctl-for-Linux-6.11-rc1.patch
new file mode 100644
index 00000000000..0bf0b637cfb
--- /dev/null
+++ b/package/kernel/cryptodev-linux/patches/001-Fix-cryptodev_verbosity-sysctl-for-Linux-6.11-rc1.patch
@@ -0,0 +1,37 @@
+From d481e9718ef2edd4e003d3618e7673507e9503bb Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Joan=20Bruguera=20Mic=C3=B3?= <joanbrugueram@gmail.com>
+Date: Fri, 19 Jul 2024 20:18:31 +0000
+Subject: [PATCH] Fix cryptodev_verbosity sysctl for Linux 6.11-rc1
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+There has been a long-running Linux kernel effort to get rid of the
+sentinels of `struct ctl_table`. In Linux 6.11 it has been completed,
+and registering a sysctl with a sentinel will fail with a dmesg error:
+
+> sysctl table check failed: ioctl/(null) procname is null
+> sysctl table check failed: ioctl/(null) No proc_handler
+
+Exclude the sentinels since that version.
+
+See also: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=f8a8b94d0698ccc56c44478169c91ca774540d9f
+          https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=9edbfe92a0a1355bae1e47c8f542ac0d39f19f8c
+
+Signed-off-by: Joan Bruguera Micó <joanbrugueram@gmail.com>
+---
+ ioctl.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+--- a/ioctl.c
++++ b/ioctl.c
+@@ -1239,7 +1239,9 @@ static struct ctl_table verbosity_ctl_di
+ 		.mode           = 0644,
+ 		.proc_handler   = proc_dointvec,
+ 	},
++#if (LINUX_VERSION_CODE < KERNEL_VERSION(6, 11, 0))
+ 	{},
++#endif
+ };
+ 
+ static struct ctl_table verbosity_ctl_root[] = {