Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
merged 1 commit into from
Sep 19, 2023
Merged

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

merged 1 commit into from
Sep 19, 2023

Conversation

palash-gandhi
Copy link
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/43d53b15-628a-4120-b44b-32d7c7a42932 branch from 1693ba7 to 71ba2b4 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 ee9e7eb into develop Sep 19, 2023
@palash-gandhi palash-gandhi deleted the dlpx/pr/palash-delphix/43d53b15-628a-4120-b44b-32d7c7a42932 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…
f7cd9d2 
…licts (#31)

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

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

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

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

PR URL: https://www.github.com/delphix/linux-kernel-generic/pull/31
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…
e2a95dc 
…licts (#31)

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

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

PR URL: https://www.github.com/delphix/linux-kernel-generic/pull/31
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…
0413aae 
…licts (#31)

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

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

PR URL: https://www.github.com/delphix/linux-kernel-generic/pull/31
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…
68f50c8 
…licts (#31)

PR URL: https://www.github.com/delphix/linux-kernel-generic/pull/31
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…
2161d90 
…licts (#31)

PR URL: https://www.github.com/delphix/linux-kernel-generic/pull/31
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…
9ace603 
…licts (#31)

PR URL: https://www.github.com/delphix/linux-kernel-generic/pull/31
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…
ca56c81 
…licts (#31)

PR URL: https://www.github.com/delphix/linux-kernel-generic/pull/31
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…
fcc4a28 
…licts (#31)

PR URL: https://www.github.com/delphix/linux-kernel-generic/pull/31
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…
40b1e0c 
…licts (#31)

PR URL: https://www.github.com/delphix/linux-kernel-generic/pull/31
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…
6dd6bfb 
…licts (#31)

PR URL: https://www.github.com/delphix/linux-kernel-generic/pull/31
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…
6e59457 
…licts (#31)

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

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

PR URL: https://www.github.com/delphix/linux-kernel-generic/pull/31
delphix-devops-bot pushed a commit that referenced this pull request Jun 30, 2024
@q2ven @roxanan1996
arp: Prevent overflow in arp_req_get().
bf5c515 
BugLink: https://bugs.launchpad.net/bugs/2060142

commit a7d6027 upstream.

syzkaller reported an overflown write in arp_req_get(). [0]

When ioctl(SIOCGARP) is issued, arp_req_get() looks up an neighbour
entry and copies neigh->ha to struct arpreq.arp_ha.sa_data.

The arp_ha here is struct sockaddr, not struct sockaddr_storage, so
the sa_data buffer is just 14 bytes.

In the splat below, 2 bytes are overflown to the next int field,
arp_flags.  We initialise the field just after the memcpy(), so it's
not a problem.

However, when dev->addr_len is greater than 22 (e.g. MAX_ADDR_LEN),
arp_netmask is overwritten, which could be set as htonl(0xFFFFFFFFUL)
in arp_ioctl() before calling arp_req_get().

To avoid the overflow, let's limit the max length of memcpy().

Note that commit b5f0de6 ("net: dev: Convert sa_data to flexible
array in struct sockaddr") just silenced syzkaller.

[0]:
memcpy: detected field-spanning write (size 16) of single field "r->arp_ha.sa_data" at net/ipv4/arp.c:1128 (size 14)
WARNING: CPU: 0 PID: 144638 at net/ipv4/arp.c:1128 arp_req_get+0x411/0x4a0 net/ipv4/arp.c:1128
Modules linked in:
CPU: 0 PID: 144638 Comm: syz-executor.4 Not tainted 6.1.74 #31
Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS 1.16.0-debian-1.16.0-5 04/01/2014
RIP: 0010:arp_req_get+0x411/0x4a0 net/ipv4/arp.c:1128
Code: fd ff ff e8 41 42 de fb b9 0e 00 00 00 4c 89 fe 48 c7 c2 20 6d ab 87 48 c7 c7 80 6d ab 87 c6 05 25 af 72 04 01 e8 5f 8d ad fb <0f> 0b e9 6c fd ff ff e8 13 42 de fb be 03 00 00 00 4c 89 e7 e8 a6
RSP: 0018:ffffc900050b7998 EFLAGS: 00010286
RAX: 0000000000000000 RBX: ffff88803a815000 RCX: 0000000000000000
RDX: 0000000000000000 RSI: ffffffff8641a44a RDI: 0000000000000001
RBP: ffffc900050b7a98 R08: 0000000000000001 R09: 0000000000000000
R10: 0000000000000000 R11: 203a7970636d656d R12: ffff888039c54000
R13: 1ffff92000a16f37 R14: ffff88803a815084 R15: 0000000000000010
FS:  00007f172bf306c0(0000) GS:ffff88805aa00000(0000) knlGS:0000000000000000
CS:  0010 DS: 0000 ES: 0000 CR0: 0000000080050033
CR2: 00007f172b3569f0 CR3: 0000000057f12005 CR4: 0000000000770ef0
DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000
DR3: 0000000000000000 DR6: 00000000fffe0ff0 DR7: 0000000000000400
PKRU: 55555554
Call Trace:
 <TASK>
 arp_ioctl+0x33f/0x4b0 net/ipv4/arp.c:1261
 inet_ioctl+0x314/0x3a0 net/ipv4/af_inet.c:981
 sock_do_ioctl+0xdf/0x260 net/socket.c:1204
 sock_ioctl+0x3ef/0x650 net/socket.c:1321
 vfs_ioctl fs/ioctl.c:51 [inline]
 __do_sys_ioctl fs/ioctl.c:870 [inline]
 __se_sys_ioctl fs/ioctl.c:856 [inline]
 __x64_sys_ioctl+0x18e/0x220 fs/ioctl.c:856
 do_syscall_x64 arch/x86/entry/common.c:51 [inline]
 do_syscall_64+0x37/0x90 arch/x86/entry/common.c:81
 entry_SYSCALL_64_after_hwframe+0x64/0xce
RIP: 0033:0x7f172b262b8d
Code: 66 2e 0f 1f 84 00 00 00 00 00 0f 1f 00 f3 0f 1e fa 48 89 f8 48 89 f7 48 89 d6 48 89 ca 4d 89 c2 4d 89 c8 4c 8b 4c 24 08 0f 05 <48> 3d 01 f0 ff ff 73 01 c3 48 c7 c1 b8 ff ff ff f7 d8 64 89 01 48
RSP: 002b:00007f172bf300b8 EFLAGS: 00000246 ORIG_RAX: 0000000000000010
RAX: ffffffffffffffda RBX: 00007f172b3abf80 RCX: 00007f172b262b8d
RDX: 0000000020000000 RSI: 0000000000008954 RDI: 0000000000000003
RBP: 00007f172b2d3493 R08: 0000000000000000 R09: 0000000000000000
R10: 0000000000000000 R11: 0000000000000246 R12: 0000000000000000
R13: 000000000000000b R14: 00007f172b3abf80 R15: 00007f172bf10000
 </TASK>

Reported-by: syzkaller <[email protected]>
Reported-by: Bjoern Doebel <[email protected]>
Fixes: 1da177e ("Linux-2.6.12-rc2")
Signed-off-by: Kuniyuki Iwashima <[email protected]>
Link: https://lore.kernel.org/r/[email protected]
Signed-off-by: Paolo Abeni <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>
CVE-2024-26733
Signed-off-by: Manuel Diewald <[email protected]>
Signed-off-by: Roxana Nicolescu <[email protected]>
delphix-devops-bot pushed a commit that referenced this pull request Jul 31, 2024
@palash-gandhi @manoj-joseph
DLPX-87970 Move Delphix annotations to linux-pkg to reduce merge conf…
bef39d3 
…licts (#31)

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

PR URL: https://www.github.com/delphix/linux-kernel-generic/pull/31
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…
a052787 
…licts (#31)

PR URL: https://www.github.com/delphix/linux-kernel-generic/pull/31
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…
2aebdf2 
…licts (#31)

PR URL: https://www.github.com/delphix/linux-kernel-generic/pull/31
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…
eed6300 
…licts (#31)

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

PR URL: https://www.github.com/delphix/linux-kernel-generic/pull/31
@palash-gandhi palash-gandhi mentioned this pull request Oct 16, 2024
Merged
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…
248bf1d 
…licts (#31)

PR URL: https://www.github.com/delphix/linux-kernel-generic/pull/31
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…
8daa363 
…licts (#31)

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

PR URL: https://www.github.com/delphix/linux-kernel-generic/pull/31
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…
c30cfc0 
…licts (#31)

PR URL: https://www.github.com/delphix/linux-kernel-generic/pull/31
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…
c0a8f8a 
…licts (#31)

PR URL: https://www.github.com/delphix/linux-kernel-generic/pull/31
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…
776aefe 
…licts (#31)

PR URL: https://www.github.com/delphix/linux-kernel-generic/pull/31
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…
684b85f 
…licts (#31)

PR URL: https://www.github.com/delphix/linux-kernel-generic/pull/31
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…
df7cacd 
…licts (#31)

PR URL: https://www.github.com/delphix/linux-kernel-generic/pull/31
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…
5ef45e0 
…licts (#31)

PR URL: https://www.github.com/delphix/linux-kernel-generic/pull/31
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…
38378e8 
…licts (#31)

PR URL: https://www.github.com/delphix/linux-kernel-generic/pull/31
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…
bafd827 
…licts (#31)

PR URL: https://www.github.com/delphix/linux-kernel-generic/pull/31
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…
f39ff6c 
…licts (#31)

PR URL: https://www.github.com/delphix/linux-kernel-generic/pull/31
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…
c4331f3 
…licts (#31)

PR URL: https://www.github.com/delphix/linux-kernel-generic/pull/31
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…
93f6ec3 
…licts (#31)

PR URL: https://www.github.com/delphix/linux-kernel-generic/pull/31
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…
2a21763 
…licts (#31)

PR URL: https://www.github.com/delphix/linux-kernel-generic/pull/31
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…
64624f9 
…licts (#31)

PR URL: https://www.github.com/delphix/linux-kernel-generic/pull/31
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…
4fd9104 
…licts (#31)

PR URL: https://www.github.com/delphix/linux-kernel-generic/pull/31
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…
f16b71d 
…licts (#31)

PR URL: https://www.github.com/delphix/linux-kernel-generic/pull/31
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…
1fa406f 
…licts (#31)

PR URL: https://www.github.com/delphix/linux-kernel-generic/pull/31
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…
f8c2e59 
…licts (#31)

PR URL: https://www.github.com/delphix/linux-kernel-generic/pull/31
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…
cb5ad0c 
…licts (#31)

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

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

PR URL: https://www.github.com/delphix/linux-kernel-generic/pull/31
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