diff options
| author | Patrick McHardy <kaber@trash.net> | 2007-01-30 14:25:24 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2007-01-30 14:25:24 -0800 |
| commit | adcb4711101dfef89d473f64a913089d303962ae (patch) | |
| tree | c582cac3adbfd25fe09f91f9a62cfdbcfcb62714 | |
| parent | 7da5bfbb12e327b3a347ee3e076957cd6564eb56 (diff) | |
| download | linux-3.10-adcb4711101dfef89d473f64a913089d303962ae.tar.gz linux-3.10-adcb4711101dfef89d473f64a913089d303962ae.tar.bz2 linux-3.10-adcb4711101dfef89d473f64a913089d303962ae.zip | |
[NETFILTER]: SIP conntrack: fix out of bounds memory access
When checking for an @-sign in skp_epaddr_len, make sure not to
run over the packet boundaries.
Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | net/ipv4/netfilter/ip_conntrack_sip.c | 2 | ||||
| -rw-r--r-- | net/netfilter/nf_conntrack_sip.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/net/ipv4/netfilter/ip_conntrack_sip.c b/net/ipv4/netfilter/ip_conntrack_sip.c index 571d27e2091..11c588a10e6 100644 --- a/net/ipv4/netfilter/ip_conntrack_sip.c +++ b/net/ipv4/netfilter/ip_conntrack_sip.c @@ -292,7 +292,7 @@ static int skp_epaddr_len(const char *dptr, const char *limit, int *shift) dptr++; } - if (*dptr == '@') { + if (dptr <= limit && *dptr == '@') { dptr++; (*shift)++; } else diff --git a/net/netfilter/nf_conntrack_sip.c b/net/netfilter/nf_conntrack_sip.c index c93fb37a54f..9dec1153467 100644 --- a/net/netfilter/nf_conntrack_sip.c +++ b/net/netfilter/nf_conntrack_sip.c @@ -312,7 +312,7 @@ static int skp_epaddr_len(struct nf_conn *ct, const char *dptr, dptr++; } - if (*dptr == '@') { + if (dptr <= limit && *dptr == '@') { dptr++; (*shift)++; } else |