Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph...

[~andy/linux] / net / netfilter / nf_conntrack_netlink.c

diff --git a/net/netfilter/nf_conntrack_netlink.c b/net/netfilter/nf_conntrack_netlink.c
index 08870b859046fb17f40125b7e1f8faeb42d93061..bb322d0beb484f3c66a334a5e0b24651f2a1ffca 100644 (file)
--- a/net/netfilter/nf_conntrack_netlink.c
+++ b/net/netfilter/nf_conntrack_netlink.c
@@ -2118,8 +2118,16 @@ ctnetlink_nfqueue_parse_ct(const struct nlattr *cda[], struct nf_conn *ct)
                        return err;
        }
 #if defined(CONFIG_NF_CONNTRACK_MARK)
-       if (cda[CTA_MARK])
-               ct->mark = ntohl(nla_get_be32(cda[CTA_MARK]));
+       if (cda[CTA_MARK]) {
+               u32 mask = 0, mark, newmark;
+               if (cda[CTA_MARK_MASK])
+                       mask = ~ntohl(nla_get_be32(cda[CTA_MARK_MASK]));
+
+               mark = ntohl(nla_get_be32(cda[CTA_MARK]));
+               newmark = (ct->mark & mask) ^ mark;
+               if (newmark != ct->mark)
+                       ct->mark = newmark;
+       }
 #endif
        return 0;
 }