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

Commit 58fc419b authored by Andreas Jaggi's avatar Andreas Jaggi Committed by Pablo Neira Ayuso
Browse files

netfilter: ctnetlink: always honor CTA_MARK_MASK 



Useful to only set a particular range of the conntrack mark while
leaving existing parts of the value alone, e.g. when updating
conntrack marks via netlink from userspace.

For NFQUEUE it was already implemented in commit 534473c6
("netfilter: ctnetlink: honor CTA_MARK_MASK when setting ctmark").

This now adds the same functionality also for the other netlink
conntrack mark changes.

Signed-off-by: default avatarAndreas Jaggi <andreas.jaggi@waterwave.ch>
Signed-off-by: default avatarPablo Neira Ayuso <pablo@netfilter.org>
parent 1226cfe3

net/netfilter/nf_conntrack_netlink.c

+19 −10
Original line number Diff line number Diff line
@@ -1688,6 +1688,22 @@ static int ctnetlink_change_timeout(struct nf_conn *ct, 
	return 0;

}



#if defined(CONFIG_NF_CONNTRACK_MARK)

static void ctnetlink_change_mark(struct nf_conn *ct,

				    const struct nlattr * const cda[])

{

	u32 mark, newmark, mask = 0;



	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



static const struct nla_policy protoinfo_policy[CTA_PROTOINFO_MAX+1] = {

	[CTA_PROTOINFO_TCP]	= { .type = NLA_NESTED },

	[CTA_PROTOINFO_DCCP]	= { .type = NLA_NESTED },
@@ -1883,7 +1899,7 @@ ctnetlink_change_conntrack(struct nf_conn *ct, 


#if defined(CONFIG_NF_CONNTRACK_MARK)

	if (cda[CTA_MARK])

		ct->mark = ntohl(nla_get_be32(cda[CTA_MARK]));

		ctnetlink_change_mark(ct, cda);

#endif



	if (cda[CTA_SEQ_ADJ_ORIG] || cda[CTA_SEQ_ADJ_REPLY]) {
@@ -2027,7 +2043,7 @@ ctnetlink_create_conntrack(struct net *net, 


#if defined(CONFIG_NF_CONNTRACK_MARK)

	if (cda[CTA_MARK])

		ct->mark = ntohl(nla_get_be32(cda[CTA_MARK]));

		ctnetlink_change_mark(ct, cda);

#endif



	/* setup master conntrack: this is a confirmed expectation */
@@ -2524,14 +2540,7 @@ ctnetlink_glue_parse_ct(const struct nlattr *cda[], struct nf_conn *ct) 
	}

#if defined(CONFIG_NF_CONNTRACK_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;

		ctnetlink_change_mark(ct, cda);

	}

#endif

	return 0;