netdev - Re: pull-request: bpf-next 2020-03-30

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-prev] [day] [month] [year] [list]

Date:   Mon, 30 Mar 2020 20:11:05 -0700
From:   Alexei Starovoitov <alexei.starovoitov@...il.com>
To:     David Miller <davem@...emloft.net>
Cc:     ast@...nel.org, daniel@...earbox.net, netdev@...r.kernel.org,
        bpf@...r.kernel.org, kernel-team@...com
Subject: Re: pull-request: bpf-next 2020-03-30

On Mon, Mar 30, 2020 at 07:54:00PM -0700, David Miller wrote:
> From: Alexei Starovoitov <ast@...nel.org>
> Date: Mon, 30 Mar 2020 18:28:15 -0700
> 
> > The following pull-request contains BPF updates for your *net-next* tree.
> > 
> > We've added 73 non-merge commits during the last 14 day(s) which contain
> > a total of 107 files changed, 6086 insertions(+), 1728 deletions(-).
> > 
> > The main changes are:
>  ...
> > Please consider pulling these changes from:
> > 
> >   git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next.git
> 
> Pulled, there was a minor merge conflict in the cgroup changes, which I
> resolved like this:
> 
> @@@ -305,10 -418,9 +421,9 @@@ int __cgroup_bpf_attach(struct cgroup *
>         u32 saved_flags = (flags & (BPF_F_ALLOW_OVERRIDE | BPF_F_ALLOW_MULTI));
>         struct list_head *progs = &cgrp->bpf.progs[type];
>         struct bpf_prog *old_prog = NULL;
>  -      struct bpf_cgroup_storage *storage[MAX_BPF_CGROUP_STORAGE_TYPE],
>  -              *old_storage[MAX_BPF_CGROUP_STORAGE_TYPE] = {NULL};
>  +      struct bpf_cgroup_storage *storage[MAX_BPF_CGROUP_STORAGE_TYPE] = {};
>  +      struct bpf_cgroup_storage *old_storage[MAX_BPF_CGROUP_STORAGE_TYPE] = {};
> -       struct bpf_prog_list *pl, *replace_pl = NULL;
> -       enum bpf_cgroup_storage_type stype;
> +       struct bpf_prog_list *pl;

Right. Forgot to mention this merge conflict.
The resolution is correct.
Same as what Stephen did here:
https://lore.kernel.org/lkml/20200331114005.5e2fc6f7@canb.auug.org.au/

Thanks!