diff options
| author | Kees Cook <keescook@chromium.org> | 2015-02-17 13:47:58 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-02-17 14:34:55 -0800 |
| commit | 3a9af0bd34410a255d27024ea1bc28dc4e3a0044 (patch) | |
| tree | fc248a3d7edb3e0ef323c9352f6467a476a86b01 /samples/seccomp | |
| parent | 52644c9ab3faefbfbf07a19c24c4e74e33cfd796 (diff) | |
| download | op-kernel-dev-3a9af0bd34410a255d27024ea1bc28dc4e3a0044.zip op-kernel-dev-3a9af0bd34410a255d27024ea1bc28dc4e3a0044.tar.gz | |
samples/seccomp: improve label helper
Fixes a potential corruption with uninitialized stack memory in the
seccomp BPF sample program.
[akpm@linux-foundation.org: coding-style fixlet]
Signed-off-by: Kees Cook <keescook@chromium.org>
Reported-by: Robert Swiecki <swiecki@google.com>
Tested-by: Robert Swiecki <swiecki@google.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'samples/seccomp')
| -rw-r--r-- | samples/seccomp/bpf-fancy.c | 4 | ||||
| -rw-r--r-- | samples/seccomp/bpf-helper.c | 6 |
2 files changed, 9 insertions, 1 deletions
diff --git a/samples/seccomp/bpf-fancy.c b/samples/seccomp/bpf-fancy.c index 8eb483aa..e8b24f4 100644 --- a/samples/seccomp/bpf-fancy.c +++ b/samples/seccomp/bpf-fancy.c @@ -25,7 +25,9 @@ int main(int argc, char **argv) { - struct bpf_labels l; + struct bpf_labels l = { + .count = 0, + }; static const char msg1[] = "Please type something: "; static const char msg2[] = "You typed: "; char buf[256]; diff --git a/samples/seccomp/bpf-helper.c b/samples/seccomp/bpf-helper.c index 579cfe3..05cb4d5 100644 --- a/samples/seccomp/bpf-helper.c +++ b/samples/seccomp/bpf-helper.c @@ -10,6 +10,7 @@ */ #include <stdio.h> +#include <stdlib.h> #include <string.h> #include "bpf-helper.h" @@ -63,6 +64,11 @@ __u32 seccomp_bpf_label(struct bpf_labels *labels, const char *label) { struct __bpf_label *begin = labels->labels, *end; int id; + + if (labels->count == BPF_LABELS_MAX) { + fprintf(stderr, "Too many labels\n"); + exit(1); + } if (labels->count == 0) { begin->label = label; begin->location = 0xffffffff; |
