evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

samples/seccomp: improve label helper

Browse source 
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>
This commit is contained in:
Kees Cook 2015-02-17 13:47:58 -08:00 • committed by Linus Torvalds
parent 52644c9ab3
commit 3a9af0bd34
2 changed files with 9 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
samples/seccomp/bpf-fancy.c
View file

@ -25,7 +25,9 @@
int main(int argc, char **argv) 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 msg1[] = "Please type something: ";
static const char msg2[] = "You typed: "; static const char msg2[] = "You typed: ";
char buf[256]; char buf[256];

6
samples/seccomp/bpf-helper.c
View file

@ -10,6 +10,7 @@
*/ */
#include <stdio.h> #include <stdio.h>
#include <stdlib.h>
#include <string.h> #include <string.h>
#include "bpf-helper.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; struct __bpf_label *begin = labels->labels, *end;
int id; int id;
if (labels->count == BPF_LABELS_MAX) {
fprintf(stderr, "Too many labels\n");
exit(1);
}
if (labels->count == 0) { if (labels->count == 0) {
begin->label = label; begin->label = label;
begin->location = 0xffffffff; begin->location = 0xffffffff;