lkml.org 
[lkml]   [2021]   [May]   [12]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.10 357/530] libbpf: Add explicit padding to bpf_xdp_set_link_opts
    Date
    From: Andrii Nakryiko <andrii@kernel.org>

    [ Upstream commit dde7b3f5f2f458297aeccfd4783e53ab8ca046db ]

    Adding such anonymous padding fixes the issue with uninitialized portions of
    bpf_xdp_set_link_opts when using LIBBPF_DECLARE_OPTS macro with inline field
    initialization:

    DECLARE_LIBBPF_OPTS(bpf_xdp_set_link_opts, opts, .old_fd = -1);

    When such code is compiled in debug mode, compiler is generating code that
    leaves padding bytes uninitialized, which triggers error inside libbpf APIs
    that do strict zero initialization checks for OPTS structs.

    Adding anonymous padding field fixes the issue.

    Fixes: bd5ca3ef93cd ("libbpf: Add function to set link XDP fd while specifying old program")
    Signed-off-by: Andrii Nakryiko <andrii@kernel.org>
    Signed-off-by: Alexei Starovoitov <ast@kernel.org>
    Link: https://lore.kernel.org/bpf/20210313210920.1959628-2-andrii@kernel.org
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    tools/lib/bpf/libbpf.h | 1 +
    1 file changed, 1 insertion(+)

    diff --git a/tools/lib/bpf/libbpf.h b/tools/lib/bpf/libbpf.h
    index 6909ee81113a..57d10b779dea 100644
    --- a/tools/lib/bpf/libbpf.h
    +++ b/tools/lib/bpf/libbpf.h
    @@ -507,6 +507,7 @@ struct xdp_link_info {
    struct bpf_xdp_set_link_opts {
    size_t sz;
    int old_fd;
    + size_t :0;
    };
    #define bpf_xdp_set_link_opts__last_field old_fd

    --
    2.30.2


    \
     
     \ /
      Last update: 2021-05-12 19:01    [W:3.714 / U:1.616 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site