sctp: subtract sctphdr len in sctp_transport_pl_hlen
authorXin Long <lucien.xin@gmail.com>
Thu, 28 Oct 2021 09:36:03 +0000 (05:36 -0400)
committerDavid S. Miller <davem@davemloft.net>
Fri, 29 Oct 2021 11:21:23 +0000 (12:21 +0100)
sctp_transport_pl_hlen() is called to calculate the outer header length
for PL. However, as the Figure in rfc8899#section-4.4:

   Any additional
     headers         .--- MPS -----.
            |        |             |
            v        v             v
     +------------------------------+
     | IP | ** | PL | protocol data |
     +------------------------------+

                <----- PLPMTU ----->
     <---------- PMTU -------------->

Outer header are IP + Any additional headers, which doesn't include
Packetization Layer itself header, namely sctphdr, whereas sctphdr
is counted by __sctp_mtu_payload().

The incorrect calculation caused the link pathmtu to be set larger
than expected by t->pl.pmtu + sctp_transport_pl_hlen(). This patch
is to fix it by subtracting sctphdr len in sctp_transport_pl_hlen().

Fixes: d9e2e410ae30 ("sctp: add the constants/variables and states and some APIs for transport")
Signed-off-by: Xin Long <lucien.xin@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
include/net/sctp/sctp.h

index bc00410223b030bbdaf007f3ff0d2fdee9b571ee..189fdb9db16220385b8e0e33557b139348f0834b 100644 (file)
@@ -626,7 +626,8 @@ static inline __u32 sctp_min_frag_point(struct sctp_sock *sp, __u16 datasize)
 
 static inline int sctp_transport_pl_hlen(struct sctp_transport *t)
 {
-       return __sctp_mtu_payload(sctp_sk(t->asoc->base.sk), t, 0, 0);
+       return __sctp_mtu_payload(sctp_sk(t->asoc->base.sk), t, 0, 0) -
+              sizeof(struct sctphdr);
 }
 
 static inline void sctp_transport_pl_reset(struct sctp_transport *t)