diff options
| author | Eric Paris <eparis@redhat.com> | 2010-10-19 18:17:32 -0400 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2010-10-21 10:13:00 +1100 |
| commit | ff660c80d00b52287f1f67ee6c115dc0057bcdde (patch) | |
| tree | 63a0e4c69b9d78b5b81156029d5599dc2f3bf0a4 | |
| parent | 845ca30fe9691f1bab7cfbf30b6d11c944eb4abd (diff) | |
| download | linux-3.10-ff660c80d00b52287f1f67ee6c115dc0057bcdde.tar.gz linux-3.10-ff660c80d00b52287f1f67ee6c115dc0057bcdde.tar.bz2 linux-3.10-ff660c80d00b52287f1f67ee6c115dc0057bcdde.zip | |
secmark: fix config problem when CONFIG_NF_CONNTRACK_SECMARK is not set
When CONFIG_NF_CONNTRACK_SECMARK is not set we accidentally attempt to use
the secmark fielf of struct nf_conn. Problem is when that config isn't set
the field doesn't exist. whoops. Wrap the incorrect usage in the config.
Signed-off-by: Eric Paris <eparis@redhat.com>
Signed-off-by: James Morris <jmorris@namei.org>
| -rw-r--r-- | net/netfilter/nf_conntrack_netlink.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/net/netfilter/nf_conntrack_netlink.c b/net/netfilter/nf_conntrack_netlink.c index b3c628555cf..146476c6441 100644 --- a/net/netfilter/nf_conntrack_netlink.c +++ b/net/netfilter/nf_conntrack_netlink.c @@ -582,9 +582,11 @@ ctnetlink_conntrack_event(unsigned int events, struct nf_ct_event *item) && ctnetlink_dump_helpinfo(skb, ct) < 0) goto nla_put_failure; +#ifdef CONFIG_NF_CONNTRACK_SECMARK if ((events & (1 << IPCT_SECMARK) || ct->secmark) && ctnetlink_dump_secctx(skb, ct) < 0) goto nla_put_failure; +#endif if (events & (1 << IPCT_RELATED) && ctnetlink_dump_master(skb, ct) < 0) |