Skip to content

[bpftool] remove BPF_OBJ_NAME_LEN restriction when looking up bpf #32

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
chantra wants to merge 1 commit into from
Closed

[bpftool] remove BPF_OBJ_NAME_LEN restriction when looking up bpf #32

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 12 additions & 6 deletions src/common.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -722,6 +722,7 @@ print_all_levels(__maybe_unused enum libbpf_print_level level,

static int prog_fd_by_nametag(void *nametag, int **fds, bool tag)
{
char prog_name[MAX_PROG_FULL_NAME];
unsigned int id = 0;
int fd, nb_fds = 0;
void *tmp;
Expand Down Expand Up @@ -754,12 +755,21 @@ static int prog_fd_by_nametag(void *nametag, int **fds, bool tag)
goto err_close_fd;
}

if ((tag && memcmp(nametag, info.tag, BPF_TAG_SIZE)) ||
(!tag && strncmp(nametag, info.name, BPF_OBJ_NAME_LEN))) {
if (tag && memcmp(nametag, info.tag, BPF_TAG_SIZE)) {
close(fd);
continue;
}



if(!tag) {
get_prog_full_name(&info, fd, prog_name, sizeof(prog_name));
if(strcmp(nametag, prog_name)){
close(fd);
continue;
}
}

if (nb_fds > 0) {
tmp = realloc(*fds, (nb_fds + 1) * sizeof(int));
if (!tmp) {
Expand Down Expand Up @@ -820,10 +830,6 @@ int prog_parse_fds(int *argc, char ***argv, int **fds)
NEXT_ARGP();

name = **argv;
if (strlen(name) > BPF_OBJ_NAME_LEN - 1) {
p_err("can't parse name");
return -1;
}
NEXT_ARGP();

return prog_fd_by_nametag(name, fds, false);
Expand Down