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

Merge git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf

Browse Source 
Daniel Borkmann says:

====================
pull-request: bpf 2020-08-28

The following pull-request contains BPF updates for your *net* tree.

We've added 4 non-merge commits during the last 4 day(s) which contain
a total of 4 files changed, 7 insertions(+), 4 deletions(-).

The main changes are:

1) Fix out of bounds access for BPF_OBJ_GET_INFO_BY_FD retrieval, from Yonghong Song.

2) Fix wrong __user annotation in bpf_stats sysctl handler, from Tobias Klauser.

3) Few fixes for BPF selftest scripting in test_{progs,maps}, from Jesper Dangaard Brouer.
====================

Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
David S. Miller 2020-08-28 16:12:48 -07:00
commit c8146fe292
4 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
kernel/bpf/syscall.c
View File

@ -2634,7 +2634,7 @@ static int bpf_raw_tp_link_fill_link_info(const struct bpf_link *link,
u32 ulen = info->raw_tracepoint.tp_name_len; u32 ulen = info->raw_tracepoint.tp_name_len;
size_t tp_len = strlen(tp_name); size_t tp_len = strlen(tp_name);
if (ulen && !ubuf) if (!ulen ^ !ubuf)
return -EINVAL; return -EINVAL;
info->raw_tracepoint.tp_name_len = tp_len + 1; info->raw_tracepoint.tp_name_len = tp_len + 1;

3
kernel/sysctl.c
View File

@ -204,8 +204,7 @@ static int max_extfrag_threshold = 1000;
#if defined(CONFIG_BPF_SYSCALL) && defined(CONFIG_SYSCTL) #if defined(CONFIG_BPF_SYSCALL) && defined(CONFIG_SYSCTL)
static int bpf_stats_handler(struct ctl_table *table, int write, static int bpf_stats_handler(struct ctl_table *table, int write,
void __user *buffer, size_t *lenp, void *buffer, size_t *lenp, loff_t *ppos)
loff_t *ppos)
{ {
struct static_key *key = (struct static_key *)table->data; struct static_key *key = (struct static_key *)table->data;
static int saved_val; static int saved_val;

2
tools/testing/selftests/bpf/test_maps.c
View File

@ -1274,6 +1274,8 @@ static void __run_parallel(unsigned int tasks,
pid_t pid[tasks]; pid_t pid[tasks];
int i; int i;
fflush(stdout);
for (i = 0; i < tasks; i++) { for (i = 0; i < tasks; i++) {
pid[i] = fork(); pid[i] = fork();
if (pid[i] == 0) { if (pid[i] == 0) {

4
tools/testing/selftests/bpf/test_progs.c
View File

@ -618,7 +618,9 @@ int cd_flavor_subdir(const char *exec_name)
if (!flavor) if (!flavor)
return 0; return 0;
flavor++; flavor++;
fprintf(stdout, "Switching to flavor '%s' subdirectory...\n", flavor); if (env.verbosity > VERBOSE_NONE)
fprintf(stdout, "Switching to flavor '%s' subdirectory...\n", flavor);
return chdir(flavor); return chdir(flavor);
} }