]> git.ipfire.org Git - thirdparty/kernel/stable-queue.git/commitdiff
fuzz cleanup
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 15 Jan 2024 12:17:34 +0000 (13:17 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 15 Jan 2024 12:17:34 +0000 (13:17 +0100)
queue-5.10/net-implement-missing-so_timestamping_new-cmsg-suppo.patch

index 8dd5fa6770bf051488abbf389d2742592ff81c08..89271afd07f57d5bb41961a5981075120cae1324 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 9c3bc24bfdd1f..aa5237a6116e1 100644
 --- a/net/core/sock.c
 +++ b/net/core/sock.c
-@@ -2402,6 +2402,7 @@ int __sock_cmsg_send(struct sock *sk, struct msghdr *msg, struct cmsghdr *cmsg,
+@@ -2395,6 +2395,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 9c3bc24bfdd1f..aa5237a6116e1 100644
                if (cmsg->cmsg_len != CMSG_LEN(sizeof(u32)))
                        return -EINVAL;
  
--- 
-2.43.0
-