Commit 7c6b4121 authored by Romain Bellan's avatar Romain Bellan Committed by Pablo Neira Ayuso

netfilter: ctnetlink: be more strict when NF_CONNTRACK_MARK is not set

When CONFIG_NF_CONNTRACK_MARK is not set, any CTA_MARK or CTA_MARK_MASK
in netlink message are not supported. We should return an error when one
of them is set, not both

Fixes: 9306425b ("netfilter: ctnetlink: must check mark attributes vs NULL")
Signed-off-by: default avatarRomain Bellan <romain.bellan@wifirst.fr>
Signed-off-by: default avatarFlorent Fourcot <florent.fourcot@wifirst.fr>
Signed-off-by: default avatarPablo Neira Ayuso <pablo@netfilter.org>
parent 28f715b9
...@@ -860,7 +860,7 @@ ctnetlink_alloc_filter(const struct nlattr * const cda[], u8 family) ...@@ -860,7 +860,7 @@ ctnetlink_alloc_filter(const struct nlattr * const cda[], u8 family)
struct ctnetlink_filter *filter; struct ctnetlink_filter *filter;
#ifndef CONFIG_NF_CONNTRACK_MARK #ifndef CONFIG_NF_CONNTRACK_MARK
if (cda[CTA_MARK] && cda[CTA_MARK_MASK]) if (cda[CTA_MARK] || cda[CTA_MARK_MASK])
return ERR_PTR(-EOPNOTSUPP); return ERR_PTR(-EOPNOTSUPP);
#endif #endif
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment