Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

MINDEX() macro has 'return 0;' statement. It doesn't set *err to

Browse Source 
1 before return when invoked from m_xword() and m_xhalf() functions.
The caller doesn't set it to 1 either. So, set *err to 1 before
invoking MINDEX().
This commit is contained in:
alnsn 2012-08-15 21:31:39 +00:00
parent 8f60a9447f
commit 1969739699
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sys/net/bpf_filter.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: bpf_filter.c,v 1.52 2012/08/02 20:13:24 rmind Exp $ */ /* $NetBSD: bpf_filter.c,v 1.53 2012/08/15 21:31:39 alnsn Exp $ */
/*- /*-
* Copyright (c) 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997 * Copyright (c) 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997
@ -37,7 +37,7 @@
*/ */
#include <sys/cdefs.h> #include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: bpf_filter.c,v 1.52 2012/08/02 20:13:24 rmind Exp $"); __KERNEL_RCSID(0, "$NetBSD: bpf_filter.c,v 1.53 2012/08/15 21:31:39 alnsn Exp $");
#if 0 #if 0
#if !(defined(lint) || defined(KERNEL)) #if !(defined(lint) || defined(KERNEL))
@ -78,6 +78,7 @@ m_xword(const struct mbuf *m, uint32_t k, int *err)
u_char *cp, *np; u_char *cp, *np;
struct mbuf *m0; struct mbuf *m0;
*err = 1;
MINDEX(len, m, k); MINDEX(len, m, k);
cp = mtod(m, u_char *) + k; cp = mtod(m, u_char *) + k;
if (len >= k + 4) { if (len >= k + 4) {
@ -109,6 +110,7 @@ m_xhalf(const struct mbuf *m, uint32_t k, int *err)
u_char *cp; u_char *cp;
struct mbuf *m0; struct mbuf *m0;
*err = 1;
MINDEX(len, m, k); MINDEX(len, m, k);
cp = mtod(m, u_char *) + k; cp = mtod(m, u_char *) + k;
if (len >= k + 2) { if (len >= k + 2) {