diff options
| author | Vlad Yasevich <vladislav.yasevich@hp.com> | 2011-04-18 19:14:47 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-04-19 21:45:21 -0700 |
| commit | ee9cbaca7d73ea0098f00ecd10fe6e4a4792e32c (patch) | |
| tree | 248b339ae6e8c048dcbe844c4cd8bcf1ebbbfc2f | |
| parent | f246a7b7c5b9df0ea0f0807a7101995af5e83213 (diff) | |
| download | linux-ee9cbaca7d73ea0098f00ecd10fe6e4a4792e32c.tar.gz linux-ee9cbaca7d73ea0098f00ecd10fe6e4a4792e32c.tar.bz2 linux-ee9cbaca7d73ea0098f00ecd10fe6e4a4792e32c.zip | |
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: Vlad Yasevich <vladislav.yasevich@hp.com>
Signed-off-by: Wei Yongjun <yjwei@cn.fujitsu.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | net/sctp/socket.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/net/sctp/socket.c b/net/sctp/socket.c index 5c9980ae36bb..431b8905c570 100644 --- a/net/sctp/socket.c +++ b/net/sctp/socket.c @@ -658,11 +658,15 @@ static int sctp_bindx_rem(struct sock *sk, struct sockaddr *addrs, int addrcnt) 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; 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 * sk->sk_rcv_addr are currently set to one of the addresses to * be removed. This is something which needs to be looked into |