netdev - linux-next: manual merge of the net-next tree with the bpf 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>] [day] [month] [year] [list]

Message-ID: <20220923104538.4e159c3a@canb.auug.org.au>
Date:   Fri, 23 Sep 2022 10:45:38 +1000
From:   Stephen Rothwell <sfr@...b.auug.org.au>
To:     David Miller <davem@...emloft.net>,
        Daniel Borkmann <daniel@...earbox.net>,
        Alexei Starovoitov <ast@...nel.org>,
        Andrii Nakryiko <andrii@...nel.org>
Cc:     bpf <bpf@...r.kernel.org>, Networking <netdev@...r.kernel.org>,
        Kumar Kartikeya Dwivedi <memxor@...il.com>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Linux Next Mailing List <linux-next@...r.kernel.org>,
        Stanislav Fomichev <sdf@...gle.com>
Subject: linux-next: manual merge of the net-next tree with the bpf tree

Hi all,

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

  kernel/bpf/helpers.c

between commit:

  8addbfc7b308 ("bpf: Gate dynptr API behind CAP_BPF")

from the bpf tree and commits:

  8a67f2de9b1d ("bpf: expose bpf_strtol and bpf_strtoul to all program types")
  5679ff2f138f ("bpf: Move bpf_loop and bpf_for_each_map_elem under CAP_BPF")

from the net-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/helpers.c
index 3814b0fd3a2c,fc08035f14ed..000000000000
--- a/kernel/bpf/helpers.c
+++ b/kernel/bpf/helpers.c
@@@ -1627,12 -1607,26 +1607,12 @@@ bpf_base_func_proto(enum bpf_func_id fu
  		return &bpf_ringbuf_discard_proto;
  	case BPF_FUNC_ringbuf_query:
  		return &bpf_ringbuf_query_proto;
- 	case BPF_FUNC_for_each_map_elem:
- 		return &bpf_for_each_map_elem_proto;
- 	case BPF_FUNC_loop:
- 		return &bpf_loop_proto;
 -	case BPF_FUNC_ringbuf_reserve_dynptr:
 -		return &bpf_ringbuf_reserve_dynptr_proto;
 -	case BPF_FUNC_ringbuf_submit_dynptr:
 -		return &bpf_ringbuf_submit_dynptr_proto;
 -	case BPF_FUNC_ringbuf_discard_dynptr:
 -		return &bpf_ringbuf_discard_dynptr_proto;
  	case BPF_FUNC_strncmp:
  		return &bpf_strncmp_proto;
+ 	case BPF_FUNC_strtol:
+ 		return &bpf_strtol_proto;
+ 	case BPF_FUNC_strtoul:
+ 		return &bpf_strtoul_proto;
 -	case BPF_FUNC_dynptr_from_mem:
 -		return &bpf_dynptr_from_mem_proto;
 -	case BPF_FUNC_dynptr_read:
 -		return &bpf_dynptr_read_proto;
 -	case BPF_FUNC_dynptr_write:
 -		return &bpf_dynptr_write_proto;
 -	case BPF_FUNC_dynptr_data:
 -		return &bpf_dynptr_data_proto;
  	default:
  		break;
  	}
@@@ -1661,20 -1655,10 +1641,24 @@@
  		return &bpf_timer_cancel_proto;
  	case BPF_FUNC_kptr_xchg:
  		return &bpf_kptr_xchg_proto;
 +	case BPF_FUNC_ringbuf_reserve_dynptr:
 +		return &bpf_ringbuf_reserve_dynptr_proto;
 +	case BPF_FUNC_ringbuf_submit_dynptr:
 +		return &bpf_ringbuf_submit_dynptr_proto;
 +	case BPF_FUNC_ringbuf_discard_dynptr:
 +		return &bpf_ringbuf_discard_dynptr_proto;
 +	case BPF_FUNC_dynptr_from_mem:
 +		return &bpf_dynptr_from_mem_proto;
 +	case BPF_FUNC_dynptr_read:
 +		return &bpf_dynptr_read_proto;
 +	case BPF_FUNC_dynptr_write:
 +		return &bpf_dynptr_write_proto;
 +	case BPF_FUNC_dynptr_data:
 +		return &bpf_dynptr_data_proto;
+ 	case BPF_FUNC_for_each_map_elem:
+ 		return &bpf_for_each_map_elem_proto;
+ 	case BPF_FUNC_loop:
+ 		return &bpf_loop_proto;
  	default:
  		break;
  	}

Content of type "application/pgp-signature" skipped