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

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

sctp: Push struct net down into sctp_in_scope 



struct net will be needed shortly when the tunables are made per network
namespace.

Signed-off-by: default avatar"Eric W. Biederman" <ebiederm@xmission.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 89bf3450

include/net/sctp/structs.h

+1 −1
Original line number Diff line number Diff line
@@ -1248,7 +1248,7 @@ int sctp_raw_to_bind_addrs(struct sctp_bind_addr *bp, __u8 *raw, int len, 
			   __u16 port, gfp_t gfp);



sctp_scope_t sctp_scope(const union sctp_addr *);

int sctp_in_scope(const union sctp_addr *addr, const sctp_scope_t scope);

int sctp_in_scope(struct net *net, const union sctp_addr *addr, const sctp_scope_t scope);

int sctp_is_any(struct sock *sk, const union sctp_addr *addr);

int sctp_addr_is_valid(const union sctp_addr *addr);

int sctp_is_ep_boundall(struct sock *sk);

net/sctp/bind_addr.c

+2 −2
Original line number Diff line number Diff line
@@ -457,7 +457,7 @@ static int sctp_copy_one_addr(struct net *net, struct sctp_bind_addr *dest, 


	if (sctp_is_any(NULL, addr)) {

		error = sctp_copy_local_addr_list(net, dest, scope, gfp, flags);

	} else if (sctp_in_scope(addr, scope)) {

	} else if (sctp_in_scope(net, addr, scope)) {

		/* Now that the address is in scope, check to see if

		 * the address type is supported by local sock as

		 * well as the remote peer.
@@ -494,7 +494,7 @@ int sctp_is_any(struct sock *sk, const union sctp_addr *addr) 
}



/* Is 'addr' valid for 'scope'?  */

int sctp_in_scope(const union sctp_addr *addr, sctp_scope_t scope)

int sctp_in_scope(struct net *net, const union sctp_addr *addr, sctp_scope_t scope)

{

	sctp_scope_t addr_scope = sctp_scope(addr);

net/sctp/protocol.c

+1 −1
Original line number Diff line number Diff line
@@ -210,7 +210,7 @@ int sctp_copy_local_addr_list(struct net *net, struct sctp_bind_addr *bp, 
	list_for_each_entry_rcu(addr, &net->sctp.local_addr_list, list) {

		if (!addr->valid)

			continue;

		if (sctp_in_scope(&addr->a, scope)) {

		if (sctp_in_scope(net, &addr->a, scope)) {

			/* Now that the address is in scope, check to see if

			 * the address type is really supported by the local

			 * sock as well as the remote peer.

net/sctp/sm_make_chunk.c

+2 −1
Original line number Diff line number Diff line
@@ -2466,6 +2466,7 @@ static int sctp_process_param(struct sctp_association *asoc, 
			      const union sctp_addr *peer_addr,

			      gfp_t gfp)

{

	struct net *net = sock_net(asoc->base.sk);

	union sctp_addr addr;

	int i;

	__u16 sat;
@@ -2494,7 +2495,7 @@ do_addr_param: 
		af = sctp_get_af_specific(param_type2af(param.p->type));

		af->from_addr_param(&addr, param.addr, htons(asoc->peer.port), 0);

		scope = sctp_scope(peer_addr);

		if (sctp_in_scope(&addr, scope))

		if (sctp_in_scope(net, &addr, scope))

			if (!sctp_assoc_add_peer(asoc, &addr, gfp, SCTP_UNCONFIRMED))

				return 0;

		break;