Skip to content

Commit 1d42df1

Browse files
committed
bpf/selftests: Test PTR_TO_RDONLY_MEM
jira VULN-136 cve-pre CVE-2022-0500 commit-author Hao Luo <[email protected]> commit 9497c45 upstream-diff Some conflicts were fixed up because this kernel version doesn't have the weak typed ksyms bpf selftests This test verifies that a ksym of non-struct can not be directly updated. Signed-off-by: Hao Luo <[email protected]> Signed-off-by: Alexei Starovoitov <[email protected]> Acked-by: Andrii Nakryiko <[email protected]> Link: https://lore.kernel.org/bpf/[email protected] (cherry picked from commit 9497c45) Signed-off-by: Brett Mastbergen <[email protected]>
1 parent 9101cf8 commit 1d42df1

File tree

2 files changed

+43
-0
lines changed

2 files changed

+43
-0
lines changed

tools/testing/selftests/bpf/prog_tests/ksyms_btf.c

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
#include <bpf/btf.h>
77
#include "test_ksyms_btf.skel.h"
88
#include "test_ksyms_btf_null_check.skel.h"
9+
#include "test_ksyms_btf_write_check.skel.h"
910

1011
static int duration;
1112

@@ -81,6 +82,16 @@ static void test_null_check(void)
8182
test_ksyms_btf_null_check__destroy(skel);
8283
}
8384

85+
static void test_write_check(void)
86+
{
87+
struct test_ksyms_btf_write_check *skel;
88+
89+
skel = test_ksyms_btf_write_check__open_and_load();
90+
ASSERT_ERR_PTR(skel, "unexpected load of a prog writing to ksym memory\n");
91+
92+
test_ksyms_btf_write_check__destroy(skel);
93+
}
94+
8495
void test_ksyms_btf(void)
8596
{
8697
int percpu_datasec;
@@ -105,4 +116,7 @@ void test_ksyms_btf(void)
105116

106117
if (test__start_subtest("null_check"))
107118
test_null_check();
119+
120+
if (test__start_subtest("write_check"))
121+
test_write_check();
108122
}
Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
// SPDX-License-Identifier: GPL-2.0
2+
/* Copyright (c) 2021 Google */
3+
4+
#include "vmlinux.h"
5+
6+
#include <bpf/bpf_helpers.h>
7+
8+
extern const int bpf_prog_active __ksym; /* int type global var. */
9+
10+
SEC("raw_tp/sys_enter")
11+
int handler(const void *ctx)
12+
{
13+
int *active;
14+
__u32 cpu;
15+
16+
cpu = bpf_get_smp_processor_id();
17+
active = (int *)bpf_per_cpu_ptr(&bpf_prog_active, cpu);
18+
if (active) {
19+
/* Kernel memory obtained from bpf_{per,this}_cpu_ptr
20+
* is read-only, should _not_ pass verification.
21+
*/
22+
/* WRITE_ONCE */
23+
*(volatile int *)active = -1;
24+
}
25+
26+
return 0;
27+
}
28+
29+
char _license[] SEC("license") = "GPL";

0 commit comments

Comments
 (0)