Commit fae4fd50 authored by Marcelo Ricardo Leitner's avatar Marcelo Ricardo Leitner Committed by Luis Henriques

sctp: use the same clock as if sock source timestamps were on

commit cb5e173e upstream.

SCTP echoes a cookie o INIT ACK chunks that contains a timestamp, for
detecting stale cookies. This cookie is echoed back to the server by the
client and then that timestamp is checked.

Thing is, if the listening socket is using packet timestamping, the
cookie is encoded with ktime_get() value and checked against
ktime_get_real(), as done by __net_timestamp().

The fix is to sctp also use ktime_get_real(), so we can compare bananas
with bananas later no matter if packet timestamping was enabled or not.

Fixes: 52db882f ("net: sctp: migrate cookie life from timeval to ktime")
Signed-off-by: default avatarMarcelo Ricardo Leitner <marcelo.leitner@gmail.com>
Acked-by: default avatarVlad Yasevich <vyasevich@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
Signed-off-by: default avatarLuis Henriques <luis.henriques@canonical.com>
parent 73f0d95f
...@@ -1652,7 +1652,7 @@ static sctp_cookie_param_t *sctp_pack_cookie(const struct sctp_endpoint *ep, ...@@ -1652,7 +1652,7 @@ static sctp_cookie_param_t *sctp_pack_cookie(const struct sctp_endpoint *ep,
/* Set an expiration time for the cookie. */ /* Set an expiration time for the cookie. */
cookie->c.expiration = ktime_add(asoc->cookie_life, cookie->c.expiration = ktime_add(asoc->cookie_life,
ktime_get()); ktime_get_real());
/* Copy the peer's init packet. */ /* Copy the peer's init packet. */
memcpy(&cookie->c.peer_init[0], init_chunk->chunk_hdr, memcpy(&cookie->c.peer_init[0], init_chunk->chunk_hdr,
...@@ -1780,7 +1780,7 @@ struct sctp_association *sctp_unpack_cookie( ...@@ -1780,7 +1780,7 @@ struct sctp_association *sctp_unpack_cookie(
if (sock_flag(ep->base.sk, SOCK_TIMESTAMP)) if (sock_flag(ep->base.sk, SOCK_TIMESTAMP))
kt = skb_get_ktime(skb); kt = skb_get_ktime(skb);
else else
kt = ktime_get(); kt = ktime_get_real();
if (!asoc && ktime_before(bear_cookie->expiration, kt)) { if (!asoc && ktime_before(bear_cookie->expiration, kt)) {
/* /*
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment