Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4db67e80 authored by Eric W. Biederman's avatar Eric W. Biederman Committed by David S. Miller
Browse files

sctp: Make the address lists per network namespace 



- Move the address lists into struct net
- Add per network namespace initialization and cleanup
- Pass around struct net so it is everywhere I need it.
- Rename all of the global variable references into references
  to the variables moved into struct net

Signed-off-by: default avatar"Eric W. Biederman" <ebiederm@xmission.com>
Acked-by: default avatarVlad Yasevich <vyasevich@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 4110cc25

include/net/net_namespace.h

+4 −0
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ 
#include <net/netns/packet.h>

#include <net/netns/ipv4.h>

#include <net/netns/ipv6.h>

#include <net/netns/sctp.h>

#include <net/netns/dccp.h>

#include <net/netns/x_tables.h>

#if defined(CONFIG_NF_CONNTRACK) || defined(CONFIG_NF_CONNTRACK_MODULE)
@@ -81,6 +82,9 @@ struct net { 
#if IS_ENABLED(CONFIG_IPV6)

	struct netns_ipv6	ipv6;

#endif

#if defined(CONFIG_IP_SCTP) || defined(CONFIG_IP_SCTP_MODULE)

	struct netns_sctp	sctp;

#endif

#if defined(CONFIG_IP_DCCP) || defined(CONFIG_IP_DCCP_MODULE)

	struct netns_dccp	dccp;

#endif

include/net/netns/sctp.h

0 → 100644
+21 −0
Original line number Diff line number Diff line 
#ifndef __NETNS_SCTP_H__

#define __NETNS_SCTP_H__



struct netns_sctp {

	/* This is the global local address list.

	 * We actively maintain this complete list of addresses on

	 * the system by catching address add/delete events.

	 *

	 * It is a list of sctp_sockaddr_entry.

	 */

	struct list_head local_addr_list;

	struct list_head addr_waitq;

	struct timer_list addr_wq_timer;

	struct list_head auto_asconf_splist;

	spinlock_t addr_wq_lock;



	/* Lock that protects the local_addr_list writers */

	spinlock_t local_addr_lock;

};



#endif /* __NETNS_SCTP_H__ */

include/net/sctp/sctp.h

+2 −2
Original line number Diff line number Diff line
@@ -115,12 +115,12 @@ 
 * sctp/protocol.c

 */

extern struct sock *sctp_get_ctl_sock(void);

extern int sctp_copy_local_addr_list(struct sctp_bind_addr *,

extern int sctp_copy_local_addr_list(struct net *, struct sctp_bind_addr *,

				     sctp_scope_t, gfp_t gfp,

				     int flags);

extern struct sctp_pf *sctp_get_pf_specific(sa_family_t family);

extern int sctp_register_pf(struct sctp_pf *, sa_family_t);

extern void sctp_addr_wq_mgmt(struct sctp_sockaddr_entry *, int);

extern void sctp_addr_wq_mgmt(struct net *, struct sctp_sockaddr_entry *, int);



/*

 * sctp/socket.c

include/net/sctp/structs.h

+1 −21
Original line number Diff line number Diff line
@@ -205,21 +205,7 @@ extern struct sctp_globals { 
	int port_hashsize;

	struct sctp_bind_hashbucket *port_hashtable;



	/* This is the global local address list.

	 * We actively maintain this complete list of addresses on

	 * the system by catching address add/delete events.

	 *

	 * It is a list of sctp_sockaddr_entry.

	 */

	struct list_head local_addr_list;

	int default_auto_asconf;

	struct list_head addr_waitq;

	struct timer_list addr_wq_timer;

	struct list_head auto_asconf_splist;

	spinlock_t addr_wq_lock;



	/* Lock that protects the local_addr_list writers */

	spinlock_t addr_list_lock;

	

	/* Flag to indicate if addip is enabled. */

	int addip_enable;
@@ -278,12 +264,6 @@ extern struct sctp_globals { 
#define sctp_assoc_hashtable		(sctp_globals.assoc_hashtable)

#define sctp_port_hashsize		(sctp_globals.port_hashsize)

#define sctp_port_hashtable		(sctp_globals.port_hashtable)

#define sctp_local_addr_list		(sctp_globals.local_addr_list)

#define sctp_local_addr_lock		(sctp_globals.addr_list_lock)

#define sctp_auto_asconf_splist		(sctp_globals.auto_asconf_splist)

#define sctp_addr_waitq			(sctp_globals.addr_waitq)

#define sctp_addr_wq_timer		(sctp_globals.addr_wq_timer)

#define sctp_addr_wq_lock		(sctp_globals.addr_wq_lock)

#define sctp_default_auto_asconf	(sctp_globals.default_auto_asconf)

#define sctp_scope_policy		(sctp_globals.ipv4_scope_policy)

#define sctp_addip_enable		(sctp_globals.addip_enable)
@@ -1241,7 +1221,7 @@ struct sctp_bind_addr { 


void sctp_bind_addr_init(struct sctp_bind_addr *, __u16 port);

void sctp_bind_addr_free(struct sctp_bind_addr *);

int sctp_bind_addr_copy(struct sctp_bind_addr *dest,

int sctp_bind_addr_copy(struct net *net, struct sctp_bind_addr *dest,

			const struct sctp_bind_addr *src,

			sctp_scope_t scope, gfp_t gfp,

			int flags);

net/sctp/associola.c

+2 −1
Original line number Diff line number Diff line
@@ -1544,7 +1544,8 @@ int sctp_assoc_set_bind_addr_from_ep(struct sctp_association *asoc, 
	if (asoc->peer.ipv6_address)

		flags |= SCTP_ADDR6_PEERSUPP;



	return sctp_bind_addr_copy(&asoc->base.bind_addr,

	return sctp_bind_addr_copy(sock_net(asoc->base.sk),

				   &asoc->base.bind_addr,

				   &asoc->ep->base.bind_addr,

				   scope, gfp, flags);

}