Skip to content

DLPX-87970 Move Delphix annotations to linux-pkg to reduce merge conflicts#32

Merged
palash-gandhi merged 1 commit into
developfrom
dlpx/pr/palash-delphix/4ec54f99-9354-422b-b1b8-705f69f54cf6
Sep 19, 2023
Merged

DLPX-87970 Move Delphix annotations to linux-pkg to reduce merge conflicts#32
palash-gandhi merged 1 commit into
developfrom
dlpx/pr/palash-delphix/4ec54f99-9354-422b-b1b8-705f69f54cf6

Conversation

@palash-gandhi
Copy link
Copy Markdown
Contributor

@palash-gandhi palash-gandhi commented Sep 15, 2023 •
edited
Loading

Problem

delphix/linux-kernel-aws#46 and it's side ports introduced a potential for merge conflicts in the base annotations file. If upstream changes that file, we are bound to hit a merge conflict when updating our repos because the include line is at the end of the file. Moving it to the top result in an unwanted configuration - where upstream's annotations overrides Delphix's annotations. We want Delphix's annotations to be processed at the very end.

Solution

delphix/linux-pkg#300 moves Delphix's custom annotations file into the linux-pkg repo. This change modifies the kernel repo to remove it.

Testing Done

See delphix/linux-pkg#300 for testing.

@palash-gandhi palash-gandhi force-pushed the dlpx/pr/palash-delphix/4ec54f99-9354-422b-b1b8-705f69f54cf6 branch from 3080483 to c89f58d Compare September 15, 2023 01:12
@palash-gandhi palash-gandhi marked this pull request as ready for review September 15, 2023 01:16
@palash-gandhi palash-gandhi mentioned this pull request Sep 15, 2023
Merged
@palash-gandhi palash-gandhi merged commit 4d231bb into develop Sep 19, 2023
@palash-gandhi palash-gandhi deleted the dlpx/pr/palash-delphix/4ec54f99-9354-422b-b1b8-705f69f54cf6 branch September 19, 2023 15:03
delphix-devops-bot pushed a commit that referenced this pull request Sep 20, 2023
@palash-gandhi
DLPX-87970 Move Delphix annotations to linux-pkg to reduce merge conf…
5c7693e 
…licts (#32)

PR URL: https://www.github.com/delphix/linux-kernel-gcp/pull/32
delphix-devops-bot pushed a commit that referenced this pull request Oct 6, 2023
@palash-gandhi
DLPX-87970 Move Delphix annotations to linux-pkg to reduce merge conf…
8cfbeb4 
…licts (#32)

PR URL: https://www.github.com/delphix/linux-kernel-gcp/pull/32
delphix-devops-bot pushed a commit that referenced this pull request Oct 25, 2023
@palash-gandhi
DLPX-87970 Move Delphix annotations to linux-pkg to reduce merge conf…
d11287e 
…licts (#32)

PR URL: https://www.github.com/delphix/linux-kernel-gcp/pull/32
delphix-devops-bot pushed a commit that referenced this pull request Oct 26, 2023
@palash-gandhi
DLPX-87970 Move Delphix annotations to linux-pkg to reduce merge conf…
998dff6 
…licts (#32)

PR URL: https://www.github.com/delphix/linux-kernel-gcp/pull/32
delphix-devops-bot pushed a commit that referenced this pull request Oct 27, 2023
@palash-gandhi
DLPX-87970 Move Delphix annotations to linux-pkg to reduce merge conf…
eb7c792 
…licts (#32)

PR URL: https://www.github.com/delphix/linux-kernel-gcp/pull/32
delphix-devops-bot pushed a commit that referenced this pull request Oct 28, 2023
@palash-gandhi
DLPX-87970 Move Delphix annotations to linux-pkg to reduce merge conf…
e569576 
…licts (#32)

PR URL: https://www.github.com/delphix/linux-kernel-gcp/pull/32
delphix-devops-bot pushed a commit that referenced this pull request Nov 1, 2023
@palash-gandhi
DLPX-87970 Move Delphix annotations to linux-pkg to reduce merge conf…
9e1af87 
…licts (#32)

PR URL: https://www.github.com/delphix/linux-kernel-gcp/pull/32
delphix-devops-bot pushed a commit that referenced this pull request Nov 2, 2023
@palash-gandhi
DLPX-87970 Move Delphix annotations to linux-pkg to reduce merge conf…
db94411 
…licts (#32)

PR URL: https://www.github.com/delphix/linux-kernel-gcp/pull/32
prakashsurya pushed a commit that referenced this pull request Dec 6, 2023
@palash-gandhi
DLPX-87970 Move Delphix annotations to linux-pkg to reduce merge conf…
e79fd79 
…licts (#32)

PR URL: https://www.github.com/delphix/linux-kernel-gcp/pull/32
ahrens pushed a commit that referenced this pull request Jan 16, 2024
@palash-gandhi @ahrens
DLPX-87970 Move Delphix annotations to linux-pkg to reduce merge conf…
9516666 
…licts (#32)

PR URL: https://www.github.com/delphix/linux-kernel-gcp/pull/32
delphix-devops-bot pushed a commit that referenced this pull request Jan 27, 2024
@palash-gandhi
DLPX-87970 Move Delphix annotations to linux-pkg to reduce merge conf…
aa0996d 
…licts (#32)

PR URL: https://www.github.com/delphix/linux-kernel-gcp/pull/32
pcd1193182 pushed a commit that referenced this pull request Feb 12, 2024
@palash-gandhi
DLPX-87970 Move Delphix annotations to linux-pkg to reduce merge conf…
ca57af2 
…licts (#32)

PR URL: https://www.github.com/delphix/linux-kernel-gcp/pull/32
pcd1193182 pushed a commit to pcd1193182/linux-kernel-gcp that referenced this pull request Feb 21, 2024
@palash-gandhi
DLPX-87970 Move Delphix annotations to linux-pkg to reduce merge conf…
97c3b59 
…licts (delphix#32)

PR URL: https://www.github.com/delphix/linux-kernel-gcp/pull/32
pcd1193182 pushed a commit to pcd1193182/linux-kernel-gcp that referenced this pull request Mar 1, 2024
@palash-gandhi
DLPX-87970 Move Delphix annotations to linux-pkg to reduce merge conf…
39a7609 
…licts (delphix#32)

PR URL: https://www.github.com/delphix/linux-kernel-gcp/pull/32
delphix-devops-bot pushed a commit that referenced this pull request Mar 2, 2024
@palash-gandhi
DLPX-87970 Move Delphix annotations to linux-pkg to reduce merge conf…
ee9d73b 
…licts (#32)

PR URL: https://www.github.com/delphix/linux-kernel-gcp/pull/32
delphix-devops-bot pushed a commit that referenced this pull request Mar 3, 2024
@palash-gandhi
DLPX-87970 Move Delphix annotations to linux-pkg to reduce merge conf…
de4185a 
…licts (#32)

PR URL: https://www.github.com/delphix/linux-kernel-gcp/pull/32
delphix-devops-bot pushed a commit that referenced this pull request Mar 9, 2024
@palash-gandhi
DLPX-87970 Move Delphix annotations to linux-pkg to reduce merge conf…
b5ce353 
…licts (#32)

PR URL: https://www.github.com/delphix/linux-kernel-gcp/pull/32
grwilson pushed a commit that referenced this pull request Mar 23, 2024
@palash-gandhi
DLPX-87970 Move Delphix annotations to linux-pkg to reduce merge conf…
c155a88 
…licts (#32)

PR URL: https://www.github.com/delphix/linux-kernel-gcp/pull/32
prakashsurya pushed a commit that referenced this pull request Mar 26, 2024
@palash-gandhi
DLPX-87970 Move Delphix annotations to linux-pkg to reduce merge conf…
d69c9f8 
…licts (#32)

PR URL: https://www.github.com/delphix/linux-kernel-gcp/pull/32
jwk404 pushed a commit that referenced this pull request Apr 14, 2024
@palash-gandhi @jwk404
DLPX-87970 Move Delphix annotations to linux-pkg to reduce merge conf…
6e589fc 
…licts (#32)

PR URL: https://www.github.com/delphix/linux-kernel-gcp/pull/32
jwk404 pushed a commit that referenced this pull request Apr 15, 2024
@palash-gandhi @jwk404
DLPX-87970 Move Delphix annotations to linux-pkg to reduce merge conf…
687d6a6 
…licts (#32)

PR URL: https://www.github.com/delphix/linux-kernel-gcp/pull/32
jwk404 pushed a commit that referenced this pull request Apr 15, 2024
@palash-gandhi @jwk404
DLPX-87970 Move Delphix annotations to linux-pkg to reduce merge conf…
8300da8 
…licts (#32)

PR URL: https://www.github.com/delphix/linux-kernel-gcp/pull/32
delphix-devops-bot pushed a commit that referenced this pull request Aug 22, 2024
@palash-gandhi
DLPX-87970 Move Delphix annotations to linux-pkg to reduce merge conf…
36dc6fc 
…licts (#32)

PR URL: https://www.github.com/delphix/linux-kernel-gcp/pull/32
delphix-devops-bot pushed a commit that referenced this pull request Aug 23, 2024
@palash-gandhi
DLPX-87970 Move Delphix annotations to linux-pkg to reduce merge conf…
e624d80 
…licts (#32)

PR URL: https://www.github.com/delphix/linux-kernel-gcp/pull/32
delphix-devops-bot pushed a commit that referenced this pull request Sep 14, 2024
@roxanan1996
inet_diag: Initialize pad field in struct inet_diag_req_v2
fcca67a 
BugLink: https://bugs.launchpad.net/bugs/2075170

[ Upstream commit 61cf1c7 ]

KMSAN reported uninit-value access in raw_lookup() [1]. Diag for raw
sockets uses the pad field in struct inet_diag_req_v2 for the
underlying protocol. This field corresponds to the sdiag_raw_protocol
field in struct inet_diag_req_raw.

inet_diag_get_exact_compat() converts inet_diag_req to
inet_diag_req_v2, but leaves the pad field uninitialized. So the issue
occurs when raw_lookup() accesses the sdiag_raw_protocol field.

Fix this by initializing the pad field in
inet_diag_get_exact_compat(). Also, do the same fix in
inet_diag_dump_compat() to avoid the similar issue in the future.

[1]
BUG: KMSAN: uninit-value in raw_lookup net/ipv4/raw_diag.c:49 [inline]
BUG: KMSAN: uninit-value in raw_sock_get+0x657/0x800 net/ipv4/raw_diag.c:71
 raw_lookup net/ipv4/raw_diag.c:49 [inline]
 raw_sock_get+0x657/0x800 net/ipv4/raw_diag.c:71
 raw_diag_dump_one+0xa1/0x660 net/ipv4/raw_diag.c:99
 inet_diag_cmd_exact+0x7d9/0x980
 inet_diag_get_exact_compat net/ipv4/inet_diag.c:1404 [inline]
 inet_diag_rcv_msg_compat+0x469/0x530 net/ipv4/inet_diag.c:1426
 sock_diag_rcv_msg+0x23d/0x740 net/core/sock_diag.c:282
 netlink_rcv_skb+0x537/0x670 net/netlink/af_netlink.c:2564
 sock_diag_rcv+0x35/0x40 net/core/sock_diag.c:297
 netlink_unicast_kernel net/netlink/af_netlink.c:1335 [inline]
 netlink_unicast+0xe74/0x1240 net/netlink/af_netlink.c:1361
 netlink_sendmsg+0x10c6/0x1260 net/netlink/af_netlink.c:1905
 sock_sendmsg_nosec net/socket.c:730 [inline]
 __sock_sendmsg+0x332/0x3d0 net/socket.c:745
 ____sys_sendmsg+0x7f0/0xb70 net/socket.c:2585
 ___sys_sendmsg+0x271/0x3b0 net/socket.c:2639
 __sys_sendmsg net/socket.c:2668 [inline]
 __do_sys_sendmsg net/socket.c:2677 [inline]
 __se_sys_sendmsg net/socket.c:2675 [inline]
 __x64_sys_sendmsg+0x27e/0x4a0 net/socket.c:2675
 x64_sys_call+0x135e/0x3ce0 arch/x86/include/generated/asm/syscalls_64.h:47
 do_syscall_x64 arch/x86/entry/common.c:52 [inline]
 do_syscall_64+0xd9/0x1e0 arch/x86/entry/common.c:83
 entry_SYSCALL_64_after_hwframe+0x77/0x7f

Uninit was stored to memory at:
 raw_sock_get+0x650/0x800 net/ipv4/raw_diag.c:71
 raw_diag_dump_one+0xa1/0x660 net/ipv4/raw_diag.c:99
 inet_diag_cmd_exact+0x7d9/0x980
 inet_diag_get_exact_compat net/ipv4/inet_diag.c:1404 [inline]
 inet_diag_rcv_msg_compat+0x469/0x530 net/ipv4/inet_diag.c:1426
 sock_diag_rcv_msg+0x23d/0x740 net/core/sock_diag.c:282
 netlink_rcv_skb+0x537/0x670 net/netlink/af_netlink.c:2564
 sock_diag_rcv+0x35/0x40 net/core/sock_diag.c:297
 netlink_unicast_kernel net/netlink/af_netlink.c:1335 [inline]
 netlink_unicast+0xe74/0x1240 net/netlink/af_netlink.c:1361
 netlink_sendmsg+0x10c6/0x1260 net/netlink/af_netlink.c:1905
 sock_sendmsg_nosec net/socket.c:730 [inline]
 __sock_sendmsg+0x332/0x3d0 net/socket.c:745
 ____sys_sendmsg+0x7f0/0xb70 net/socket.c:2585
 ___sys_sendmsg+0x271/0x3b0 net/socket.c:2639
 __sys_sendmsg net/socket.c:2668 [inline]
 __do_sys_sendmsg net/socket.c:2677 [inline]
 __se_sys_sendmsg net/socket.c:2675 [inline]
 __x64_sys_sendmsg+0x27e/0x4a0 net/socket.c:2675
 x64_sys_call+0x135e/0x3ce0 arch/x86/include/generated/asm/syscalls_64.h:47
 do_syscall_x64 arch/x86/entry/common.c:52 [inline]
 do_syscall_64+0xd9/0x1e0 arch/x86/entry/common.c:83
 entry_SYSCALL_64_after_hwframe+0x77/0x7f

Local variable req.i created at:
 inet_diag_get_exact_compat net/ipv4/inet_diag.c:1396 [inline]
 inet_diag_rcv_msg_compat+0x2a6/0x530 net/ipv4/inet_diag.c:1426
 sock_diag_rcv_msg+0x23d/0x740 net/core/sock_diag.c:282

CPU: 1 PID: 8888 Comm: syz-executor.6 Not tainted 6.10.0-rc4-00217-g35bb670d65fc #32
Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS 1.16.3-2.fc40 04/01/2014

Fixes: 432490f ("net: ip, diag -- Add diag interface for raw sockets")
Reported-by: syzkaller <syzkaller@googlegroups.com>
Signed-off-by: Shigeru Yoshida <syoshida@redhat.com>
Reviewed-by: Eric Dumazet <edumazet@google.com>
Link: https://patch.msgid.link/20240703091649.111773-1-syoshida@redhat.com
Signed-off-by: Paolo Abeni <pabeni@redhat.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
Signed-off-by: Manuel Diewald <manuel.diewald@canonical.com>
Signed-off-by: Stefan Bader <stefan.bader@canonical.com>
prakashsurya pushed a commit that referenced this pull request Sep 23, 2024
@palash-gandhi @prakashsurya
DLPX-87970 Move Delphix annotations to linux-pkg to reduce merge conf…
9e9f911 
…licts (#32)

PR URL: https://www.github.com/delphix/linux-kernel-gcp/pull/32
delphix-devops-bot pushed a commit that referenced this pull request Oct 20, 2024
@palash-gandhi
DLPX-87970 Move Delphix annotations to linux-pkg to reduce merge conf…
1e76174 
…licts (#32)

PR URL: https://www.github.com/delphix/linux-kernel-gcp/pull/32
delphix-devops-bot pushed a commit that referenced this pull request Oct 21, 2024
@palash-gandhi
DLPX-87970 Move Delphix annotations to linux-pkg to reduce merge conf…
fbcbe6f 
…licts (#32)

PR URL: https://www.github.com/delphix/linux-kernel-gcp/pull/32
palash-gandhi added a commit that referenced this pull request Oct 24, 2024
@palash-gandhi
DLPX-87970 Move Delphix annotations to linux-pkg to reduce merge conf…
60cf699 
…licts (#32)

PR URL: https://www.github.com/delphix/linux-kernel-gcp/pull/32
delphix-devops-bot pushed a commit that referenced this pull request Nov 10, 2024
@palash-gandhi
DLPX-87970 Move Delphix annotations to linux-pkg to reduce merge conf…
21c3ea7 
…licts (#32)

PR URL: https://www.github.com/delphix/linux-kernel-gcp/pull/32
delphix-devops-bot pushed a commit that referenced this pull request Nov 11, 2024
@palash-gandhi
DLPX-87970 Move Delphix annotations to linux-pkg to reduce merge conf…
5f15cdb 
…licts (#32)

PR URL: https://www.github.com/delphix/linux-kernel-gcp/pull/32
delphix-devops-bot pushed a commit that referenced this pull request Dec 18, 2024
@palash-gandhi
DLPX-87970 Move Delphix annotations to linux-pkg to reduce merge conf…
f1d92f1 
…licts (#32)

PR URL: https://www.github.com/delphix/linux-kernel-gcp/pull/32
delphix-devops-bot pushed a commit that referenced this pull request Dec 19, 2024
@palash-gandhi
DLPX-87970 Move Delphix annotations to linux-pkg to reduce merge conf…
3cbca60 
…licts (#32)

PR URL: https://www.github.com/delphix/linux-kernel-gcp/pull/32
delphix-devops-bot pushed a commit that referenced this pull request Dec 20, 2024
@palash-gandhi
DLPX-87970 Move Delphix annotations to linux-pkg to reduce merge conf…
b0ad424 
…licts (#32)

PR URL: https://www.github.com/delphix/linux-kernel-gcp/pull/32
delphix-devops-bot pushed a commit that referenced this pull request Dec 21, 2024
@palash-gandhi
DLPX-87970 Move Delphix annotations to linux-pkg to reduce merge conf…
2d6484b 
…licts (#32)

PR URL: https://www.github.com/delphix/linux-kernel-gcp/pull/32
delphix-devops-bot pushed a commit that referenced this pull request Dec 22, 2024
@palash-gandhi
DLPX-87970 Move Delphix annotations to linux-pkg to reduce merge conf…
93c33d2 
…licts (#32)

PR URL: https://www.github.com/delphix/linux-kernel-gcp/pull/32
delphix-devops-bot pushed a commit that referenced this pull request Dec 23, 2024
@palash-gandhi
DLPX-87970 Move Delphix annotations to linux-pkg to reduce merge conf…
46bca0a 
…licts (#32)

PR URL: https://www.github.com/delphix/linux-kernel-gcp/pull/32
delphix-devops-bot pushed a commit that referenced this pull request Dec 24, 2024
@palash-gandhi
DLPX-87970 Move Delphix annotations to linux-pkg to reduce merge conf…
90c880c 
…licts (#32)

PR URL: https://www.github.com/delphix/linux-kernel-gcp/pull/32
delphix-devops-bot pushed a commit that referenced this pull request Dec 25, 2024
@palash-gandhi
DLPX-87970 Move Delphix annotations to linux-pkg to reduce merge conf…
5bec2a8 
…licts (#32)

PR URL: https://www.github.com/delphix/linux-kernel-gcp/pull/32
delphix-devops-bot pushed a commit that referenced this pull request Dec 26, 2024
@palash-gandhi
DLPX-87970 Move Delphix annotations to linux-pkg to reduce merge conf…
c49a44e 
…licts (#32)

PR URL: https://www.github.com/delphix/linux-kernel-gcp/pull/32
delphix-devops-bot pushed a commit that referenced this pull request Dec 27, 2024
@palash-gandhi
DLPX-87970 Move Delphix annotations to linux-pkg to reduce merge conf…
bb27f53 
…licts (#32)

PR URL: https://www.github.com/delphix/linux-kernel-gcp/pull/32
delphix-devops-bot pushed a commit that referenced this pull request Dec 28, 2024
@palash-gandhi
DLPX-87970 Move Delphix annotations to linux-pkg to reduce merge conf…
1a22e3d 
…licts (#32)

PR URL: https://www.github.com/delphix/linux-kernel-gcp/pull/32
delphix-devops-bot pushed a commit that referenced this pull request Dec 29, 2024
@palash-gandhi
DLPX-87970 Move Delphix annotations to linux-pkg to reduce merge conf…
f1ab2dd 
…licts (#32)

PR URL: https://www.github.com/delphix/linux-kernel-gcp/pull/32
delphix-devops-bot pushed a commit that referenced this pull request Dec 30, 2024
@palash-gandhi
DLPX-87970 Move Delphix annotations to linux-pkg to reduce merge conf…
32e6efd 
…licts (#32)

PR URL: https://www.github.com/delphix/linux-kernel-gcp/pull/32
delphix-devops-bot pushed a commit that referenced this pull request Dec 31, 2024
@palash-gandhi
DLPX-87970 Move Delphix annotations to linux-pkg to reduce merge conf…
ac69608 
…licts (#32)

PR URL: https://www.github.com/delphix/linux-kernel-gcp/pull/32
delphix-devops-bot pushed a commit that referenced this pull request Jan 1, 2025
@palash-gandhi
DLPX-87970 Move Delphix annotations to linux-pkg to reduce merge conf…
bf80543 
…licts (#32)

PR URL: https://www.github.com/delphix/linux-kernel-gcp/pull/32
delphix-devops-bot pushed a commit that referenced this pull request Jan 2, 2025
@palash-gandhi
DLPX-87970 Move Delphix annotations to linux-pkg to reduce merge conf…
c6dff8e 
…licts (#32)

PR URL: https://www.github.com/delphix/linux-kernel-gcp/pull/32
delphix-devops-bot pushed a commit that referenced this pull request Jan 3, 2025
@palash-gandhi
DLPX-87970 Move Delphix annotations to linux-pkg to reduce merge conf…
89e400a 
…licts (#32)

PR URL: https://www.github.com/delphix/linux-kernel-gcp/pull/32
delphix-devops-bot pushed a commit that referenced this pull request Jan 4, 2025
@palash-gandhi
DLPX-87970 Move Delphix annotations to linux-pkg to reduce merge conf…
596d440 
…licts (#32)

PR URL: https://www.github.com/delphix/linux-kernel-gcp/pull/32
delphix-devops-bot pushed a commit that referenced this pull request Jan 5, 2025
@palash-gandhi
DLPX-87970 Move Delphix annotations to linux-pkg to reduce merge conf…
5b5c82f 
…licts (#32)

PR URL: https://www.github.com/delphix/linux-kernel-gcp/pull/32
delphix-devops-bot pushed a commit that referenced this pull request Jan 6, 2025
@palash-gandhi
DLPX-87970 Move Delphix annotations to linux-pkg to reduce merge conf…
09ffed9 
…licts (#32)

PR URL: https://www.github.com/delphix/linux-kernel-gcp/pull/32
delphix-devops-bot pushed a commit that referenced this pull request Jan 7, 2025
@palash-gandhi
DLPX-87970 Move Delphix annotations to linux-pkg to reduce merge conf…
2099c32 
…licts (#32)

PR URL: https://www.github.com/delphix/linux-kernel-gcp/pull/32
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@prakashsurya prakashsurya prakashsurya approved these changes

@sebroy sebroy sebroy approved these changes

Assignees

No one assigned

Labels

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@palash-gandhi @prakashsurya @sebroy