Merge master.kernel.org:/pub/scm/linux/kernel/git/vxy/lksctp-dev

1 files changed, 22 insertions, 9 deletions

diff --git a/net/sctp/socket.c b/net/sctp/socket.c
index 4dcdabf56473..6edaaa009d62 100644
--- a/net/sctp/socket.c
+++ b/net/sctp/socket.c
@@ -333,12 +333,19 @@ SCTP_STATIC int sctp_do_bind(struct sock *sk, union sctp_addr *addr, int len)
         if (!sp->pf->bind_verify(sp, addr))
                 return -EADDRNOTAVAIL;
 
-        /* We must either be unbound, or bind to the same port.  */
-        if (bp->port && (snum != bp->port)) {
-                SCTP_DEBUG_PRINTK("sctp_do_bind:"
+        /* We must either be unbound, or bind to the same port.
+         * It's OK to allow 0 ports if we are already bound.
+         * We'll just inhert an already bound port in this case
+         */
+        if (bp->port) {
+                if (!snum)
+                        snum = bp->port;
+                else if (snum != bp->port) {
+                        SCTP_DEBUG_PRINTK("sctp_do_bind:"
                                   " New port %d does not match existing port "
                                   "%d.\n", snum, bp->port);
-                return -EINVAL;
+                        return -EINVAL;
+                }
         }
 
         if (snum && snum < PROT_SOCK && !capable(CAP_NET_BIND_SERVICE))
@@ -1655,6 +1662,9 @@ SCTP_STATIC int sctp_sendmsg(struct kiocb *iocb, struct sock *sk,
                 goto out_free;
         }
 
+        if (asoc->pmtu_pending)
+                sctp_assoc_pending_pmtu(asoc);
+
         /* If fragmentation is disabled and the message length exceeds the
          * association fragmentation point, return EMSGSIZE.  The I-D
          * does not specify what this error is, but this looks like
@@ -3550,6 +3560,7 @@ SCTP_STATIC int sctp_do_peeloff(struct sctp_association *asoc,
         struct sock *sk = asoc->base.sk;
         struct socket *sock;
         struct inet_sock *inetsk;
+        struct sctp_af *af;
         int err = 0;
 
         /* An association cannot be branched off from an already peeled-off
@@ -3571,8 +3582,9 @@ SCTP_STATIC int sctp_do_peeloff(struct sctp_association *asoc,
         /* Make peeled-off sockets more like 1-1 accepted sockets.
          * Set the daddr and initialize id to something more random
          */
+        af = sctp_get_af_specific(asoc->peer.primary_addr.sa.sa_family);
+        af->to_sk_daddr(&asoc->peer.primary_addr, sk);
         inetsk = inet_sk(sock->sk);
-        inetsk->daddr = asoc->peer.primary_addr.v4.sin_addr.s_addr;
         inetsk->id = asoc->next_tsn ^ jiffies;
 
         *sockp = sock;
@@ -4343,11 +4355,12 @@ copy_getaddrs:
                 err = -EFAULT;
                 goto error;
         }
-        if (put_user(cnt, &((struct sctp_getaddrs __user *)optval)->addr_num))
-                return -EFAULT;
+        if (put_user(cnt, &((struct sctp_getaddrs __user *)optval)->addr_num)) {
+                err = -EFAULT;
+                goto error;
+        }
         if (put_user(bytes_copied, optlen))
-                return -EFAULT;
-
+                err = -EFAULT;
 error:
         kfree(addrs);
         return err;