]> git.ipfire.org Git - thirdparty/kernel/stable-queue.git/commitdiff
fuzz cleanup in 5.4 queue
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sat, 13 Jan 2024 20:44:52 +0000 (21:44 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sat, 13 Jan 2024 20:44:52 +0000 (21:44 +0100)
queue-5.4/net-implement-missing-so_timestamping_new-cmsg-suppo.patch

index d3949d36e4c5cfc3252bcebfde7eafb19a0d49ae..ee66a5b0a4c0aaeb410de35b5410d8c24541d8d8 100644 (file)
@@ -20,14 +20,12 @@ 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 | 1 +
+ net/core/sock.c |    1 +
  1 file changed, 1 insertion(+)
 
-diff --git a/net/core/sock.c b/net/core/sock.c
-index a3ca522434a6e..42076a3e12c3c 100644
 --- a/net/core/sock.c
 +++ b/net/core/sock.c
-@@ -2310,6 +2310,7 @@ int __sock_cmsg_send(struct sock *sk, struct msghdr *msg, struct cmsghdr *cmsg,
+@@ -2303,6 +2303,7 @@ int __sock_cmsg_send(struct sock *sk, st
                sockc->mark = *(u32 *)CMSG_DATA(cmsg);
                break;
        case SO_TIMESTAMPING_OLD:
@@ -35,6 +33,3 @@ index a3ca522434a6e..42076a3e12c3c 100644
                if (cmsg->cmsg_len != CMSG_LEN(sizeof(u32)))
                        return -EINVAL;
  
--- 
-2.43.0
-