From: Sergei Trofimovich <slyfox@gentoo.org>
To: netdev@vger.kernel.org, Florian Westphal <fw@strlen.de>,
"David S . Miller" <davem@davemloft.net>
Cc: linux-kernel@vger.kernel.org,
Sergei Trofimovich <slyfox@gentoo.org>,
Paolo Abeni <pabeni@redhat.com>,
Mat Martineau <mathew.j.martineau@linux.intel.com>,
Jakub Kicinski <kuba@kernel.org>,
Eric Dumazet <edumazet@google.com>
Subject: [PATCH] net: core: fix SO_TIMESTAMP_* option setting
Date: Wed, 7 Jul 2021 10:27:31 +0100 [thread overview]
Message-ID: <20210707092731.2499-1-slyfox@gentoo.org> (raw)
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@redhat.com>
CC: Florian Westphal <fw@strlen.de>
CC: Mat Martineau <mathew.j.martineau@linux.intel.com>
CC: David S. Miller <davem@davemloft.net>
CC: Jakub Kicinski <kuba@kernel.org>
CC: Eric Dumazet <edumazet@google.com>
Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
---
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
next reply other threads:[~2021-07-07 9:35 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-07-07 9:27 Sergei Trofimovich [this message]
2021-07-07 12:32 ` [PATCH] net: core: fix SO_TIMESTAMP_* option setting Eric Dumazet
2021-07-07 14:20 ` Sergei Trofimovich
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210707092731.2499-1-slyfox@gentoo.org \
--to=slyfox@gentoo.org \
--cc=davem@davemloft.net \
--cc=edumazet@google.com \
--cc=fw@strlen.de \
--cc=kuba@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mathew.j.martineau@linux.intel.com \
--cc=netdev@vger.kernel.org \
--cc=pabeni@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox