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

Commit ee9cbaca authored by Vlad Yasevich's avatar Vlad Yasevich Committed by David S. Miller
Browse files

sctp: Allow bindx_del to accept 0 port 



We allow 0 port when adding new addresses.  It only
makes sence to allow 0 port when removing addresses.
When removing the currently bound port will be used
when the port in the address is set to 0.

Signed-off-by: default avatarVlad Yasevich <vladislav.yasevich@hp.com>
Signed-off-by: default avatarWei Yongjun <yjwei@cn.fujitsu.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent f246a7b7

net/sctp/socket.c

+5 −1
Original line number Original line Diff line number Diff line
@@ -658,11 +658,15 @@ static int sctp_bindx_rem(struct sock *sk, struct sockaddr *addrs, int addrcnt) 
			goto err_bindx_rem;

			goto err_bindx_rem;

		}

		}





		if (sa_addr->v4.sin_port != htons(bp->port)) {

		if (sa_addr->v4.sin_port &&

		    sa_addr->v4.sin_port != htons(bp->port)) {

			retval = -EINVAL;

			retval = -EINVAL;

			goto err_bindx_rem;

			goto err_bindx_rem;

		}

		}





		if (!sa_addr->v4.sin_port)

			sa_addr->v4.sin_port = htons(bp->port);



		/* FIXME - There is probably a need to check if sk->sk_saddr and

		/* FIXME - There is probably a need to check if sk->sk_saddr and

		 * sk->sk_rcv_addr are currently set to one of the addresses to

		 * sk->sk_rcv_addr are currently set to one of the addresses to

		 * be removed. This is something which needs to be looked into

		 * be removed. This is something which needs to be looked into