diff options
| author | Jakub Jankowski <shasta@toxcorp.com> | 2019-04-25 23:46:50 +0200 |
|---|---|---|
| committer | Pablo Neira Ayuso <pablo@netfilter.org> | 2019-05-06 00:36:17 +0200 |
| commit | f5e85ce8e733c2547827f6268136b70b802eabdb (patch) | |
| tree | 53938cb6e125dbb15a2cda02814a44e816b2cfd8 /net | |
| parent | 33cc3c0cfa64c86b6c4bbee86997aea638534931 (diff) | |
| download | linux-f5e85ce8e733c2547827f6268136b70b802eabdb.tar.gz linux-f5e85ce8e733c2547827f6268136b70b802eabdb.tar.bz2 linux-f5e85ce8e733c2547827f6268136b70b802eabdb.zip | |
netfilter: nf_conntrack_h323: restore boundary check correctness
Since commit bc7d811ace4a ("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: bc7d811ace4a ("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>
Diffstat (limited to 'net')
| -rw-r--r-- | net/netfilter/nf_conntrack_h323_asn1.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/netfilter/nf_conntrack_h323_asn1.c b/net/netfilter/nf_conntrack_h323_asn1.c index 1601275efe2d..4c2ef42e189c 100644 --- a/net/netfilter/nf_conntrack_h323_asn1.c +++ b/net/netfilter/nf_conntrack_h323_asn1.c @@ -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; |