Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3a9af0bd authored by Kees Cook's avatar Kees Cook Committed by Linus Torvalds
Browse files

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: default avatarKees Cook <keescook@chromium.org>
Reported-by: default avatarRobert Swiecki <swiecki@google.com>
Tested-by: default avatarRobert Swiecki <swiecki@google.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 52644c9a

samples/seccomp/bpf-fancy.c

+3 −1
Original line number Original line Diff line number Diff line
@@ -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];

samples/seccomp/bpf-helper.c

+6 −0
Original line number Original line Diff line number Diff line
@@ -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;