Skip to content

Commit

Permalink
netfilter: nf_conntrack_h323: restore boundary check correctness
Browse files Browse the repository at this point in the history
Since commit bc7d811 ("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: bc7d811 ("netfilter: nf_ct_h323: Convert CHECK_BOUND macro to function")
Signed-off-by: Jakub Jankowski <shasta@toxcorp.com>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
  • Loading branch information
Jakub Jankowski authored and Pablo Neira Ayuso committed May 5, 2019
1 parent 33cc3c0 commit f5e85ce
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion net/netfilter/nf_conntrack_h323_asn1.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)
bytes++;

if (*bs->cur + bytes > *bs->end)
if (bs->cur + bytes > bs->end)
return 1;

return 0;
Expand Down

0 comments on commit f5e85ce

Please sign in to comment.