From: "Björn Töpel" <bjorn.topel@intel.com>
To: Maciej Fijalkowski <maciej.fijalkowski@intel.com>,
daniel@iogearbox.net, ast@kernel.org, bpf@vger.kernel.org
Cc: magnus.karlsson@intel.com, john.fastabend@gmail.com
Subject: Re: [PATCH bpf 3/3] libbpf: clear map_info before each bpf_obj_get_info_by_fd
Date: Wed, 3 Mar 2021 17:33:13 +0100 [thread overview]
Message-ID: <9838f0ef-7430-e2b2-4146-5ec6c9c807bd@intel.com> (raw)
In-Reply-To: <20210303155158.15953-4-maciej.fijalkowski@intel.com>
On 2021-03-03 16:51, Maciej Fijalkowski wrote:
> xsk_lookup_bpf_maps, based on prog_fd, looks whether current prog has a
> reference to XSKMAP. BPF prog can include insns that work on various BPF
> maps and this is covered by iterating through map_ids.
>
> The bpf_map_info that is passed to bpf_obj_get_info_by_fd for filling
> needs to be cleared at each iteration, so that it doesn't contain any
> outdated fields and that is currently missing in the function of
> interest.
>
> To fix that, zero-init map_info via memset before each
> bpf_obj_get_info_by_fd call.
>
> Also, since the area of this code is touched, in general strcmp is
> considered harmful, so let's convert it to strncmp and provide the
> length of the array name from current map_info.
>
> Last but not least, do s/continue/break/ once we have found the xsks_map
> to terminate the search.
>
> Fixes: 5750902a6e9b ("libbpf: proper XSKMAP cleanup")
> Signed-off-by: Maciej Fijalkowski <maciej.fijalkowski@intel.com>
> ---
> tools/lib/bpf/xsk.c | 5 +++--
> 1 file changed, 3 insertions(+), 2 deletions(-)
>
> diff --git a/tools/lib/bpf/xsk.c b/tools/lib/bpf/xsk.c
> index ffbb588724d8..e56b2d76efc2 100644
> --- a/tools/lib/bpf/xsk.c
> +++ b/tools/lib/bpf/xsk.c
> @@ -610,15 +610,16 @@ static int xsk_lookup_bpf_maps(struct xsk_socket *xsk)
> if (fd < 0)
> continue;
>
> + memset(&map_info, 0, map_len);
> err = bpf_obj_get_info_by_fd(fd, &map_info, &map_len);
> if (err) {
> close(fd);
> continue;
> }
>
> - if (!strcmp(map_info.name, "xsks_map")) {
> + if (!strncmp(map_info.name, "xsks_map", strlen(map_info.name))) {
This should be sizeof(map_info.name) and not strlen, otherwise it's kind
of useless! :-P
Björn
> ctx->xsks_map_fd = fd;
> - continue;
> + break;
> }
>
> close(fd);
>
prev parent reply other threads:[~2021-03-03 22:57 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-03-03 15:51 [PATCH bpf 0/3] AF_XDP small fixes Maciej Fijalkowski
2021-03-03 15:51 ` [PATCH bpf 1/3] xsk: remove dangling function declaration from header file Maciej Fijalkowski
2021-03-03 16:33 ` Björn Töpel
2021-03-03 15:51 ` [PATCH bpf 2/3] samples: bpf: add missing munmap in xdpsock Maciej Fijalkowski
2021-03-03 16:33 ` Björn Töpel
2021-03-03 15:51 ` [PATCH bpf 3/3] libbpf: clear map_info before each bpf_obj_get_info_by_fd Maciej Fijalkowski
2021-03-03 16:33 ` Björn Töpel [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=9838f0ef-7430-e2b2-4146-5ec6c9c807bd@intel.com \
--to=bjorn.topel@intel.com \
--cc=ast@kernel.org \
--cc=bpf@vger.kernel.org \
--cc=daniel@iogearbox.net \
--cc=john.fastabend@gmail.com \
--cc=maciej.fijalkowski@intel.com \
--cc=magnus.karlsson@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).