summaryrefslogtreecommitdiffstats
path: root/samples
diff options
context:
space:
mode:
authorChang-Hsien Tsai <luke.tw@gmail.com>2019-05-19 09:05:44 +0000
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2019-07-21 09:07:06 +0200
commitcf37c80bc93dc19df485d94bf5a78ab75558b11a (patch)
tree99aa82979c2750c786c738995b62b50995066ced /samples
parentab56c338d71cc888fb5bea2e8d494ef0203e9d16 (diff)
downloadlinux-stable-cf37c80bc93dc19df485d94bf5a78ab75558b11a.tar.gz
linux-stable-cf37c80bc93dc19df485d94bf5a78ab75558b11a.tar.bz2
linux-stable-cf37c80bc93dc19df485d94bf5a78ab75558b11a.zip
samples, bpf: fix to change the buffer size for read()
[ Upstream commit f7c2d64bac1be2ff32f8e4f500c6e5429c1003e0 ] If the trace for read is larger than 4096, the return value sz will be 4096. This results in off-by-one error on buf: static char buf[4096]; ssize_t sz; sz = read(trace_fd, buf, sizeof(buf)); if (sz > 0) { buf[sz] = 0; puts(buf); } Signed-off-by: Chang-Hsien Tsai <luke.tw@gmail.com> Signed-off-by: Daniel Borkmann <daniel@iogearbox.net> Signed-off-by: Sasha Levin <sashal@kernel.org>
Diffstat (limited to 'samples')
-rw-r--r--samples/bpf/bpf_load.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/samples/bpf/bpf_load.c b/samples/bpf/bpf_load.c
index da86a8e0a95a..e836b5ff2060 100644
--- a/samples/bpf/bpf_load.c
+++ b/samples/bpf/bpf_load.c
@@ -336,7 +336,7 @@ void read_trace_pipe(void)
static char buf[4096];
ssize_t sz;
- sz = read(trace_fd, buf, sizeof(buf));
+ sz = read(trace_fd, buf, sizeof(buf) - 1);
if (sz > 0) {
buf[sz] = 0;
puts(buf);