Merge branch 'parisc-4.9-1' of git://git.kernel.org/pub/scm/linux/kernel/git/deller...

[cascardo/linux.git] / samples / bpf / tracex5_kern.c

diff --git a/samples/bpf/tracex5_kern.c b/samples/bpf/tracex5_kern.c
index f95f232..fd12d71 100644 (file)
--- a/samples/bpf/tracex5_kern.c
+++ b/samples/bpf/tracex5_kern.c
@@ -19,20 +19,18 @@ struct bpf_map_def SEC("maps") progs = {
        .max_entries = 1024,
 };
 
-SEC("kprobe/seccomp_phase1")
+SEC("kprobe/__seccomp_filter")
 int bpf_prog1(struct pt_regs *ctx)
 {
-       struct seccomp_data sd;
-
-       bpf_probe_read(&sd, sizeof(sd), (void *)PT_REGS_PARM1(ctx));
+       int sc_nr = (int)PT_REGS_PARM1(ctx);
 
        /* dispatch into next BPF program depending on syscall number */
-       bpf_tail_call(ctx, &progs, sd.nr);
+       bpf_tail_call(ctx, &progs, sc_nr);
 
        /* fall through -> unknown syscall */
-       if (sd.nr >= __NR_getuid && sd.nr <= __NR_getsid) {
+       if (sc_nr >= __NR_getuid && sc_nr <= __NR_getsid) {
                char fmt[] = "syscall=%d (one of get/set uid/pid/gid)\n";
-               bpf_trace_printk(fmt, sizeof(fmt), sd.nr);
+               bpf_trace_printk(fmt, sizeof(fmt), sc_nr);
        }
        return 0;
 }
@@ -42,7 +40,7 @@ PROG(__NR_write)(struct pt_regs *ctx)
 {
        struct seccomp_data sd;
 
-       bpf_probe_read(&sd, sizeof(sd), (void *)PT_REGS_PARM1(ctx));
+       bpf_probe_read(&sd, sizeof(sd), (void *)PT_REGS_PARM2(ctx));
        if (sd.args[2] == 512) {
                char fmt[] = "write(fd=%d, buf=%p, size=%d)\n";
                bpf_trace_printk(fmt, sizeof(fmt),
@@ -55,7 +53,7 @@ PROG(__NR_read)(struct pt_regs *ctx)
 {
        struct seccomp_data sd;
 
-       bpf_probe_read(&sd, sizeof(sd), (void *)PT_REGS_PARM1(ctx));
+       bpf_probe_read(&sd, sizeof(sd), (void *)PT_REGS_PARM2(ctx));
        if (sd.args[2] > 128 && sd.args[2] <= 1024) {
                char fmt[] = "read(fd=%d, buf=%p, size=%d)\n";
                bpf_trace_printk(fmt, sizeof(fmt),