Commit f5e85ce8 authored by Jakub Jankowski's avatar Jakub Jankowski Committed by Pablo Neira Ayuso

netfilter: nf_conntrack_h323: restore boundary check correctness

Since commit bc7d811a ("netfilter: nf_ct_h323: Convert
CHECK_BOUND macro to function"), NAT traversal for H.323
doesn't work, failing to parse H323-UserInformation.
nf_h323_error_boundary() compares contents of the bitstring,
not the addresses, preventing valid H.323 packets from being
conntrack'd.

This looks like an oversight from when CHECK_BOUND macro was
converted to a function.

To fix it, stop dereferencing bs->cur and bs->end.

Fixes: bc7d811a ("netfilter: nf_ct_h323: Convert CHECK_BOUND macro to function")
Signed-off-by: default avatarJakub Jankowski <shasta@toxcorp.com>
Signed-off-by: default avatarPablo Neira Ayuso <pablo@netfilter.org>
parent 33cc3c0c
...@@ -172,7 +172,7 @@ static int nf_h323_error_boundary(struct bitstr *bs, size_t bytes, size_t bits) ...@@ -172,7 +172,7 @@ static int nf_h323_error_boundary(struct bitstr *bs, size_t bytes, size_t bits)
if (bits % BITS_PER_BYTE > 0) if (bits % BITS_PER_BYTE > 0)
bytes++; bytes++;
if (*bs->cur + bytes > *bs->end) if (bs->cur + bytes > bs->end)
return 1; return 1;
return 0; return 0;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment