d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Pullup up to TCP header length before matching against 'tcpopts'.

Browse Source 
PR:		kern/156180
Reviewed by:	luigi
This commit is contained in:
glebius 2011-04-18 18:22:10 +00:00
parent 5684b4d832
commit ccf3bc8914
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
sys/netinet/ipfw/ip_fw2.c
View File

@ -913,9 +913,10 @@ ipfw_chk(struct ip_fw_args *args)
* pointer might become stale after other pullups (but we never use it
* this way).
*/
#define PULLUP_TO(_len, p, T) \
#define PULLUP_TO(_len, p, T) PULLUP_LEN(_len, p, sizeof(T))
#define PULLUP_LEN(_len, p, T) \
do { \
int x = (_len) + sizeof(T); \
int x = (_len) + T; \
if ((m)->m_len < x) { \
args->m = m = m_pullup(m, x); \
if (m == NULL) \
@ -1600,6 +1601,7 @@ do { \
break;
case O_TCPOPTS:
PULLUP_LEN(hlen, ulp, (TCP(ulp)->th_off << 2));
match = (proto == IPPROTO_TCP && offset == 0 &&
tcpopts_match(TCP(ulp), cmd));
break;
@ -2233,6 +2235,7 @@ do { \
}
} /* end of inner loop, scan opcodes */
#undef PULLUP_LEN
if (done)
break;