leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

libbpf: remove unnecessary cast-to-void

Browse Source 
The patches with fixes tags added a cast-to-void in the places when
the return value of a function was ignored.

This is not common practice in the kernel, and is therefore removed in
this patch.

Reported-by: Daniel Borkmann <daniel@iogearbox.net>
Fixes: 5750902a6e ("libbpf: proper XSKMAP cleanup")
Fixes: 0e6741f092 ("libbpf: fix invalid munmap call")
Signed-off-by: Björn Töpel <bjorn.topel@intel.com>
Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
This commit is contained in:
Björn Töpel
2019-05-06 11:24:43 +02:00
committed by Daniel Borkmann
parent 581b31c36c
commit d24ed99b3b
1 changed files with 10 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
tools/lib/bpf/xsk.c
View File

@@ -459,8 +459,8 @@ static void xsk_clear_bpf_maps(struct xsk_socket *xsk)
{ {
int qid = false; int qid = false;
(void)bpf_map_update_elem(xsk->qidconf_map_fd, &xsk->queue_id, &qid, 0); bpf_map_update_elem(xsk->qidconf_map_fd, &xsk->queue_id, &qid, 0);
(void)bpf_map_delete_elem(xsk->xsks_map_fd, &xsk->queue_id); bpf_map_delete_elem(xsk->xsks_map_fd, &xsk->queue_id);
} }
static int xsk_set_bpf_maps(struct xsk_socket *xsk) static int xsk_set_bpf_maps(struct xsk_socket *xsk)
@@ -686,12 +686,10 @@ int xsk_umem__delete(struct xsk_umem *umem)
optlen = sizeof(off); optlen = sizeof(off);
err = getsockopt(umem->fd, SOL_XDP, XDP_MMAP_OFFSETS, &off, &optlen); err = getsockopt(umem->fd, SOL_XDP, XDP_MMAP_OFFSETS, &off, &optlen);
if (!err) { if (!err) {
(void)munmap(umem->fill->ring - off.fr.desc, munmap(umem->fill->ring - off.fr.desc,
off.fr.desc + off.fr.desc + umem->config.fill_size * sizeof(__u64));
umem->config.fill_size * sizeof(__u64)); munmap(umem->comp->ring - off.cr.desc,
(void)munmap(umem->comp->ring - off.cr.desc, off.cr.desc + umem->config.comp_size * sizeof(__u64));
off.cr.desc +
umem->config.comp_size * sizeof(__u64));
} }
close(umem->fd); close(umem->fd);
@@ -717,14 +715,12 @@ void xsk_socket__delete(struct xsk_socket *xsk)
err = getsockopt(xsk->fd, SOL_XDP, XDP_MMAP_OFFSETS, &off, &optlen); err = getsockopt(xsk->fd, SOL_XDP, XDP_MMAP_OFFSETS, &off, &optlen);
if (!err) { if (!err) {
if (xsk->rx) { if (xsk->rx) {
(void)munmap(xsk->rx->ring - off.rx.desc, munmap(xsk->rx->ring - off.rx.desc,
off.rx.desc + off.rx.desc + xsk->config.rx_size * desc_sz);
xsk->config.rx_size * desc_sz);
} }
if (xsk->tx) { if (xsk->tx) {
(void)munmap(xsk->tx->ring - off.tx.desc, munmap(xsk->tx->ring - off.tx.desc,
off.tx.desc + off.tx.desc + xsk->config.tx_size * desc_sz);
xsk->config.tx_size * desc_sz);
} }
} }