Merge tag 'mtd/for-5.11' of git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux

[linux-2.6-microblaze.git] / net / sctp / socket.c

diff --git a/net/sctp/socket.c b/net/sctp/socket.c
index 53d0a41..a710917 100644 (file)
--- a/net/sctp/socket.c
+++ b/net/sctp/socket.c
@@ -4417,6 +4417,55 @@ out:
        return retval;
 }
 
+static int sctp_setsockopt_encap_port(struct sock *sk,
+                                     struct sctp_udpencaps *encap,
+                                     unsigned int optlen)
+{
+       struct sctp_association *asoc;
+       struct sctp_transport *t;
+       __be16 encap_port;
+
+       if (optlen != sizeof(*encap))
+               return -EINVAL;
+
+       /* If an address other than INADDR_ANY is specified, and
+        * no transport is found, then the request is invalid.
+        */
+       encap_port = (__force __be16)encap->sue_port;
+       if (!sctp_is_any(sk, (union sctp_addr *)&encap->sue_address)) {
+               t = sctp_addr_id2transport(sk, &encap->sue_address,
+                                          encap->sue_assoc_id);
+               if (!t)
+                       return -EINVAL;
+
+               t->encap_port = encap_port;
+               return 0;
+       }
+
+       /* Get association, if assoc_id != SCTP_FUTURE_ASSOC and the
+        * socket is a one to many style socket, and an association
+        * was not found, then the id was invalid.
+        */
+       asoc = sctp_id2assoc(sk, encap->sue_assoc_id);
+       if (!asoc && encap->sue_assoc_id != SCTP_FUTURE_ASSOC &&
+           sctp_style(sk, UDP))
+               return -EINVAL;
+
+       /* If changes are for association, also apply encap_port to
+        * each transport.
+        */
+       if (asoc) {
+               list_for_each_entry(t, &asoc->peer.transport_addr_list,
+                                   transports)
+                       t->encap_port = encap_port;
+
+               return 0;
+       }
+
+       sctp_sk(sk)->encap_port = encap_port;
+       return 0;
+}
+
 /* API 6.2 setsockopt(), getsockopt()
  *
  * Applications use setsockopt() and getsockopt() to set or retrieve
@@ -4636,6 +4685,9 @@ static int sctp_setsockopt(struct sock *sk, int level, int optname,
        case SCTP_EXPOSE_POTENTIALLY_FAILED_STATE:
                retval = sctp_setsockopt_pf_expose(sk, kopt, optlen);
                break;
+       case SCTP_REMOTE_UDP_ENCAPS_PORT:
+               retval = sctp_setsockopt_encap_port(sk, kopt, optlen);
+               break;
        default:
                retval = -ENOPROTOOPT;
                break;
@@ -4876,6 +4928,8 @@ static int sctp_init_sock(struct sock *sk)
         * be modified via SCTP_PEER_ADDR_PARAMS
         */
        sp->hbinterval  = net->sctp.hb_interval;
+       sp->udp_port    = htons(net->sctp.udp_port);
+       sp->encap_port  = htons(net->sctp.encap_port);
        sp->pathmaxrxt  = net->sctp.max_retrans_path;
        sp->pf_retrans  = net->sctp.pf_retrans;
        sp->ps_retrans  = net->sctp.ps_retrans;
@@ -7790,6 +7844,65 @@ out:
        return retval;
 }
 
+static int sctp_getsockopt_encap_port(struct sock *sk, int len,
+                                     char __user *optval, int __user *optlen)
+{
+       struct sctp_association *asoc;
+       struct sctp_udpencaps encap;
+       struct sctp_transport *t;
+       __be16 encap_port;
+
+       if (len < sizeof(encap))
+               return -EINVAL;
+
+       len = sizeof(encap);
+       if (copy_from_user(&encap, optval, len))
+               return -EFAULT;
+
+       /* If an address other than INADDR_ANY is specified, and
+        * no transport is found, then the request is invalid.
+        */
+       if (!sctp_is_any(sk, (union sctp_addr *)&encap.sue_address)) {
+               t = sctp_addr_id2transport(sk, &encap.sue_address,
+                                          encap.sue_assoc_id);
+               if (!t) {
+                       pr_debug("%s: failed no transport\n", __func__);
+                       return -EINVAL;
+               }
+
+               encap_port = t->encap_port;
+               goto out;
+       }
+
+       /* Get association, if assoc_id != SCTP_FUTURE_ASSOC and the
+        * socket is a one to many style socket, and an association
+        * was not found, then the id was invalid.
+        */
+       asoc = sctp_id2assoc(sk, encap.sue_assoc_id);
+       if (!asoc && encap.sue_assoc_id != SCTP_FUTURE_ASSOC &&
+           sctp_style(sk, UDP)) {
+               pr_debug("%s: failed no association\n", __func__);
+               return -EINVAL;
+       }
+
+       if (asoc) {
+               encap_port = asoc->encap_port;
+               goto out;
+       }
+
+       encap_port = sctp_sk(sk)->encap_port;
+
+out:
+       encap.sue_port = (__force uint16_t)encap_port;
+       if (copy_to_user(optval, &encap, len))
+               return -EFAULT;
+
+       if (put_user(len, optlen))
+               return -EFAULT;
+
+       return 0;
+}
+
 static int sctp_getsockopt(struct sock *sk, int level, int optname,
                           char __user *optval, int __user *optlen)
 {
@@ -8010,6 +8123,9 @@ static int sctp_getsockopt(struct sock *sk, int level, int optname,
        case SCTP_EXPOSE_POTENTIALLY_FAILED_STATE:
                retval = sctp_getsockopt_pf_expose(sk, len, optval, optlen);
                break;
+       case SCTP_REMOTE_UDP_ENCAPS_PORT:
+               retval = sctp_getsockopt_encap_port(sk, len, optval, optlen);
+               break;
        default:
                retval = -ENOPROTOOPT;
                break;