]> CyberLeo.Net >> Repos - FreeBSD/releng/10.2.git/commit
projects / FreeBSD / releng / 10.2.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 8107870) | patch
Merge r285939-285941,285943,286004 from stable/10:
authorglebius <glebius@ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f>
Wed, 29 Jul 2015 14:16:25 +0000 (14:16 +0000)
committerglebius <glebius@ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f>
Wed, 29 Jul 2015 14:16:25 +0000 (14:16 +0000)
commit73dcb7df060a5ed22f81769b6e0d5fde6eae0eaf
treedc8cb908e550e4d35a20b3e6ac88f40b6894a3aetree | snapshot
parent8107870ce9227c4f7288f27156f6ba972533d78ecommit | diff
Merge r285939-285941,285943,286004 from stable/10:
- Protect against ioctl() vs ioctl() races.
- Always lock hash row of a source node when updating
  its 'states' counter. [1]
- Don't dereference NULL is pf_get_mtag() fails. [2]
- During module unload drop locks before destroying UMA zone.

PR: 182401 [1]
PR: 200222 [2]
Approved by: re (gjb)

git-svn-id: https://svn.freebsd.org/base/releng/10.2@286014 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f
sys/net/pfvar.h diff | blob | history
sys/netpfil/pf/pf.c diff | blob | history
sys/netpfil/pf/pf_ioctl.c diff | blob | history
10.2-RELEASE