From de5a845d335dab9a99ef3c80979a33031c873d6e Mon Sep 17 00:00:00 2001 From: Pablo Neira Ayuso Date: Wed, 14 Dec 2011 12:45:22 +0100 Subject: [PATCH] --- yaml --- r: 279065 b: refs/heads/master c: 35dba1d7f3ae669128a42c969d599ab8c604d61d h: refs/heads/master i: 279063: a8c6d3c3690d139ed2e4f74b2ef74dc0203badee v: v3 --- [refs] | 2 +- trunk/net/netfilter/nf_conntrack_netlink.c | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 6054304c3d30..f94f13d6c0a2 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b3e0bfa71b1db9d7a9fbea6965867784fd00ca3c +refs/heads/master: 35dba1d7f3ae669128a42c969d599ab8c604d61d diff --git a/trunk/net/netfilter/nf_conntrack_netlink.c b/trunk/net/netfilter/nf_conntrack_netlink.c index a36e6553ddb3..77d209c235a0 100644 --- a/trunk/net/netfilter/nf_conntrack_netlink.c +++ b/trunk/net/netfilter/nf_conntrack_netlink.c @@ -1851,7 +1851,9 @@ ctnetlink_get_expect(struct sock *ctnl, struct sk_buff *skb, if (err < 0) return err; - if (cda[CTA_EXPECT_MASTER]) + if (cda[CTA_EXPECT_TUPLE]) + err = ctnetlink_parse_tuple(cda, &tuple, CTA_EXPECT_TUPLE, u3); + else if (cda[CTA_EXPECT_MASTER]) err = ctnetlink_parse_tuple(cda, &tuple, CTA_EXPECT_MASTER, u3); else return -EINVAL;