netdev - RE: [PATCH bpf] bpf, sockmap, udp: sk_prot needs inuse

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

Message-ID: <60ee2fba31b05_196e22082a@john-XPS-13-9370.notmuch>
Date:   Tue, 13 Jul 2021 17:28:42 -0700
From:   John Fastabend <john.fastabend@...il.com>
To:     Jakub Sitnicki <jakub@...udflare.com>,
        John Fastabend <john.fastabend@...il.com>,
        Daniel Borkmann <daniel@...earbox.net>,
        Lorenz Bauer <lmb@...udflare.com>,
        Alexei Starovoitov <ast@...nel.org>,
        Andrii Nakryiko <andrii@...nel.org>
Cc:     netdev@...r.kernel.org, bpf@...r.kernel.org
Subject: RE: [PATCH bpf] bpf, sockmap, udp: sk_prot needs inuse_idx set for
 proc stats

Jakub Sitnicki wrote:
> Proc socket stats use sk_prot->inuse_idx value to record inuse sock stats.
> We currently do not set this correctly from sockmap side. The result is
> reading sock stats '/proc/net/sockstat' gives incorrect values. The
> socket counter is incremented correctly, but because we don't set the
> counter correctly when we replace sk_prot we may omit the decrement.
> 
> To get the correct inuse_idx value move the core_initcall that initializes
> the udp proto handlers to late_initcall. This way it is initialized after
> UDP has the chance to assign the inuse_idx value from the register protocol
> handler.
> 
> Fixes: 5e21bb4e8125 ("bpf, test: fix NULL pointer dereference on invalid expected_attach_type")
> Signed-off-by: Jakub Sitnicki <jakub@...udflare.com>
> ---
> 
> Missing bit from John's fix [1].
> 
> [1] https://lore.kernel.org/bpf/20210712195546.423990-1-john.fastabend@gmail.com/T/#mba9e0b6aa8dd0c01d7421a084c62ec93c9eea764
> 

Yep. Thanks.

Acked-by: John Fastabend <john.fastabend@...il.com>