linux-kernel - linux-next: manual merge of the bpf-next tree with the net tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Message-ID: <20240328125500.2582492e@canb.auug.org.au>
Date: Thu, 28 Mar 2024 12:55:00 +1100
From: Stephen Rothwell <sfr@...b.auug.org.au>
To: Daniel Borkmann <daniel@...earbox.net>, Alexei Starovoitov
 <ast@...nel.org>, Andrii Nakryiko <andrii@...nel.org>, David Miller
 <davem@...emloft.net>, Jakub Kicinski <kuba@...nel.org>, Paolo Abeni
 <pabeni@...hat.com>
Cc: bpf <bpf@...r.kernel.org>, Networking <netdev@...r.kernel.org>, Haiyue
 Wang <haiyue.wang@...el.com>, Linux Kernel Mailing List
 <linux-kernel@...r.kernel.org>, Linux Next Mailing List
 <linux-next@...r.kernel.org>
Subject: linux-next: manual merge of the bpf-next tree with the net tree

Hi all,

Today's linux-next merge of the bpf-next tree got a conflict in:

  kernel/bpf/arena.c

between commit:

  ee498a38f317 ("bpf: Clarify bpf_arena comments.")

from the net tree and commit:

  45a683b2d815 ("bpf,arena: Use helper sizeof_field in struct accessors")

from the bpf-next tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

-- 
Cheers,
Stephen Rothwell

diff --cc kernel/bpf/arena.c
index 343c3456c8dd,af5cae640669..000000000000
--- a/kernel/bpf/arena.c
+++ b/kernel/bpf/arena.c
@@@ -37,8 -37,8 +37,8 @@@
   */
  
  /* number of bytes addressable by LDX/STX insn with 16-bit 'off' field */
- #define GUARD_SZ (1ull << sizeof(((struct bpf_insn *)0)->off) * 8)
+ #define GUARD_SZ (1ull << sizeof_field(struct bpf_insn, off) * 8)
 -#define KERN_VM_SZ ((1ull << 32) + GUARD_SZ)
 +#define KERN_VM_SZ (SZ_4G + GUARD_SZ)
  
  struct bpf_arena {
  	struct bpf_map map;

Content of type "application/pgp-signature" skipped