]> git.ipfire.org Git - thirdparty/iproute2.git/commitdiff
bpf: fix warning from basename()
authorStephen Hemminger <stephen@networkplumber.org>
Sat, 27 Jan 2024 21:58:14 +0000 (13:58 -0800)
committerStephen Hemminger <stephen@networkplumber.org>
Sat, 27 Jan 2024 21:59:49 +0000 (13:59 -0800)
The function basename() expects a mutable character string,
which now causes a warning:

bpf_legacy.c: In function ‘bpf_load_common’:
bpf_legacy.c:975:38: warning: passing argument 1 of ‘__xpg_basename’ discards ‘const’ qualifier from pointer target type [-Wdiscarded-qualifiers]
  975 |                          basename(cfg->object), cfg->mode == EBPF_PINNED ?
      |                                   ~~~^~~~~~~~
In file included from bpf_legacy.c:21:
/usr/include/libgen.h:34:36: note: expected ‘char *’ but argument is of type ‘const char *’
   34 | extern char *__xpg_basename (char *__path) __THROW;

Fixes: f20ff2f19552 ("bpf: keep parsed program mode in struct bpf_cfg_in")
Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
lib/bpf_legacy.c

index 741eec8d4d63c9fd257bcb92397b71c5b16bd713..c8da4a3e6b65f61ab81af0844a5f2b4671c07c2b 100644 (file)
@@ -972,8 +972,8 @@ int bpf_load_common(struct bpf_cfg_in *cfg, const struct bpf_cfg_ops *ops,
                ops->cbpf_cb(nl, cfg->opcodes, cfg->n_opcodes);
        if (cfg->mode == EBPF_OBJECT || cfg->mode == EBPF_PINNED) {
                snprintf(annotation, sizeof(annotation), "%s:[%s]",
-                        basename(cfg->object), cfg->mode == EBPF_PINNED ?
-                        "*fsobj" : cfg->section);
+                        basename(strdupa(cfg->object)),
+                        cfg->mode == EBPF_PINNED ? "*fsobj" : cfg->section);
                ops->ebpf_cb(nl, cfg->prog_fd, annotation);
        }