Skip to contentSkip to conversation

net: Fix use of proc_fs

PATCH Applied Yonatan Linik 2 participants 3 messages Dec 14, 2020 – Dec 15, 2020

Subsystems (5)
lore
Share & tools
lore
#0 lore raw

v2 cover net: Fix use of proc_fs

This patch fixes the failure of af_packet module initialization when CONFIG_PROC_FS=n.

The commit message itself has a pretty thorough explanation. I will just add that I made sure this fixes the problem, both by using socket from userspace and by looking at kernel logs.

This also fixes a similar error in tls_proc.c, found by Jakub Kicinski.

Yonatan Linik (1):
net: Fix use of proc_fs

 net/packet/af_packet.c | 2 ++
 net/tls/tls_proc.c     | 3 +++
 2 files changed, 5 insertions(+)

base-commit: bbf5c979011a099af5dc76498918ed7df445635b

Signature · 1 line
2.25.1
#1 lore raw

PATCH v2 1/1 net: Fix use of proc_fs

proc_fs was used, in af_packet, without a surrounding #ifdef, although there is no hard dependency on proc_fs. That caused the initialization of the af_packet module to fail when CONFIG_PROC_FS=n.

Specifically, proc_create_net() was used in af_packet.c, and when it fails, packet_net_init() returns -ENOMEM. It will always fail when the kernel is compiled without proc_fs, because, proc_create_net() for example always returns NULL.

The calling order that starts in af_packet.c is as follows:
packet_init()
register_pernet_subsys() register_pernet_operations() __register_pernet_operations()
ops_init()
ops->init() (packet_net_ops.init=packet_net_init()) proc_create_net()

It worked in the past because register_pernet_subsys()'s return value wasn't checked before this Commit 36096f2f4fa0 ("packet: Fix error path in packet_init.").
It always returned an error, but was not checked before, so everything was working even when CONFIG_PROC_FS=n.

The fix here is simply to add the necessary #ifdef.

This also fixes a similar error in tls_proc.c, that was found by Jakub Kicinski.

---
 net/packet/af_packet.c | 2 ++
 net/tls/tls_proc.c     | 3 +++
 2 files changed, 5 insertions(+)
net/packet/af_packet.c +2 -0
index 2b33e977a905..031f2b593720 100644
@@ -4612,9 +4612,11 @@ static int __net_init packet_net_init(struct net *net)
 	mutex_init(&net->packet.sklist_lock);
 	INIT_HLIST_HEAD(&net->packet.sklist);
 
+#ifdef CONFIG_PROC_FS
 	if (!proc_create_net("packet", 0, net->proc_net, &packet_seq_ops,
 			sizeof(struct seq_net_private)))
 		return -ENOMEM;
+#endif /* CONFIG_PROC_FS */
 
 	return 0;
 }
net/tls/tls_proc.c +3 -0
index 3a5dd1e07233..feeceb0e4cb4 100644
@@ -37,9 +37,12 @@ static int tls_statistics_seq_show(struct seq_file *seq, void *v)
 
 int __net_init tls_proc_init(struct net *net)
 {
+#ifdef CONFIG_PROC_FS
 	if (!proc_create_net_single("tls_stat", 0444, net->proc_net,
 				    tls_statistics_seq_show, NULL))
 		return -ENOMEM;
+#endif /* CONFIG_PROC_FS */
+
 	return 0;
 }
 
Signature · 1 line
2.25.1
maintainer Applied
#2 lore raw
Quoted 25 lines · On Mon, 14 Dec 2020 22:25:50 +0200 Yonatan Linik wrote:

proc_fs was used, in af_packet, without a surrounding #ifdef, although there is no hard dependency on proc_fs. That caused the initialization of the af_packet module to fail when CONFIG_PROC_FS=n.

Specifically, proc_create_net() was used in af_packet.c, and when it fails, packet_net_init() returns -ENOMEM. It will always fail when the kernel is compiled without proc_fs, because, proc_create_net() for example always returns NULL.

The calling order that starts in af_packet.c is as follows:
packet_init()
register_pernet_subsys() register_pernet_operations() __register_pernet_operations()
ops_init()
ops->init() (packet_net_ops.init=packet_net_init()) proc_create_net()

It worked in the past because register_pernet_subsys()'s return value wasn't checked before this Commit 36096f2f4fa0 ("packet: Fix error path in packet_init.").
It always returned an error, but was not checked before, so everything was working even when CONFIG_PROC_FS=n.

Quoted 6 lines

The fix here is simply to add the necessary #ifdef.

This also fixes a similar error in tls_proc.c, that was found by Jakub Kicinski.

Applied, and queued for stable, thanks!