diff options
| author | kp <kp@FreeBSD.org> | 2016-08-17 15:14:21 +0000 |
|---|---|---|
| committer | kp <kp@FreeBSD.org> | 2016-08-17 15:14:21 +0000 |
| commit | ad413762f28e3be343987e707b9cf4f10f963693 (patch) | |
| tree | 36d369cb4cf49221c5dc8dd1dbaae258ec1a00d5 /sys | |
| parent | 26d31e281678303d3071eb6fbac74b22036f44c5 (diff) | |
| download | FreeBSD-src-ad413762f28e3be343987e707b9cf4f10f963693.zip FreeBSD-src-ad413762f28e3be343987e707b9cf4f10f963693.tar.gz | |
MFC r289932, r289940:
PF_ANEQ() macro will in most situations returns TRUE comparing two identical
IPv4 packets (when it should return FALSE). It happens because PF_ANEQ() doesn't
stop if first 32 bits of IPv4 packets are equal and starts to check next 3*32
bits (like for IPv6 packet). Those bits containt some garbage and in result
PF_ANEQ() wrongly returns TRUE.
Fix: Check if packet is of AF_INET type and if it is then compare only first 32
bits of data.
PR: 204005
Submitted by: Miłosz Kaniewski
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/net/pfvar.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sys/net/pfvar.h b/sys/net/pfvar.h index ae5ecb9..9fb4581 100644 --- a/sys/net/pfvar.h +++ b/sys/net/pfvar.h @@ -198,10 +198,11 @@ extern struct rwlock pf_rules_lock; (a)->addr32[0] == (b)->addr32[0])) \ #define PF_ANEQ(a, b, c) \ - ((a)->addr32[0] != (b)->addr32[0] || \ + ((c == AF_INET && (a)->addr32[0] != (b)->addr32[0]) || \ + (c == AF_INET6 && ((a)->addr32[0] != (b)->addr32[0] || \ (a)->addr32[1] != (b)->addr32[1] || \ (a)->addr32[2] != (b)->addr32[2] || \ - (a)->addr32[3] != (b)->addr32[3]) \ + (a)->addr32[3] != (b)->addr32[3]))) \ #define PF_AZERO(a, c) \ ((c == AF_INET && !(a)->addr32[0]) || \ |
