git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
netfilter: nf_nat_snmp: Fix panic when snmp_trap_helper fails to register
[pandora-kernel.git]
/
net
/
ipv4
/
netfilter
/
nf_nat_sip.c
diff --git
a/net/ipv4/netfilter/nf_nat_sip.c
b/net/ipv4/netfilter/nf_nat_sip.c
index
78844d9
..
6609a84
100644
(file)
--- a/
net/ipv4/netfilter/nf_nat_sip.c
+++ b/
net/ipv4/netfilter/nf_nat_sip.c
@@
-148,7
+148,7
@@
static unsigned int ip_nat_sip(struct sk_buff *skb, unsigned int dataoff,
if (ct_sip_parse_header_uri(ct, *dptr, NULL, *datalen,
hdr, NULL, &matchoff, &matchlen,
&addr, &port) > 0) {
if (ct_sip_parse_header_uri(ct, *dptr, NULL, *datalen,
hdr, NULL, &matchoff, &matchlen,
&addr, &port) > 0) {
- unsigned int matchend, poff, plen, buflen, n;
+ unsigned int
olen,
matchend, poff, plen, buflen, n;
char buffer[sizeof("nnn.nnn.nnn.nnn:nnnnn")];
/* We're only interested in headers related to this
char buffer[sizeof("nnn.nnn.nnn.nnn:nnnnn")];
/* We're only interested in headers related to this
@@
-163,11
+163,12
@@
static unsigned int ip_nat_sip(struct sk_buff *skb, unsigned int dataoff,
goto next;
}
goto next;
}
+ olen = *datalen;
if (!map_addr(skb, dataoff, dptr, datalen, matchoff, matchlen,
&addr, port))
return NF_DROP;
if (!map_addr(skb, dataoff, dptr, datalen, matchoff, matchlen,
&addr, port))
return NF_DROP;
- matchend = matchoff + matchlen;
+ matchend = matchoff + matchlen
+ *datalen - olen
;
/* The maddr= parameter (RFC 2361) specifies where to send
* the reply. */
/* The maddr= parameter (RFC 2361) specifies where to send
* the reply. */
@@
-501,7
+502,10
@@
static unsigned int ip_nat_sdp_media(struct sk_buff *skb, unsigned int dataoff,
ret = nf_ct_expect_related(rtcp_exp);
if (ret == 0)
break;
ret = nf_ct_expect_related(rtcp_exp);
if (ret == 0)
break;
- else if (ret != -EBUSY) {
+ else if (ret == -EBUSY) {
+ nf_ct_unexpect_related(rtp_exp);
+ continue;
+ } else if (ret < 0) {
nf_ct_unexpect_related(rtp_exp);
port = 0;
break;
nf_ct_unexpect_related(rtp_exp);
port = 0;
break;