diff options
author | David S. Miller <davem@davemloft.net> | 2010-02-02 12:04:58 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2010-02-02 12:04:58 -0500 |
commit | a4c89051c83693e6cd5655b90300ec23a35e04f1 (patch) | |
tree | 93515b268aeb76a11116750d39cf44804e0ec5f2 | |
parent | 55bdeed9f67a92f184e1ddcdd722e622d9dd10c6 (diff) | |
parent | e578756c35859a459d78d8416195bc5f5ff897d0 (diff) |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kaber/nf-2.6
-rw-r--r-- | net/netfilter/nf_conntrack_netlink.c | 3 | ||||
-rw-r--r-- | net/netfilter/nf_conntrack_sip.c | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/net/netfilter/nf_conntrack_netlink.c b/net/netfilter/nf_conntrack_netlink.c index 59d8064eb522..42f21c01a93e 100644 --- a/net/netfilter/nf_conntrack_netlink.c +++ b/net/netfilter/nf_conntrack_netlink.c | |||
@@ -1437,8 +1437,9 @@ ctnetlink_exp_dump_mask(struct sk_buff *skb, | |||
1437 | struct nlattr *nest_parms; | 1437 | struct nlattr *nest_parms; |
1438 | 1438 | ||
1439 | memset(&m, 0xFF, sizeof(m)); | 1439 | memset(&m, 0xFF, sizeof(m)); |
1440 | m.src.u.all = mask->src.u.all; | ||
1441 | memcpy(&m.src.u3, &mask->src.u3, sizeof(m.src.u3)); | 1440 | memcpy(&m.src.u3, &mask->src.u3, sizeof(m.src.u3)); |
1441 | m.src.u.all = mask->src.u.all; | ||
1442 | m.dst.protonum = tuple->dst.protonum; | ||
1442 | 1443 | ||
1443 | nest_parms = nla_nest_start(skb, CTA_EXPECT_MASK | NLA_F_NESTED); | 1444 | nest_parms = nla_nest_start(skb, CTA_EXPECT_MASK | NLA_F_NESTED); |
1444 | if (!nest_parms) | 1445 | if (!nest_parms) |
diff --git a/net/netfilter/nf_conntrack_sip.c b/net/netfilter/nf_conntrack_sip.c index 4b572163784b..023966b569bf 100644 --- a/net/netfilter/nf_conntrack_sip.c +++ b/net/netfilter/nf_conntrack_sip.c | |||
@@ -376,7 +376,7 @@ int ct_sip_get_header(const struct nf_conn *ct, const char *dptr, | |||
376 | dptr += hdr->len; | 376 | dptr += hdr->len; |
377 | else if (hdr->cname && limit - dptr >= hdr->clen + 1 && | 377 | else if (hdr->cname && limit - dptr >= hdr->clen + 1 && |
378 | strnicmp(dptr, hdr->cname, hdr->clen) == 0 && | 378 | strnicmp(dptr, hdr->cname, hdr->clen) == 0 && |
379 | !isalpha(*(dptr + hdr->clen + 1))) | 379 | !isalpha(*(dptr + hdr->clen))) |
380 | dptr += hdr->clen; | 380 | dptr += hdr->clen; |
381 | else | 381 | else |
382 | continue; | 382 | continue; |