From: Howard McLauchlan <hmclauchlan@fb.com>
To: <linux-kernel@vger.kernel.org>
Cc: <linux-api@vger.kernel.org>, Al Viro <viro@zeniv.linux.org.uk>,
Thomas Gleixner <tglx@linutronix.de>, Yonghong Song <yhs@fb.com>,
"David S . Miller" <davem@davemloft.net>,
Thomas Garnier <thgarnie@google.com>, <kernel-team@fb.com>,
Howard McLauchlan <hmclauchlan@fb.com>
Subject: [PATCH] bpf: whitelist syscalls for error injection
Date: Tue, 13 Mar 2018 16:16:27 -0700 [thread overview]
Message-ID: <20180313231627.1247-1-hmclauchlan@fb.com> (raw)
Error injection is a useful mechanism to fail arbitrary kernel
functions. However, it is often hard to guarantee an error propagates
appropriately to user space programs. By injecting into syscalls, we can
return arbitrary values to user space directly; this increases
flexibility and robustness in testing, allowing us to test user space
error paths effectively.
The following script, for example, fails calls to sys_open() from a
given pid:
from bcc import BPF
from sys import argv
pid = argv[1]
prog = r"""
int kprobe__SyS_open(struct pt_regs *ctx, const char *pathname, int flags)
{
u32 pid = bpf_get_current_pid_tgid();
if (pid == %s)
bpf_override_return(ctx, -ENOENT);
return 0;
}
""" % pid
b = BPF(text = prog)
while 1:
b.perf_buffer_poll()
This patch whitelists all syscalls defined with SYSCALL_DEFINE for error
injection.
Signed-off-by: Howard McLauchlan <hmclauchlan@fb.com>
---
based on 4.16-rc5
include/linux/syscalls.h | 3 +++
1 file changed, 3 insertions(+)
diff --git a/include/linux/syscalls.h b/include/linux/syscalls.h
index a78186d826d7..e8c6d63ace78 100644
--- a/include/linux/syscalls.h
+++ b/include/linux/syscalls.h
@@ -191,6 +191,8 @@ static inline int is_syscall_trace_event(struct trace_event_call *tp_event)
#define SYSCALL_DEFINE0(sname) \
SYSCALL_METADATA(_##sname, 0); \
+ asmlinkage long sys_##sname(void); \
+ ALLOW_ERROR_INJECTION(sys_##sname, ERRNO); \
asmlinkage long sys_##sname(void)
#define SYSCALL_DEFINE1(name, ...) SYSCALL_DEFINEx(1, _##name, __VA_ARGS__)
@@ -210,6 +212,7 @@ static inline int is_syscall_trace_event(struct trace_event_call *tp_event)
#define __SYSCALL_DEFINEx(x, name, ...) \
asmlinkage long sys##name(__MAP(x,__SC_DECL,__VA_ARGS__)) \
__attribute__((alias(__stringify(SyS##name)))); \
+ ALLOW_ERROR_INJECTION(sys##name, ERRNO); \
static inline long SYSC##name(__MAP(x,__SC_DECL,__VA_ARGS__)); \
asmlinkage long SyS##name(__MAP(x,__SC_LONG,__VA_ARGS__)); \
asmlinkage long SyS##name(__MAP(x,__SC_LONG,__VA_ARGS__)) \
--
2.14.1
next reply other threads:[~2018-03-13 23:20 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-03-13 23:16 Howard McLauchlan [this message]
2018-03-13 23:45 ` [PATCH] bpf: whitelist syscalls for error injection Omar Sandoval
2018-03-13 23:49 ` Yonghong Song
2018-03-14 0:00 ` Howard McLauchlan
2018-03-13 23:56 ` Andy Lutomirski
2018-03-16 22:55 ` Howard McLauchlan
2018-03-18 6:47 ` Dominik Brodowski
2018-03-19 2:13 ` Andy Lutomirski
2018-03-19 19:18 ` Howard McLauchlan
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180313231627.1247-1-hmclauchlan@fb.com \
--to=hmclauchlan@fb.com \
--cc=davem@davemloft.net \
--cc=kernel-team@fb.com \
--cc=linux-api@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=tglx@linutronix.de \
--cc=thgarnie@google.com \
--cc=viro@zeniv.linux.org.uk \
--cc=yhs@fb.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox