| Message ID | 20240127220032.5347-1-stephen@networkplumber.org (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 69e3b2fadcd32683db2942f31fe41f0fbb2185f8 |
| Delegated to: | David Ahern |
| Headers | show |
| Series | [iproute2] bpf: fix warning from basename() | expand |
| Context | Check | Description |
|---|---|---|
| netdev/tree_selection | success | Not a local patch |
Hello: This patch was applied to iproute2/iproute2.git (main) by Stephen Hemminger <stephen@networkplumber.org>: On Sat, 27 Jan 2024 14:00:32 -0800 you wrote: > 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; > > [...] Here is the summary with links: - [iproute2] bpf: fix warning from basename() https://git.kernel.org/pub/scm/network/iproute2/iproute2.git/commit/?id=69e3b2fadcd3 You are awesome, thank you!
diff --git a/lib/bpf_legacy.c b/lib/bpf_legacy.c index 741eec8d4d63..c8da4a3e6b65 100644 --- a/lib/bpf_legacy.c +++ b/lib/bpf_legacy.c @@ -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); }
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 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)