CVS commit: src/sys/net

[Greg Oster <oster%netbsd.org@localhost>]

Module Name:    src
Committed By:   oster
Date:           Wed Oct  4 20:47:43 UTC 2006

Modified Files:
        src/sys/net: bpf_filter.c

Log Message:
It is not sufficient for MINDEX to just 'return 0' if the MINDEX macro
is going to be used from within m_xhalf() and m_xword().  In using
MINDEX in those cases, we must set *err to '1' *before* calling MINDEX
just in case MINDEX does decide to 'return', and causes the function
to return 0 with an un-set err value.  A consequence of this fix is
that we can cleanup a couple of (now) unneeded goto's.  Problem found
by inspection whilst searching for the cause of a different panic.

Also: pavel@ noted the following:
                                if (merr != 0)
                                        return 0;
was missing from after a call to m_xhalf(), so fix that too.

src/regress/sys/net/bpf/out-of-bounds now passes the regression test.

Ok'ed by pavel@.


To generate a diff of this commit:
cvs rdiff -r1.31 -r1.32 src/sys/net/bpf_filter.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.