Skip to contentSkip to conversation

sysctl: prepare core tables to point to netns variables

PATCH Applied Pavel Emelyanov 2 participants 2 messages Dec 7, 2007 – Dec 8, 2007

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

PATCH 2/3 sysctl: prepare core tables to point to netns variables

Some of ctl variables are going to be on the struct net. Here's the way to adjust the ->data pointer on the ctl_table-s to point on the right variable.

Since some pointers still point on the global variables, I keep turning the write bits off on such tables.

This looks to become a common procedure for net sysctls, so later parts of this code may migrate to some more generic place.

---

net/core/sysctl_net_core.c +7 -2
index 57a7ead..dc4cf7d 100644
@@ -167,8 +167,13 @@ static __net_init int sysctl_core_net_init(struct net *net)
 		if (tbl == NULL)
 			goto err_dup;
 
-		for (tmp = tbl; tmp->procname; tmp++)
-			tmp->mode &= ~0222;
+		for (tmp = tbl; tmp->procname; tmp++) {
+			if (tmp->data >= (void *)&init_net &&
+					tmp->data < (void *)(&init_net + 1))
+				tmp->data += (char *)net - (char *)&init_net;
+			else
+				tmp->mode &= ~0222;
+		}
 	}
 
 	net->sysctl_core_hdr = register_net_sysctl_table(net,
Signature · 1 line
1.5.3.4
maintainer Applied
#1 lore raw

From: Pavel Emelyanov <[email protected]>
Date: Fri, 07 Dec 2007 16:10:49 +0300

Quoted 4 lines

Some of ctl variables are going to be on the struct net. Here's the way to adjust the ->data pointer on the ctl_table-s to point on the right variable.

Quoted 8 lines

Since some pointers still point on the global variables, I keep turning the write bits off on such tables.

This looks to become a common procedure for net sysctls, so later parts of this code may migrate to some more generic place.

Applied, but please see if you can find a more pretty way to do this, thanks.