Module Name: src
Committed By: pooka
Date: Wed Apr 21 11:07:34 UTC 2010
Modified Files:
src/tests/net: Makefile
Added Files:
src/tests/net/bpf: Atffile Makefile t_div-by-zero.c
Log Message:
Check that bpf doesn't accept programs with divide-by-zero in them.
Example filter from Guy Harris via PR kern/43185.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/tests/net/Makefile
cvs rdiff -u -r0 -r1.1 src/tests/net/bpf/Atffile src/tests/net/bpf/Makefile \
src/tests/net/bpf/t_div-by-zero.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/net/Makefile
diff -u src/tests/net/Makefile:1.1 src/tests/net/Makefile:1.2
--- src/tests/net/Makefile:1.1 Sun Dec 23 13:50:22 2007
+++ src/tests/net/Makefile Wed Apr 21 11:07:34 2010
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.1 2007/12/23 13:50:22 jmmv Exp $
+# $NetBSD: Makefile,v 1.2 2010/04/21 11:07:34 pooka Exp $
.include <bsd.own.mk>
TESTSDIR= ${TESTSBASE}/net
-SUBDIR= sys
+SUBDIR= bpf sys
.include <bsd.test.mk>
.include <bsd.subdir.mk>
Added files:
Index: src/tests/net/bpf/Atffile
diff -u /dev/null src/tests/net/bpf/Atffile:1.1
--- /dev/null Wed Apr 21 11:07:34 2010
+++ src/tests/net/bpf/Atffile Wed Apr 21 11:07:34 2010
@@ -0,0 +1,6 @@
+Content-Type: application/X-atf-atffile; version="1"
+X-NetBSD-Id: "$NetBSD: Atffile,v 1.1 2010/04/21 11:07:34 pooka Exp $"
+
+prop: test-suite = "NetBSD"
+
+tp-glob: *
Index: src/tests/net/bpf/Makefile
diff -u /dev/null src/tests/net/bpf/Makefile:1.1
--- /dev/null Wed Apr 21 11:07:34 2010
+++ src/tests/net/bpf/Makefile Wed Apr 21 11:07:34 2010
@@ -0,0 +1,13 @@
+# $NetBSD: Makefile,v 1.1 2010/04/21 11:07:34 pooka Exp $
+#
+
+.include <bsd.own.mk>
+
+TESTSDIR= ${TESTSBASE}/net/bpf
+
+TESTS_C= t_div-by-zero
+
+LDADD+= -lrumpdev_bpf -lrumpdev -lrumpnet_net -lrumpnet -lrumpvfs
+LDADD+= -lrump -lrumpuser -lpthread
+
+.include <bsd.test.mk>
Index: src/tests/net/bpf/t_div-by-zero.c
diff -u /dev/null src/tests/net/bpf/t_div-by-zero.c:1.1
--- /dev/null Wed Apr 21 11:07:34 2010
+++ src/tests/net/bpf/t_div-by-zero.c Wed Apr 21 11:07:34 2010
@@ -0,0 +1,48 @@
+#include <sys/types.h>
+#include <sys/ioctl.h>
+
+#include <net/bpf.h>
+
+#include <atf-c.h>
+#include <fcntl.h>
+
+#include <rump/rump.h>
+#include <rump/rumpuser.h>
+
+ATF_TC(div_by_zero);
+ATF_TC_HEAD(div_by_zero, tc)
+{
+
+ atf_tc_set_md_var(tc, "descr", "Check that BPF rejects a filter "
+ "which divides by 0");
+}
+
+ATF_TC_BODY(div_by_zero, tc)
+{
+ struct bpf_program bp;
+ struct bpf_insn bins[] = {
+ { 0x20, 0, 0, 0x00000000 },
+ { 0x34, 0, 0, 0x00000000 },
+ { 0x15, 0, 1, 0x00000002 },
+ { 0x6, 0, 0, 0x00000060 },
+ { 0x6, 0, 0, 0x00000000 },
+ };
+ int fd;
+
+ bp.bf_len = __arraycount(bins);
+ bp.bf_insns = bins;
+
+ rump_init();
+ fd = rump_sys_open("/dev/bpf", O_RDWR);
+ if (fd == -1)
+ err(1, "open bpf");
+ ATF_REQUIRE_EQ_MSG(rump_sys_ioctl(fd, BIOCSETF, &bp), -1,
+ "bpf accepted program with division by zero");
+}
+
+ATF_TP_ADD_TCS(tp)
+{
+
+ ATF_TP_ADD_TC(tp, div_by_zero);
+ return atf_no_error();
+}
