sctp: also point GSO head_skb to the sk when it's available

[cascardo/linux.git] / net / sctp / ulpevent.c

diff --git a/net/sctp/ulpevent.c b/net/sctp/ulpevent.c
index b6842fd..1bc4f71 100644 (file)
--- a/net/sctp/ulpevent.c
+++ b/net/sctp/ulpevent.c
@@ -51,7 +51,7 @@ static void sctp_ulpevent_release_frag_data(struct sctp_ulpevent *event);
 
 /* Initialize an ULP event from an given skb.  */
 static void sctp_ulpevent_init(struct sctp_ulpevent *event,
-                              int msg_flags,
+                              __u16 msg_flags,
                               unsigned int len)
 {
        memset(event, 0, sizeof(struct sctp_ulpevent));
@@ -60,7 +60,7 @@ static void sctp_ulpevent_init(struct sctp_ulpevent *event,
 }
 
 /* Create a new sctp_ulpevent.  */
-static struct sctp_ulpevent *sctp_ulpevent_new(int size, int msg_flags,
+static struct sctp_ulpevent *sctp_ulpevent_new(int size, __u16 msg_flags,
                                               gfp_t gfp)
 {
        struct sctp_ulpevent *event;
@@ -91,6 +91,7 @@ int sctp_ulpevent_is_notification(const struct sctp_ulpevent *event)
 static inline void sctp_ulpevent_set_owner(struct sctp_ulpevent *event,
                                           const struct sctp_association *asoc)
 {
+       struct sctp_chunk *chunk = event->chunk;
        struct sk_buff *skb;
 
        /* Cast away the const, as we are just wanting to
@@ -101,6 +102,8 @@ static inline void sctp_ulpevent_set_owner(struct sctp_ulpevent *event,
        event->asoc = (struct sctp_association *)asoc;
        atomic_add(event->rmem_len, &event->asoc->rmem_alloc);
        sctp_skb_set_owner_r(skb, asoc->base.sk);
+       if (chunk && chunk->head_skb && !chunk->head_skb->sk)
+               chunk->head_skb->sk = asoc->base.sk;
 }
 
 /* A simple destructor to give up the reference to the association. */
@@ -341,7 +344,7 @@ struct sctp_ulpevent *sctp_ulpevent_make_peer_addr_change(
        memcpy(&spc->spc_aaddr, aaddr, sizeof(struct sockaddr_storage));
 
        /* Map ipv4 address into v4-mapped-on-v6 address.  */
-       sctp_get_pf_specific(asoc->base.sk->sk_family)->addr_v4map(
+       sctp_get_pf_specific(asoc->base.sk->sk_family)->addr_to_user(
                                        sctp_sk(asoc->base.sk),
                                        (union sctp_addr *)&spc->spc_aaddr);
 
@@ -701,6 +704,12 @@ struct sctp_ulpevent *sctp_ulpevent_make_rcvmsg(struct sctp_association *asoc,
 
        sctp_ulpevent_receive_data(event, asoc);
 
+       /* And hold the chunk as we need it for getting the IP headers
+        * later in recvmsg
+        */
+       sctp_chunk_hold(chunk);
+       event->chunk = chunk;
+
        event->stream = ntohs(chunk->subh.data_hdr->stream);
        event->ssn = ntohs(chunk->subh.data_hdr->ssn);
        event->ppid = chunk->subh.data_hdr->ppid;
@@ -710,11 +719,11 @@ struct sctp_ulpevent *sctp_ulpevent_make_rcvmsg(struct sctp_association *asoc,
        }
        event->tsn = ntohl(chunk->subh.data_hdr->tsn);
        event->msg_flags |= chunk->chunk_hdr->flags;
-       event->iif = sctp_chunk_iif(chunk);
 
        return event;
 
 fail_mark:
+       sctp_chunk_put(chunk);
        kfree_skb(skb);
 fail:
        return NULL;
@@ -886,6 +895,69 @@ void sctp_ulpevent_read_sndrcvinfo(const struct sctp_ulpevent *event,
                 sizeof(sinfo), &sinfo);
 }
 
+/* RFC6458, Section 5.3.5 SCTP Receive Information Structure
+ * (SCTP_SNDRCV)
+ */
+void sctp_ulpevent_read_rcvinfo(const struct sctp_ulpevent *event,
+                               struct msghdr *msghdr)
+{
+       struct sctp_rcvinfo rinfo;
+
+       if (sctp_ulpevent_is_notification(event))
+               return;
+
+       memset(&rinfo, 0, sizeof(struct sctp_rcvinfo));
+       rinfo.rcv_sid = event->stream;
+       rinfo.rcv_ssn = event->ssn;
+       rinfo.rcv_ppid = event->ppid;
+       rinfo.rcv_flags = event->flags;
+       rinfo.rcv_tsn = event->tsn;
+       rinfo.rcv_cumtsn = event->cumtsn;
+       rinfo.rcv_assoc_id = sctp_assoc2id(event->asoc);
+       rinfo.rcv_context = event->asoc->default_rcv_context;
+
+       put_cmsg(msghdr, IPPROTO_SCTP, SCTP_RCVINFO,
+                sizeof(rinfo), &rinfo);
+}
+
+/* RFC6458, Section 5.3.6. SCTP Next Receive Information Structure
+ * (SCTP_NXTINFO)
+ */
+static void __sctp_ulpevent_read_nxtinfo(const struct sctp_ulpevent *event,
+                                        struct msghdr *msghdr,
+                                        const struct sk_buff *skb)
+{
+       struct sctp_nxtinfo nxtinfo;
+
+       memset(&nxtinfo, 0, sizeof(nxtinfo));
+       nxtinfo.nxt_sid = event->stream;
+       nxtinfo.nxt_ppid = event->ppid;
+       nxtinfo.nxt_flags = event->flags;
+       if (sctp_ulpevent_is_notification(event))
+               nxtinfo.nxt_flags |= SCTP_NOTIFICATION;
+       nxtinfo.nxt_length = skb->len;
+       nxtinfo.nxt_assoc_id = sctp_assoc2id(event->asoc);
+
+       put_cmsg(msghdr, IPPROTO_SCTP, SCTP_NXTINFO,
+                sizeof(nxtinfo), &nxtinfo);
+}
+
+void sctp_ulpevent_read_nxtinfo(const struct sctp_ulpevent *event,
+                               struct msghdr *msghdr,
+                               struct sock *sk)
+{
+       struct sk_buff *skb;
+       int err;
+
+       skb = sctp_skb_recv_datagram(sk, MSG_PEEK, 1, &err);
+       if (skb != NULL) {
+               __sctp_ulpevent_read_nxtinfo(sctp_skb2event(skb),
+                                            msghdr, skb);
+               /* Just release refcount here. */
+               kfree_skb(skb);
+       }
+}
+
 /* Do accounting for bytes received and hold a reference to the association
  * for each skb.
  */
@@ -944,6 +1016,7 @@ static void sctp_ulpevent_release_data(struct sctp_ulpevent *event)
 
 done:
        sctp_assoc_rwnd_increase(event->asoc, len);
+       sctp_chunk_put(event->chunk);
        sctp_ulpevent_release_owner(event);
 }
 
@@ -966,6 +1039,7 @@ static void sctp_ulpevent_release_frag_data(struct sctp_ulpevent *event)
        }
 
 done:
+       sctp_chunk_put(event->chunk);
        sctp_ulpevent_release_owner(event);
 }