Skip to contentSkip to conversation

samples/seccomp: improve label helper

PATCH In review Kees Cook 2 participants 3 messages Feb 3, 2015

lore
Share & tools
lore

Kees Cook

author
#0 lore raw

PATCH 1/1 samples/seccomp: improve label helper

Fixes a potential corruption with uninitialized stack memory in the seccomp BPF sample program.

---
 samples/seccomp/bpf-fancy.c  | 4 +++-
 samples/seccomp/bpf-helper.c | 5 +++++
 2 files changed, 8 insertions(+), 1 deletion(-)
samples/seccomp/bpf-fancy.c +3 -1
index 8eb483aaec46..e8b24f443709 100644
@@ -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];
samples/seccomp/bpf-helper.c +5 -0
index 579cfe331886..f9fa14d81798 100644
@@ -10,6 +10,7 @@
  */
 
 #include <stdio.h>
+#include <stdlib.h>
 #include <string.h>
 
 #include "bpf-helper.h"
@@ -63,6 +64,10 @@ __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;
Signature · 6 lines
1.9.1


-- 
Kees Cook
Chrome OS Security
#1 lore raw

2015-02-03 19:56 GMT+01:00 Kees Cook <[email protected]>:

Quoted 52 lines

Fixes a potential corruption with uninitialized stack memory in the seccomp BPF sample program.

---
 samples/seccomp/bpf-fancy.c  | 4 +++-
 samples/seccomp/bpf-helper.c | 5 +++++
 2 files changed, 8 insertions(+), 1 deletion(-)
samples/seccomp/bpf-fancy.c +3 -1
index 8eb483aaec46..e8b24f443709 100644
@@ -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];
samples/seccomp/bpf-helper.c +5 -1
index 579cfe331886..f9fa14d81798 100644
@@ -10,6 +10,7 @@
  */
 
 #include <stdio.h>
+#include <stdlib.h>
 #include <string.h>
 
 #include "bpf-helper.h"
@@ -63,6 +64,10 @@ __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;
--

1.9.1

Quoted 3 lines

--
Kees Cook
Chrome OS Security

Hi,

Thanks for the patch!

Not sure if we care, but with a more strict warning/error checking in gcc I get now.

seccomp/bpf-helper.c:66:3: error: implicit declaration of function ‘exit’ [-Werror=implicit-function-declaration]
exit(1);
^
seccomp/bpf-helper.c:66:3: error: incompatible implicit declaration of built-in function ‘exit’ [-Werror]

Signature · 1 line
Robert Święcki
#2 lore raw
Quoted 63 lines
Quoted 52 lines

Fixes a potential corruption with uninitialized stack memory in the seccomp BPF sample program.

---
 samples/seccomp/bpf-fancy.c  | 4 +++-
 samples/seccomp/bpf-helper.c | 5 +++++
 2 files changed, 8 insertions(+), 1 deletion(-)
samples/seccomp/bpf-fancy.c +3 -1
index 8eb483aaec46..e8b24f443709 100644
@@ -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];
samples/seccomp/bpf-helper.c +5 -1
index 579cfe331886..f9fa14d81798 100644
@@ -10,6 +10,7 @@
  */
 
 #include <stdio.h>
+#include <stdlib.h>
 #include <string.h>
 
 #include "bpf-helper.h"
@@ -63,6 +64,10 @@ __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;
--

1.9.1

Quoted 3 lines

--
Kees Cook
Chrome OS Security

Hi,

Thanks for the patch!

Not sure if we care, but with a more strict warning/error checking in gcc I get now.

Quoted 6 lines

seccomp/bpf-helper.c:66:3: error: implicit declaration of function ‘exit’ [-Werror=implicit-function-declaration]

   exit(1);
   ^

seccomp/bpf-helper.c:66:3: error: incompatible implicit declaration of built-in function ‘exit’ [-Werror]

Ah.. please ignore, I patched my code partially only.

Works well!

Signature · 1 line
Robert Święcki