diff options
| author | Thomas Lange <thomas@corelatus.se> | 2024-01-04 09:57:44 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2024-01-15 18:51:21 +0100 |
| commit | a58ae5ab714d6202bd27f033193bad47fa3a9f9d (patch) | |
| tree | 4ea0440a0f5701c532e3e59b117106e753ddcfc7 | |
| parent | 500c7f32ad4392a811c47f0ca908853e9b8e879a (diff) | |
| download | linux-a58ae5ab714d6202bd27f033193bad47fa3a9f9d.tar.gz linux-a58ae5ab714d6202bd27f033193bad47fa3a9f9d.tar.bz2 linux-a58ae5ab714d6202bd27f033193bad47fa3a9f9d.zip | |
net: Implement missing SO_TIMESTAMPING_NEW cmsg support
[ Upstream commit 382a32018b74f407008615e0e831d05ed28e81cd ]
Commit 9718475e6908 ("socket: Add SO_TIMESTAMPING_NEW") added the new
socket option SO_TIMESTAMPING_NEW. However, it was never implemented in
__sock_cmsg_send thus breaking SO_TIMESTAMPING cmsg for platforms using
SO_TIMESTAMPING_NEW.
Fixes: 9718475e6908 ("socket: Add SO_TIMESTAMPING_NEW")
Link: https://lore.kernel.org/netdev/6a7281bf-bc4a-4f75-bb88-7011908ae471@app.fastmail.com/
Signed-off-by: Thomas Lange <thomas@corelatus.se>
Reviewed-by: Willem de Bruijn <willemb@google.com>
Link: https://lore.kernel.org/r/20240104085744.49164-1-thomas@corelatus.se
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
| -rw-r--r-- | net/core/sock.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/net/core/sock.c b/net/core/sock.c index ef29106af604..e254790d562e 100644 --- a/net/core/sock.c +++ b/net/core/sock.c @@ -2551,6 +2551,7 @@ int __sock_cmsg_send(struct sock *sk, struct msghdr *msg, struct cmsghdr *cmsg, sockc->mark = *(u32 *)CMSG_DATA(cmsg); break; case SO_TIMESTAMPING_OLD: + case SO_TIMESTAMPING_NEW: if (cmsg->cmsg_len != CMSG_LEN(sizeof(u32))) return -EINVAL; |