CVS log for src/sys/net/bpf_filter.c

Up to [cvs.NetBSD.org] / src / sys / net

Request diff between arbitrary revisions

Keyword substitution: kv
Default branch: MAIN

merge changes from libpcap-1.10.5

define symbols that new libpcap needs

update from HEAD

Sync with HEAD

Create separate modules for i2c_bitbang and bpf_filter so these files
can be included in kernels which need them without also duplicating
them in other modules.  Removes the duplicate symbols I found which
prevented loading i2c and bpf modules after having fixed PR 45125.

Sync with HEAD

Fix the build.

It's not enough to check that a class of the last instruction is BPF_RET.
The opcodes in bpf_validate() must match opcodes understood by bpf_filter().

Found by afl-fuzz http://lcamtuf.coredump.cx/afl/.

Add BPF_MOD/BPF_XOR, sync DLT entries and document unused bpf instructions.
From libpcap-1.6.2

Rebase to HEAD as of a few days ago.

Rebase.

Arithmetic overflow when calculating variable offsets (BPF_LD+BPF_IND
instructions) should be handled uniformly for contiguous buffers and mbufs.

Implement error checking in m_xbyte() and check for errors after m_xbyte() call.
Reuse (len - k) expression in m_xword() and m_xhalf() to give an optimization
hint to a compiler.

When m_xbyte() didn't exist, bpf_filter() handled out-of-bounds BPF_B loads
correctly because "return 0" inside MINDEX() was aborting filter programs.
After the change that added m_xbyte() zero values were passed to A or X
registers instead of aborting a filter program.

Check "preinited" argument of bpf_set_extmem().

- bpf_validate_ext: fix memword validation in BPF_ST/BPF_STX case.
- bpf_set_extmem: check the number of words against BPF_MAX_MEMWORDS.

- Improve the comments in bpf.h and KNF a little.
- Rename bpf_ctx_t member noinit to preinited (reflects the meaning better).

Implement copfuncs and external memory in bpfjit.

sync with head.

for a reference, the tree before this commit was tagged
as yamt-pagecache-tag8.

this commit was splitted into small chunks to avoid
a limitation of cvs.  ("Protocol error: too many arguments")

sync with head

- Add bpf_args_t and convert bpf_filter_ext() to use it.  This allows the
  caller to initialise (and re-use) the memory store.
- Add bpf_jit_generate() and bpf_jit_freecode() wrappers.

bpf_filter: re-use some code.  No functional change intended.

bpf_validate_ext: allow COP to modify the memstore.

Add bpf_filter_ext() to use with BPF COP, restore bpf_filter() as it was
originally to preserve compatibility.  Similarly, add bpf_validate_ext()
which takes bpf_ctx_t.

bpf_filter: add a custom argument which can be passed to coprocessor routine.

Implement BPF_COP/BPF_COPX instructions in the misc category (BPF_MISC)
which add a capability to call external functions in a predetermined way.

It can be thought as a BPF "coprocessor" -- a generic mechanism to offload
more complex packet inspection operations.  There is no default coprocessor
and this functionality is not targeted to the /dev/bpf.  This is primarily
targeted to the kernel subsystems, therefore there is no way to set a custom
coprocessor at the userlevel.

Discussed on: tech-net@
OK: core@

Resync to 2012-11-19 00:00:00 UTC

sync with head

Add bpfjit and enable it for amd64.

Remove bpf_jit which was ported from FreeBSD recently.

It will soon be replaced with the new bpfjit kernel module.

MINDEX() macro has 'return 0;' statement. It doesn't set *err to
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().

bpf_filter: remove unnecessary memset(), add a comment.

Add BPF JIT compiler, currently supporting amd64 and i386.  Code obtained
from FreeBSD.  Also, make few BPF fixes and simplifications while here.
Note that bpf_jit_enable is false for now.

OK dyoung@, some feedback from matt@

sync with head

merge to -current.

Apply same bounds checks for BPF_LD|BPF_B|BPF_IND as for
BPF_LD|BPF_H|BPF_IND and BPF_LD|BPF_W|BPF_IND.

From FreeBSD r48548, the original r45574 had a typo.

PR/45751: Alexander Nasonov: No overflow check in BPF_LD|BPF_ABS

back out previous - this should be unnecessary on NetBSD due to
the extra validation introduced in rev.1.42 (and pulled up to netbsd-5)

clear the packet filter's scratch memory before running the filter
program, otherwise kernel memory can be leaked, from Guy Harris
per PR kern/45142

Sync with HEAD.

bring matt-nb5-mips64 up to date with netbsd-5-1-RELEASE (except compat).

Pull up following revision(s) (requested by spz in ticket #1571):
	sys/net/bpf_filter.c: revision 1.36, 1.42 -> 1.46 via patch
Avoid stack memory disclosure by keeping track during filter validation time
of initialized memory. Idea taken from linux.
Use __CTASSERT
Use kmem instead of malloc. Requested by rmind.
Fix userland build.
delint.
the correct check for BPF_K is with BPF_SRC for BPF_ALU ops, from
Guy Harris per PR kern/43185
fixes possible division-by-zero crashes by evil filter expressions
like "len / 0 = 1"
pullup candidate

Pull up following revision(s) (requested by spz in ticket #1571):
	sys/net/bpf_filter.c: revision 1.42 - 1.46 via patch
Avoid stack memory disclosure by keeping track during filter validation time
of initialized memory. Idea taken from linux.
Use __CTASSERT
Use kmem instead of malloc. Requested by rmind.
Fix userland build.
delint.

Pull up following revision(s) (requested by spz in ticket #1571):
	sys/net/bpf_filter.c: revision 1.42 - 1.46 via patch
Avoid stack memory disclosure by keeping track during filter validation time
of initialized memory. Idea taken from linux.
Use __CTASSERT
Use kmem instead of malloc. Requested by rmind.
Fix userland build.
delint.

sync with head

Sync with HEAD

delint.

Fix userland build.

Use kmem instead of malloc. Requested by rmind.

Use __CTASSERT

Avoid stack memory disclosure by keeping track during filter validation time
of initialized memory. Idea taken from linux.

revert another part of bpf_filter 1.38 that broke the check for divide
by zero while validating the bpf program.

originally spotted by skrll@, and broke atf the month-old atf test for
this exact problem: net_bpf_t_div-by-zero_div_by_zero.

consider BPF_ABS, BPF_IND and BPF_MSH as they used to be in rev 1.37.

this fixes dhclient, and i'm told dhcpcd as well.


this patch from skrll@netbsd.org, tested by me.

apply the smallest hack to allow this to build without warnings again.

make bpf_validate available in userland.

constify

sync with head.

Pull up following revision(s) (requested by drochner in ticket #1393):
	sys/net/bpf_filter.c: revision 1.36
the correct check for BPF_K is with BPF_SRC for BPF_ALU ops, from
Guy Harris per PR kern/43185
fixes possible division-by-zero crashes by evil filter expressions
like "len / 0 =3D 1"
pullup candidate

sync with head

Pull up following revision(s) (requested by drochner in ticket #1381):
	sys/net/bpf_filter.c: revision 1.36
the correct check for BPF_K is with BPF_SRC for BPF_ALU ops, from
Guy Harris per PR kern/43185
fixes possible division-by-zero crashes by evil filter expressions
like "len / 0 = 1"

Sync with HEAD.

the correct check for BPF_K is with BPF_SRC for BPF_ALU ops, from
Guy Harris per PR kern/43185
fixes possible division-by-zero crashes by evil filter expressions
like "len / 0 = 1"
pullup candidate

sync with head.

Sync with HEAD.

Sync with HEAD.

Sync with wrstuden-revivesa-base-2.

As the scratch memory is only ever copied to or from A and X, make it
unsigned as well.

Sync with netbsd-4.

Sync with HEAD.

Pull up following revision(s) (requested by christos in ticket #1032):
	sys/net/bpf_filter.c: revision 1.34
PR/37663: Guy Harris: bpf_validate rejects valid programs that use the
multiply instruction

sync with head

sync with HEAD

Sync with HEAD

PR/37663: Guy Harris: bpf_validate rejects valid programs that use the multiply instruction

sync with head.

Sync with head.

Use be16dec() and be32dec() instead of reimplementing them.

sync with head.

Sync with head.

Pull up following revision(s) (requested by oster in ticket #1539):
	sys/net/bpf_filter.c: revision 1.32
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@.

Pull up following revision(s) (requested by oster in ticket #1539):
	sys/net/bpf_filter.c: revision 1.32
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@.

sync with head

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@.

sync with head

sync with head.

Sync with head.

Merge 2006-05-24 NetBSD-current into the "peter-altq" branch.

sync with head.

XXX: GCC uninitialized.

Sync with head.

sync with head.

fix bpf_validate():
a missing "break" caused any bpf filter containing
a division to be rejected

sync with head.

Add a /* CONSTCOND */ for lint.

Fix previous commit: ABS, IND and MSH are valid codes.

In bpf_validate(), get rid of bpf_maxbufsize test as there are other
clients of bpf_filter(), like if_ppp, that are not limited by
bpf_maxbufsize. The same check is done at the run time, so there is no
problem created.

Noticed by Guy Harris in private email.

Sync with head.

Oops, the previous revision had a wrong pre-processor #if clause.

Make the bpf_maxbufsize a constant when bpfilter pseudo-device is not
present in the kernel config, thus fixing the build. Problem reported
by Havard Eidnes. Solution proposed by Christos, thanks.

PR 32198: bpf_validate() needs to do more checks, from Otto Moerbeek/OpenBSD
via Guy Harris.
Problems like out-of-bounds read/write in filter machine operations
were fixed.

More KNF. C99 uintXX_t types.

KNF. ANSYfy. de-P().

sync with -current

sync with head.  xen and whitespace.  xen part is not finished.

Sync with HEAD.

Hi Perry!

nuke trailing whitespace

Fix the sync with head I botched.

Sync with HEAD.

Sync with HEAD

Move UCB-licensed code from 4-clause to 3-clause licence.

Patches provided by Joel Baker in PR 22364, verified by myself.

Sync kqueue branch with -current.

Catch up to -current.

don't need <sys/types.h> when including <sys/param.h>

Catch up to -current.

add RCSIDs

Update thorpej_scsipi to -current as of a month ago

Add a missing include when using this in user space.

remove sunos stuff.

Kill some more register declarations.

Import 4.4BSD-Lite for reference

Update marc-pcmcia branch from trunk.

bpf_filter.c:
	- update copyright
	- add their rcsid
	- initialize some variables later later for consistency
	  with the current code.
	- change char to u_char to match the current code.

Provide better filter validation.  PR 3366.

Net prototypes

copy routines should take size_t lengths for prototype consistency.
don't assume that tick is >= 1000; loses badly on alpha (div. by zero)
only try unaligned copies if NetBSD's UNALIGNED_ACCESS symbol is defined.
various misc type size cleanups, mostly short -> int16_t.

Fix bogus buffer indexing when a value is split across a mbuf boundary,
as suggested by Greg Ansley.  Also, redefine MINDEX() slightly to avoid
duplicating code.

KERNEL -> _KERNEL

Undo an #include ordering change.

Make this more type-safe for the Alpha.  From the libpcap 0.0 distribution.
(Needs more work.)

New RCS ID's, take two.  they're more aesthecially pleasant, and use 'NetBSD'

Update to 4.4-Lite networking code, with a few local changes.

Canonicalize all #includes.

add rcs ids to everything, and clean up headers

added BPF support, as provided by David Greenman (davidg@implode.rain.com)

initial import of 386bsd-0.1 sources

Initial revision