sctp: Add ip option support

Add ip option support to allow LSM security modules to utilise CIPSO/IPv4
and CALIPSO/IPv6 services.

Signed-off-by: Richard Haines <richard_c_haines@btinternet.com>
Acked-by: Neil Horman <nhorman@tuxdriver.com>
Acked-by: Marcelo Ricardo Leitner <marcelo.leitner@gmail.com>
Signed-off-by: Paul Moore <paul@paul-moore.com>

2 files changed, 5 insertions, 1 deletions

diff --git a/include/net/sctp/sctp.h b/include/net/sctp/sctp.h
index f7ae6b0a21d0..25c5c8768818 100644
--- a/include/net/sctp/sctp.h
+++ b/include/net/sctp/sctp.h
@@ -441,9 +441,11 @@ static inline int sctp_list_single_entry(struct list_head *head)
 static inline int sctp_frag_point(const struct sctp_association *asoc, int pmtu)
 {
         struct sctp_sock *sp = sctp_sk(asoc->base.sk);
+        struct sctp_af *af = sp->pf->af;
         int frag = pmtu;
 
-        frag -= sp->pf->af->net_header_len;
+        frag -= af->ip_options_len(asoc->base.sk);
+        frag -= af->net_header_len;
         frag -= sizeof(struct sctphdr) + sctp_datachk_len(&asoc->stream);
 
         if (asoc->user_frag)
diff --git a/include/net/sctp/structs.h b/include/net/sctp/structs.h
index 03e92dda1813..ead5fcedc283 100644
--- a/include/net/sctp/structs.h
+++ b/include/net/sctp/structs.h
@@ -491,6 +491,7 @@ struct sctp_af {
         void            (*ecn_capable)(struct sock *sk);
         __u16           net_header_len;
         int             sockaddr_len;
+        int             (*ip_options_len)(struct sock *sk);
         sa_family_t     sa_family;
         struct list_head list;
 };
@@ -515,6 +516,7 @@ struct sctp_pf {
         int (*addr_to_user)(struct sctp_sock *sk, union sctp_addr *addr);
         void (*to_sk_saddr)(union sctp_addr *, struct sock *sk);
         void (*to_sk_daddr)(union sctp_addr *, struct sock *sk);
+        void (*copy_ip_options)(struct sock *sk, struct sock *newsk);
         struct sctp_af *af;
 };