Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a4c89051 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kaber/nf-2.6

parents 55bdeed9 e578756c

net/netfilter/nf_conntrack_netlink.c

+2 −1
Original line number Diff line number Diff line
@@ -1437,8 +1437,9 @@ ctnetlink_exp_dump_mask(struct sk_buff *skb, 
	struct nlattr *nest_parms;



	memset(&m, 0xFF, sizeof(m));

	m.src.u.all = mask->src.u.all;

	memcpy(&m.src.u3, &mask->src.u3, sizeof(m.src.u3));

	m.src.u.all = mask->src.u.all;

	m.dst.protonum = tuple->dst.protonum;



	nest_parms = nla_nest_start(skb, CTA_EXPECT_MASK | NLA_F_NESTED);

	if (!nest_parms)

net/netfilter/nf_conntrack_sip.c

+1 −1
Original line number Diff line number Diff line
@@ -376,7 +376,7 @@ int ct_sip_get_header(const struct nf_conn *ct, const char *dptr, 
			dptr += hdr->len;

		else if (hdr->cname && limit - dptr >= hdr->clen + 1 &&

			 strnicmp(dptr, hdr->cname, hdr->clen) == 0 &&

			 !isalpha(*(dptr + hdr->clen + 1)))

			 !isalpha(*(dptr + hdr->clen)))

			dptr += hdr->clen;

		else

			continue;