projects
/
platform
/
kernel
/
linux-starfive.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
ea37c4b
)
net: Implement missing SO_TIMESTAMPING_NEW cmsg support
author
Thomas Lange
<thomas@corelatus.se>
Thu, 4 Jan 2024 08:57:44 +0000
(09:57 +0100)
committer
Greg Kroah-Hartman
<gregkh@linuxfoundation.org>
Wed, 10 Jan 2024 16:16:53 +0000
(17:16 +0100)
[ 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>
net/core/sock.c
patch
|
blob
|
history
diff --git
a/net/core/sock.c
b/net/core/sock.c
index
fe687e6
..
5cd21e6
100644
(file)
--- a/
net/core/sock.c
+++ b/
net/core/sock.c
@@
-2828,6
+2828,7
@@
int __sock_cmsg_send(struct sock *sk, 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;