Module Name: src
Committed By: alnsn
Date: Sat Feb 14 21:14:56 UTC 2015
Modified Files:
src/sys/net: bpfjit.c
Log Message:
Properly track initialisation of registers for BPF_JMP instructions.
To generate a diff of this commit:
cvs rdiff -u -r1.40 -r1.41 src/sys/net/bpfjit.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/net/bpfjit.c
diff -u src/sys/net/bpfjit.c:1.40 src/sys/net/bpfjit.c:1.41
--- src/sys/net/bpfjit.c:1.40 Fri Feb 13 15:59:17 2015
+++ src/sys/net/bpfjit.c Sat Feb 14 21:14:56 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: bpfjit.c,v 1.40 2015/02/13 15:59:17 alnsn Exp $ */
+/* $NetBSD: bpfjit.c,v 1.41 2015/02/14 21:14:56 alnsn Exp $ */
/*-
* Copyright (c) 2011-2014 Alexander Nasonov.
@@ -31,9 +31,9 @@
#include <sys/cdefs.h>
#ifdef _KERNEL
-__KERNEL_RCSID(0, "$NetBSD: bpfjit.c,v 1.40 2015/02/13 15:59:17 alnsn Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bpfjit.c,v 1.41 2015/02/14 21:14:56 alnsn Exp $");
#else
-__RCSID("$NetBSD: bpfjit.c,v 1.40 2015/02/13 15:59:17 alnsn Exp $");
+__RCSID("$NetBSD: bpfjit.c,v 1.41 2015/02/14 21:14:56 alnsn Exp $");
#endif
#include <sys/types.h>
@@ -1419,8 +1419,12 @@ optimize_pass1(const bpf_ctx_t *bc, cons
/* Initialize abc_length for ABC pass. */
insn_dat[i].u.jdata.abc_length = MAX_ABC_LENGTH;
- if (BPF_SRC(insns[i].code) == BPF_X)
+ *initmask |= invalid & BJ_INIT_ABIT;
+
+ if (BPF_SRC(insns[i].code) == BPF_X) {
*hints |= BJ_HINT_XREG;
+ *initmask |= invalid & BJ_INIT_XBIT;
+ }
if (BPF_OP(insns[i].code) == BPF_JA) {
jt = jf = insns[i].k;
