[PATCH] net: core: fix SO_TIMESTAMP_* option setting

From: Sergei Trofimovich
Date: Wed Jul 07 2021 - 05:35:09 EST


I noticed the problem as a systemd-timesyncd (and ntpsec) sync failures:

systemd-timesyncd[586]: Timed out waiting for reply from ...
systemd-timesyncd[586]: Invalid packet timestamp.

Bisected it down to commit 371087aa476
("sock: expose so_timestamp options for mptcp").

The commit should be a no-op but it accidentally reordered option type
and option value:

+void sock_set_timestamp(struct sock *sk, int optname, bool valbool);
...
- __sock_set_timestamps(sk, valbool, true, true);
+ sock_set_timestamp(sk, valbool, optname);

Tested the fix on systemd-timesyncd. The sync failures went away.

CC: Paolo Abeni <pabeni@xxxxxxxxxx>
CC: Florian Westphal <fw@xxxxxxxxx>
CC: Mat Martineau <mathew.j.martineau@xxxxxxxxxxxxxxx>
CC: David S. Miller <davem@xxxxxxxxxxxxx>
CC: Jakub Kicinski <kuba@xxxxxxxxxx>
CC: Eric Dumazet <edumazet@xxxxxxxxxx>
Signed-off-by: Sergei Trofimovich <slyfox@xxxxxxxxxx>
---
net/core/sock.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net/core/sock.c b/net/core/sock.c
index ba1c0f75cd45..060892372ac5 100644
--- a/net/core/sock.c
+++ b/net/core/sock.c
@@ -1068,7 +1068,7 @@ int sock_setsockopt(struct socket *sock, int level, int optname,
case SO_TIMESTAMP_NEW:
case SO_TIMESTAMPNS_OLD:
case SO_TIMESTAMPNS_NEW:
- sock_set_timestamp(sk, valbool, optname);
+ sock_set_timestamp(sk, optname, valbool);
break;

case SO_TIMESTAMPING_NEW:
--
2.32.0