net ipv4: Convert ipv4.ip_local_port_range to be per netns
Subsystems (9)
PATCH 1/1 net ipv4: Convert ipv4.ip_local_port_range to be per netns
- Move sysctl_local_ports from a global variable into struct netns_ipv4.
- Modify inet_get_local_port_range to take a struct net.
- Manually expand inet_get_local_range into ipv4_local_port_range because I do not know the struct net.
- Move the initialization of sysctl_local_ports into sysctl_net_ipv4.c:ipv4_sysctl_init_net from inet_connection_sock.c
--- drivers/infiniband/core/cma.c | 2 +- drivers/net/vxlan.c | 2 +- include/net/ip.h | 7 +---- include/net/netns/ipv4.h | 6 +++++ net/ipv4/inet_connection_sock.c | 20 +++++--------- net/ipv4/inet_hashtables.c | 2 +- net/ipv4/ping.c | 4 +-- net/ipv4/sysctl_net_ipv4.c | 57 ++++++++++++++++++++++++++------------- net/ipv4/udp.c | 2 +- net/sctp/socket.c | 2 +- security/selinux/hooks.c | 3 ++- 11 files changed, 61 insertions(+), 46 deletions(-)
drivers/infiniband/core/cma.c +1 -1
@@ -2302,7 +2302,7 @@ static int cma_alloc_any_port(struct idr *ps, struct rdma_id_private *id_priv)int low, high, remaining;unsigned int rover; -inet_get_local_port_range (&low, &high); +inet_get_local_port_range (&init_net, &low, &high); remaining = (high - low) +1 ; rover =net_random () % remaining + low; retry:
drivers/net/vxlan.c +1 -1
@@ -1501,7 +1501,7 @@ static void vxlan_setup(struct net_device *dev) vxlan->age_timer.function = vxlan_cleanup; vxlan->age_timer.data = (unsigned long ) vxlan; -inet_get_local_port_range (&low, &high); +inet_get_local_port_range (dev_net (net), &low, &high); vxlan->port_min = low; vxlan->port_max = high; vxlan->dst_port =htons (vxlan_port);
include/net/ip.h +1 -6
@@ -195,12 +195,7 @@ static inline u64 snmp_fold_field64(void __percpu *mib[], int offt, size_t syncp#endif extern int snmp_mib_init (void __percpu *ptr[2 ],size_t mibsize,size_t align);extern void snmp_mib_free (void __percpu *ptr[2 ]); - -extern struct local_ports { -seqlock_t lock; -int range[2 ]; -} sysctl_local_ports; -extern void inet_get_local_port_range (int *low,int *high); +extern void inet_get_local_port_range (struct net *net,int *low,int *high);extern unsigned long *sysctl_local_reserved_ports;static inline int inet_is_reserved_local_port (int port)
include/net/netns/ipv4.h +6 -0
@@ -15,6 +15,10 @@ struct fib_rules_ops;struct hlist_head ;struct fib_table ;struct sock ; +struct local_ports { +seqlock_t lock; +int range[2 ]; +};struct netns_ipv4 {#ifdef CONFIG_SYSCTL
@@ -62,6 +66,8 @@ struct netns_ipv4 {int sysctl_icmp_ratemask;int sysctl_icmp_errors_use_inbound_ifaddr; +struct local_ports sysctl_local_ports; +int sysctl_tcp_ecn;kgid_t sysctl_ping_group_range[2 ];
net/ipv4/inet_connection_sock.c +6 -14
@@ -29,27 +29,19 @@ const char inet_csk_timer_bug_msg[] = "inet_csk BUG: unknown timer value\n";EXPORT_SYMBOL (inet_csk_timer_bug_msg);#endif -/* -* This struct holds the first and last local port number. -*/ -struct local_ports sysctl_local_ports__read_mostly = { - .lock =__SEQLOCK_UNLOCKED (sysctl_local_ports.lock), - .range = {32768 ,61000 }, -}; -unsigned long *sysctl_local_reserved_ports;EXPORT_SYMBOL (sysctl_local_reserved_ports); -void inet_get_local_port_range (int *low,int *high) +void inet_get_local_port_range (struct net *net,int *low,int *high) {unsigned int seq;do { - seq =read_seqbegin (&sysctl_local_ports.lock); + seq =read_seqbegin (&net->ipv4.sysctl_local_ports.lock); - *low = sysctl_local_ports.range[0 ]; - *high = sysctl_local_ports.range[1 ]; - }while (read_seqretry (&sysctl_local_ports.lock, seq)); + *low = net->ipv4.sysctl_local_ports.range[0 ]; + *high = net->ipv4.sysctl_local_ports.range[1 ]; + }while (read_seqretry (&net->ipv4.sysctl_local_ports.lock, seq)); }EXPORT_SYMBOL (inet_get_local_port_range);
@@ -116,7 +108,7 @@ int inet_csk_get_port(struct sock *sk, unsigned short snum)int remaining, rover, low, high; again: -inet_get_local_port_range (&low, &high); +inet_get_local_port_range (net, &low, &high); remaining = (high - low) +1 ; smallest_rover = rover =net_random () % remaining + low;
net/ipv4/inet_hashtables.c +1 -1
@@ -494,7 +494,7 @@ int __inet_hash_connect(struct inet_timewait_death_row *death_row,u32 offset = hint + port_offset;struct inet_timewait_sock *tw =NULL ; -inet_get_local_port_range (&low, &high); +inet_get_local_port_range (net, &low, &high); remaining = (high - low) +1 ;local_bh_disable ();
net/ipv4/ping.c +2 -2
@@ -237,11 +237,11 @@ static void inet_get_ping_group_range_net(struct net *net, kgid_t *low,unsigned int seq;do { - seq =read_seqbegin (&sysctl_local_ports.lock); + seq =read_seqbegin (&net->ipv4.sysctl_local_ports.lock); *low = data[0 ]; *high = data[1 ]; - }while (read_seqretry (&sysctl_local_ports.lock, seq)); + }while (read_seqretry (&net->ipv4.sysctl_local_ports.lock, seq)); }
net/ipv4/sysctl_net_ipv4.c +39 -18
125 lines not on this page · raw message
net/ipv4/udp.c +1 -1
@@ -219,7 +219,7 @@ int udp_lib_get_port(struct sock *sk, unsigned short snum,unsigned short first, last;DECLARE_BITMAP (bitmap,PORTS_PER_CHAIN ); -inet_get_local_port_range (&low, &high); +inet_get_local_port_range (net, &low, &high); remaining = (high - low) +1 ; rand =net_random ();
net/sctp/socket.c +1 -1
@@ -5893,7 +5893,7 @@ static long sctp_get_port_local(struct sock *sk, union sctp_addr *addr)int low, high, remaining, index;unsigned int rover; -inet_get_local_port_range (&low, &high); +inet_get_local_port_range (sock_net (sk), &low, &high); remaining = (high - low) +1 ; rover =net_random () % remaining + low;
security/selinux/hooks.c +2 -1
@@ -3898,6 +3898,7 @@ static int selinux_socket_post_create(struct socket *sock, int family,static int selinux_socket_bind (struct socket *sock,struct sockaddr *address,int addrlen) {struct sock *sk = sock->sk; +struct net *net =sock_net (sk);u16 family;int err;
@@ -3934,7 +3935,7 @@ static int selinux_socket_bind(struct socket *sock, struct sockaddr *address, inif (snum) {int low, high; -inet_get_local_port_range (&low, &high); +inet_get_local_port_range (net, &low, &high);if (snum <max (PROT_SOCK , low) || snum > high) { err = sel_netport_sid(sk->sk_protocol,
Signature · 1 line
1.7.10.4
Quoted 10 lines · Eric W. Biederman
- Move
sysctl_local_portsfrom a global variable into structnetns_ipv4.
- Modifyinet_get_local_port_rangeto take a struct net.
- Manually expandinet_get_local_rangeintoipv4_local_port_rangebecause I do not know the struct net.
- Move the initialization ofsysctl_local_portsinto sysctl_net_ipv4.c:ipv4_sysctl_init_net frominet_connection_sock.cOriginally-by Samya <[email protected]>Signed-off-by "Eric W. Biederman" <[email protected]>
Two minor comments, please see below.
After that: Acked-by: Nicolas Dichtel <[email protected]>
Quoted 214 lines
--- drivers/infiniband/core/cma.c | 2 +- drivers/net/vxlan.c | 2 +- include/net/ip.h | 7 +---- include/net/netns/ipv4.h | 6 +++++ net/ipv4/inet_connection_sock.c | 20 +++++--------- net/ipv4/inet_hashtables.c | 2 +- net/ipv4/ping.c | 4 +-- net/ipv4/sysctl_net_ipv4.c | 57 ++++++++++++++++++++++++++------------- net/ipv4/udp.c | 2 +- net/sctp/socket.c | 2 +- security/selinux/hooks.c | 3 ++- 11 files changed, 61 insertions(+), 46 deletions(-)drivers/infiniband/core/cma.c +1
-1@@ -2302,7 +2302,7 @@ static int cma_alloc_any_port(struct idr *ps, struct rdma_id_private *id_priv)int low, high, remaining;unsigned int rover; -inet_get_local_port_range (&low, &high); +inet_get_local_port_range (&init_net, &low, &high); remaining = (high - low) +1 ; rover =net_random () % remaining + low; retry:drivers/net/vxlan.c +1
-1@@ -1501,7 +1501,7 @@ static void vxlan_setup(struct net_device *dev) vxlan->age_timer.function = vxlan_cleanup; vxlan->age_timer.data = (unsigned long ) vxlan; -inet_get_local_port_range (&low, &high); +inet_get_local_port_range (dev_net (net), &low, &high); vxlan->port_min = low; vxlan->port_max = high; vxlan->dst_port =htons (vxlan_port);include/net/ip.h +1
-6@@ -195,12 +195,7 @@ static inline u64 snmp_fold_field64(void __percpu *mib[], int offt, size_t syncp#endif extern int snmp_mib_init (void __percpu *ptr[2 ],size_t mibsize,size_t align);extern void snmp_mib_free (void __percpu *ptr[2 ]); - -extern struct local_ports { -seqlock_t lock; -int range[2 ]; -} sysctl_local_ports; -extern void inet_get_local_port_range (int *low,int *high); +extern void inet_get_local_port_range (struct net *net,int *low,int *high);extern unsigned long *sysctl_local_reserved_ports;static inline int inet_is_reserved_local_port (int port)include/net/netns/ipv4.h +6
-0@@ -15,6 +15,10 @@ struct fib_rules_ops;struct hlist_head ;struct fib_table ;struct sock ; +struct local_ports { +seqlock_t lock; +int range[2 ]; +};struct netns_ipv4 {#ifdef CONFIG_SYSCTL @@ -62,6 +66,8 @@ struct netns_ipv4 {int sysctl_icmp_ratemask;int sysctl_icmp_errors_use_inbound_ifaddr; +struct local_ports sysctl_local_ports; +int sysctl_tcp_ecn;kgid_t sysctl_ping_group_range[2 ];net/ipv4/inet_connection_sock.c +6
-14@@ -29,27 +29,19 @@ const char inet_csk_timer_bug_msg[] = "inet_csk BUG: unknown timer value\n";EXPORT_SYMBOL (inet_csk_timer_bug_msg);#endif -/* -* This struct holds the first and last local port number. -*/ -struct local_ports sysctl_local_ports__read_mostly = { - .lock =__SEQLOCK_UNLOCKED (sysctl_local_ports.lock), - .range = {32768 ,61000 }, -}; -unsigned long *sysctl_local_reserved_ports;EXPORT_SYMBOL (sysctl_local_reserved_ports); -void inet_get_local_port_range (int *low,int *high) +void inet_get_local_port_range (struct net *net,int *low,int *high) {unsigned int seq;do { - seq =read_seqbegin (&sysctl_local_ports.lock); + seq =read_seqbegin (&net->ipv4.sysctl_local_ports.lock); - *low = sysctl_local_ports.range[0 ]; - *high = sysctl_local_ports.range[1 ]; - }while (read_seqretry (&sysctl_local_ports.lock, seq)); + *low = net->ipv4.sysctl_local_ports.range[0 ]; + *high = net->ipv4.sysctl_local_ports.range[1 ]; + }while (read_seqretry (&net->ipv4.sysctl_local_ports.lock, seq)); }EXPORT_SYMBOL (inet_get_local_port_range);@@ -116,7 +108,7 @@ int inet_csk_get_port(struct sock *sk, unsigned short snum)int remaining, rover, low, high; again: -inet_get_local_port_range (&low, &high); +inet_get_local_port_range (net, &low, &high); remaining = (high - low) +1 ; smallest_rover = rover =net_random () % remaining + low;net/ipv4/inet_hashtables.c +1
-1@@ -494,7 +494,7 @@ int __inet_hash_connect(struct inet_timewait_death_row *death_row,u32 offset = hint + port_offset;struct inet_timewait_sock *tw =NULL ; -inet_get_local_port_range (&low, &high); +inet_get_local_port_range (net, &low, &high); remaining = (high - low) +1 ;local_bh_disable ();net/ipv4/ping.c +2
-2@@ -237,11 +237,11 @@ static void inet_get_ping_group_range_net(struct net *net, kgid_t *low,unsigned int seq;do { - seq =read_seqbegin (&sysctl_local_ports.lock); + seq =read_seqbegin (&net->ipv4.sysctl_local_ports.lock); *low = data[0 ]; *high = data[1 ]; - }while (read_seqretry (&sysctl_local_ports.lock, seq)); + }while (read_seqretry (&net->ipv4.sysctl_local_ports.lock, seq)); }net/ipv4/sysctl_net_ipv4.c +15
-7@@ -42,12 +42,12 @@ static int ip_ping_group_range_min[] = { 0, 0 };static int ip_ping_group_range_max[] = {GID_T_MAX ,GID_T_MAX };/* Update system visible IP port range */ -static void set_local_port_range (int range[2 ]) +static void set_local_port_range (struct local_ports *ports,int range[2 ]) { -write_seqlock (&sysctl_local_ports.lock); - sysctl_local_ports.range[0 ] = range[0 ]; - sysctl_local_ports.range[1 ] = range[1 ]; -write_sequnlock (&sysctl_local_ports.lock); +write_seqlock (&ports->lock); + ports->range[0 ] = range[0 ]; + ports->range[1 ] = range[1 ]; +write_sequnlock (&ports->lock); }/* Validate changes from /proc interface. */ @@ -55,6 +55,9 @@ static int ipv4_local_port_range(struct ctl_table *table, int write,void __user *buffer, size_t *lenp, loff_t *ppos) { + struct local_ports *ports = + container_of(table->data, struct local_ports, range); +unsigned int seq;int ret;int range[2 ]; struct ctl_table tmp = {@@ -65,14 +68,19 @@ static int ipv4_local_port_range(struct ctl_table *table, int write, .extra2 = &ip_local_port_range_max, }; -inet_get_local_port_range (range, range +1 ); +do { + seq =read_seqbegin (&ports->lock); + range[0 ] = ports->range[0 ]; + range[1 ] = ports->range[1 ]; + }while (read_seqretry (&ports->lock, seq)); + ret =proc_dointvec_minmax (&tmp, write, buffer, lenp, ppos);if (write && ret ==0 ) {if (range[1 ] < range[0 ]) ret = -EINVAL ;else -set_local_port_range (range); +set_local_port_range (ports, range); }return ret;
net/ipv4/sysctl_net_ipv4.c static int ipv4_local_port_range(struct ctl_table *table, int write, · line 93
Quoted 4 lines
net/ipv4/sysctl_net_ipv4.c +1
-0@@ -82,23 +90,27 @@ static int ipv4_local_port_range(struct ctl_table *table, int write,static void inet_get_ping_group_range_table (struct ctl_table *table,kgid_t *low,kgid_t *high) {kgid_t *data = table->data; + struct netns_ipv4 *ipv4 =
There is spaces here instead of tabs.
Quoted 8 lines
net/ipv4/sysctl_net_ipv4.c +2
-1+ container_of(table->data, struct netns_ipv4, sysctl_ping_group_range);unsigned int seq; do { - seq = read_seqbegin(&sysctl_local_ports.lock); + seq = read_seqbegin(&ipv4->sysctl_local_ports.lock); *low = data[0]; *high = data[1];
net/ipv4/sysctl_net_ipv4.c static int ipv4_local_port_range(struct ctl_table *table, int write, · line 108
Quoted 10 lines
net/ipv4/sysctl_net_ipv4.c +2
-2- }while (read_seqretry (&sysctl_local_ports.lock, seq)); + }while (read_seqretry (&ipv4->sysctl_local_ports.lock, seq)); }/* Update system visible IP port range */ static void set_ping_group_range (struct ctl_table *table,kgid_t low,kgid_t high) {kgid_t *data = table->data; -write_seqlock (&sysctl_local_ports.lock); + struct netns_ipv4 *ipv4 =
Same here.
From: [email protected] (Eric W. Biederman)
Date: Sun, 22 Sep 2013 23:27:30 -0700
Quoted 10 lines
- Move
sysctl_local_portsfrom a global variable into structnetns_ipv4.
- Modifyinet_get_local_port_rangeto take a struct net.
- Manually expandinet_get_local_rangeintoipv4_local_port_rangebecause I do not know the struct net.
- Move the initialization ofsysctl_local_portsinto sysctl_net_ipv4.c:ipv4_sysctl_init_net frominet_connection_sock.cOriginally-by Samya <[email protected]>Signed-off-by "Eric W. Biederman" <[email protected]>
Applied.
David Miller
maintainerFrom: David Miller <[email protected]>
Date: Sat, 28 Sep 2013 15:52:28 -0400 (EDT)
Quoted 11 lines
From: [email protected] (Eric W. Biederman)
Date: Sun, 22 Sep 2013 23:27:30 -0700Quoted 8 lines
- Move
sysctl_local_portsfrom a global variable into structnetns_ipv4.
- Modifyinet_get_local_port_rangeto take a struct net.
- Manually expandinet_get_local_rangeintoipv4_local_port_rangebecause I do not know the struct net.
- Move the initialization ofsysctl_local_portsinto sysctl_net_ipv4.c:ipv4_sysctl_init_net frominet_connection_sock.c
Quoted 4 lines
Quoted 2 lines
Originally-by Samya <[email protected]>Signed-off-by "Eric W. Biederman" <[email protected]>Applied.
I had to revert, you didn't throughly build test this.
security/selinux/hooks.c: In function ‘selinux_socket_bind’:security/selinux/hooks.c:3933:4: error: incompatible type for argument 1 of ‘inet_get_local_port_range’ In file included from security/selinux/hooks.c:53:0:include/net/ip.h:206:6: note: expected ‘struct net *’ but argument is of type ‘struct lsm_network_audit’
And when you repost make sure to deal with the space vs. TAB issues pointed out to you.
Thanks.
Quoted 14 lines · David Miller
From: David Miller <[email protected]>
Date: Sat, 28 Sep 2013 15:52:28 -0400 (EDT)Quoted 11 lines
From: [email protected] (Eric W. Biederman)
Date: Sun, 22 Sep 2013 23:27:30 -0700Quoted 8 lines
- Move
sysctl_local_portsfrom a global variable into structnetns_ipv4.
- Modifyinet_get_local_port_rangeto take a struct net.
- Manually expandinet_get_local_rangeintoipv4_local_port_rangebecause I do not know the struct net.
- Move the initialization ofsysctl_local_portsinto sysctl_net_ipv4.c:ipv4_sysctl_init_net frominet_connection_sock.c
Quoted 6 lines
Quoted 4 lines
Quoted 2 lines
Originally-by Samya <[email protected]>Signed-off-by "Eric W. Biederman" <[email protected]>Applied.
I had to revert, you didn't throughly build test this.
My apologies, I was pushing a little too hard that day. v3 will be coming with the fix.
Quoted 7 lines
security/selinux/hooks.c: In function ‘selinux_socket_bind’:security/selinux/hooks.c:3933:4: error: incompatible type for argument 1 of ‘inet_get_local_port_range’ In file included fromsecurity/selinux/hooks.c:53:0:include/net/ip.h:206:6: note: expected ‘struct net *’ but argument is of type ‘struct lsm_network_audit’And when you repost make sure to deal with the space vs. TAB issues pointed out to you.
Definitely.
Eric
PATCH 1/1 net ipv4: Convert ipv4.ip_local_port_range to be per netns v3
In reply to a message not in the archive- Move sysctl_local_ports from a global variable into struct netns_ipv4.
- Modify inet_get_local_port_range to take a struct net, and update all of the callers.
- Move the initialization of sysctl_local_ports into sysctl_net_ipv4.c:ipv4_sysctl_init_net from inet_connection_sock.c
v2:
- Ensure indentation used tabs
- Fixed ip.h so it applies cleanly to todays net-next
v3:
- Compile fixes of strange callers of inet_get_local_port_range. This patch now successfully passes an allmodconfig build. Removed manual inlining of inet_get_local_port_range in ipv4_local_port_range
--- drivers/infiniband/core/cma.c | 2 +- drivers/net/vxlan.c | 2 +- include/net/ip.h | 6 +---- include/net/netns/ipv4.h | 6 +++++ net/ipv4/inet_connection_sock.c | 20 +++++---------- net/ipv4/inet_hashtables.c | 2 +- net/ipv4/ping.c | 4 +-- net/ipv4/sysctl_net_ipv4.c | 52 +++++++++++++++++++++++++-------------- net/ipv4/udp.c | 2 +- net/openvswitch/vport-vxlan.c | 2 +- net/sctp/socket.c | 2 +- security/selinux/hooks.c | 2 +- 12 files changed, 56 insertions(+), 46 deletions(-)
drivers/infiniband/core/cma.c +1 -1
@@ -2294,7 +2294,7 @@ static int cma_alloc_any_port(struct idr *ps, struct rdma_id_private *id_priv)int low, high, remaining;unsigned int rover; -inet_get_local_port_range (&low, &high); +inet_get_local_port_range (&init_net, &low, &high); remaining = (high - low) +1 ; rover =net_random () % remaining + low; retry:
drivers/net/vxlan.c +1 -1
@@ -2089,7 +2089,7 @@ static void vxlan_setup(struct net_device *dev) vxlan->age_timer.function = vxlan_cleanup; vxlan->age_timer.data = (unsigned long ) vxlan; -inet_get_local_port_range (&low, &high); +inet_get_local_port_range (dev_net (dev), &low, &high); vxlan->port_min = low; vxlan->port_max = high; vxlan->dst_port =htons (vxlan_port);
include/net/ip.h +1 -5
@@ -203,11 +203,7 @@ static inline void snmp_mib_free(void __percpu *ptr[SNMP_ARRAY_SZ]) } } -extern struct local_ports { -seqlock_t lock; -int range[2 ]; -} sysctl_local_ports; -void inet_get_local_port_range (int *low,int *high); +void inet_get_local_port_range (struct net *net,int *low,int *high);extern unsigned long *sysctl_local_reserved_ports;static inline int inet_is_reserved_local_port (int port)
include/net/netns/ipv4.h +6 -0
@@ -15,6 +15,10 @@ struct fib_rules_ops;struct hlist_head ;struct fib_table ;struct sock ; +struct local_ports { +seqlock_t lock; +int range[2 ]; +};struct netns_ipv4 {#ifdef CONFIG_SYSCTL
@@ -62,6 +66,8 @@ struct netns_ipv4 {int sysctl_icmp_ratemask;int sysctl_icmp_errors_use_inbound_ifaddr; +struct local_ports sysctl_local_ports; +int sysctl_tcp_ecn;kgid_t sysctl_ping_group_range[2 ];
net/ipv4/inet_connection_sock.c +6 -14
@@ -29,27 +29,19 @@ const char inet_csk_timer_bug_msg[] = "inet_csk BUG: unknown timer value\n";EXPORT_SYMBOL (inet_csk_timer_bug_msg);#endif -/* -* This struct holds the first and last local port number. -*/ -struct local_ports sysctl_local_ports__read_mostly = { - .lock =__SEQLOCK_UNLOCKED (sysctl_local_ports.lock), - .range = {32768 ,61000 }, -}; -unsigned long *sysctl_local_reserved_ports;EXPORT_SYMBOL (sysctl_local_reserved_ports); -void inet_get_local_port_range (int *low,int *high) +void inet_get_local_port_range (struct net *net,int *low,int *high) {unsigned int seq;do { - seq =read_seqbegin (&sysctl_local_ports.lock); + seq =read_seqbegin (&net->ipv4.sysctl_local_ports.lock); - *low = sysctl_local_ports.range[0 ]; - *high = sysctl_local_ports.range[1 ]; - }while (read_seqretry (&sysctl_local_ports.lock, seq)); + *low = net->ipv4.sysctl_local_ports.range[0 ]; + *high = net->ipv4.sysctl_local_ports.range[1 ]; + }while (read_seqretry (&net->ipv4.sysctl_local_ports.lock, seq)); }EXPORT_SYMBOL (inet_get_local_port_range);
@@ -116,7 +108,7 @@ int inet_csk_get_port(struct sock *sk, unsigned short snum)int remaining, rover, low, high; again: -inet_get_local_port_range (&low, &high); +inet_get_local_port_range (net, &low, &high); remaining = (high - low) +1 ; smallest_rover = rover =net_random () % remaining + low;
net/ipv4/inet_hashtables.c +1 -1
@@ -494,7 +494,7 @@ int __inet_hash_connect(struct inet_timewait_death_row *death_row,u32 offset = hint + port_offset;struct inet_timewait_sock *tw =NULL ; -inet_get_local_port_range (&low, &high); +inet_get_local_port_range (net, &low, &high); remaining = (high - low) +1 ;local_bh_disable ();
net/ipv4/ping.c +2 -2
@@ -237,11 +237,11 @@ static void inet_get_ping_group_range_net(struct net *net, kgid_t *low,unsigned int seq;do { - seq =read_seqbegin (&sysctl_local_ports.lock); + seq =read_seqbegin (&net->ipv4.sysctl_local_ports.lock); *low = data[0 ]; *high = data[1 ]; - }while (read_seqretry (&sysctl_local_ports.lock, seq)); + }while (read_seqretry (&net->ipv4.sysctl_local_ports.lock, seq)); }
net/ipv4/sysctl_net_ipv4.c +34 -18
120 lines not on this page · raw message
net/ipv4/udp.c +1 -1
@@ -219,7 +219,7 @@ int udp_lib_get_port(struct sock *sk, unsigned short snum,unsigned short first, last;DECLARE_BITMAP (bitmap,PORTS_PER_CHAIN ); -inet_get_local_port_range (&low, &high); +inet_get_local_port_range (net, &low, &high); remaining = (high - low) +1 ; rand =net_random ();
net/openvswitch/vport-vxlan.c +1 -1
@@ -173,7 +173,7 @@ static int vxlan_tnl_send(struct vport *vport, struct sk_buff *skb) skb->local_df =1 ; -inet_get_local_port_range (&port_min, &port_max); +inet_get_local_port_range (net, &port_min, &port_max); src_port =vxlan_src_port (port_min, port_max, skb); err = vxlan_xmit_skb(vxlan_port->vs, rt, skb,
net/sctp/socket.c +1 -1
@@ -5890,7 +5890,7 @@ static long sctp_get_port_local(struct sock *sk, union sctp_addr *addr)int low, high, remaining, index;unsigned int rover; -inet_get_local_port_range (&low, &high); +inet_get_local_port_range (sock_net (sk), &low, &high); remaining = (high - low) +1 ; rover =net_random () % remaining + low;
security/selinux/hooks.c +1 -1
@@ -3929,7 +3929,7 @@ static int selinux_socket_bind(struct socket *sock, struct sockaddr *address, inif (snum) {int low, high; -inet_get_local_port_range (&low, &high); +inet_get_local_port_range (sock_net (sk), &low, &high);if (snum <max (PROT_SOCK , low) || snum > high) { err = sel_netport_sid(sk->sk_protocol,
Signature · 1 line
1.7.10.4
Re: [PATCH net-next ] net ipv4: Convert ipv4.ip_local_port_range to be per netns v3
From: [email protected] (Eric W. Biederman)
Date: Sat, 28 Sep 2013 14:10:59 -0700
Quoted 11 lines
- Move
sysctl_local_portsfrom a global variable into structnetns_ipv4.
- Modifyinet_get_local_port_rangeto take a struct net, and update all of the callers.
- Move the initialization ofsysctl_local_portsinto sysctl_net_ipv4.c:ipv4_sysctl_init_net frominet_connection_sock.cv2:
- Ensure indentation used tabs
- Fixedip.hso it applies cleanly to todays net-next
Quoted 8 lines
v3:
- Compile fixes of strange callers ofinet_get_local_port_range. This patch now successfully passes an allmodconfig build. Removed manual inlining ofinet_get_local_port_rangeinipv4_local_port_rangeOriginally-by Samya <[email protected]>Acked-by Nicolas Dichtel <[email protected]>Signed-off-by "Eric W. Biederman" <[email protected]>
Applied, thanks Eric.