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

Commit 71951b64 authored by Pablo Neira Ayuso's avatar Pablo Neira Ayuso Committed by Patrick McHardy
Browse files

netfilter: nf_ct_dccp: add missing role attributes for DCCP 



This patch adds missing role attribute to the DCCP type, otherwise
the creation of entries is not of any use.

The attribute added is CTA_PROTOINFO_DCCP_ROLE which contains the
role of the conntrack original tuple.

Signed-off-by: default avatarPablo Neira Ayuso <pablo@netfilter.org>
Signed-off-by: default avatarPatrick McHardy <kaber@trash.net>
parent 4b070662

include/linux/netfilter/nfnetlink_conntrack.h

+1 −0
Original line number Diff line number Diff line
@@ -100,6 +100,7 @@ enum ctattr_protoinfo_tcp { 
enum ctattr_protoinfo_dccp {

	CTA_PROTOINFO_DCCP_UNSPEC,

	CTA_PROTOINFO_DCCP_STATE,

	CTA_PROTOINFO_DCCP_ROLE,

	__CTA_PROTOINFO_DCCP_MAX,

};

#define CTA_PROTOINFO_DCCP_MAX (__CTA_PROTOINFO_DCCP_MAX - 1)

net/netfilter/nf_conntrack_proto_dccp.c

+14 −1
Original line number Diff line number Diff line
@@ -633,6 +633,8 @@ static int dccp_to_nlattr(struct sk_buff *skb, struct nlattr *nla, 
	if (!nest_parms)

		goto nla_put_failure;

	NLA_PUT_U8(skb, CTA_PROTOINFO_DCCP_STATE, ct->proto.dccp.state);

	NLA_PUT_U8(skb, CTA_PROTOINFO_DCCP_ROLE,

		   ct->proto.dccp.role[IP_CT_DIR_ORIGINAL]);

	nla_nest_end(skb, nest_parms);

	read_unlock_bh(&dccp_lock);

	return 0;
@@ -644,6 +646,7 @@ nla_put_failure: 


static const struct nla_policy dccp_nla_policy[CTA_PROTOINFO_DCCP_MAX + 1] = {

	[CTA_PROTOINFO_DCCP_STATE]	= { .type = NLA_U8 },

	[CTA_PROTOINFO_DCCP_ROLE]	= { .type = NLA_U8 },

};



static int nlattr_to_dccp(struct nlattr *cda[], struct nf_conn *ct)
@@ -661,11 +664,21 @@ static int nlattr_to_dccp(struct nlattr *cda[], struct nf_conn *ct) 
		return err;



	if (!tb[CTA_PROTOINFO_DCCP_STATE] ||

	    nla_get_u8(tb[CTA_PROTOINFO_DCCP_STATE]) >= CT_DCCP_IGNORE)

	    !tb[CTA_PROTOINFO_DCCP_ROLE] ||

	    nla_get_u8(tb[CTA_PROTOINFO_DCCP_ROLE]) > CT_DCCP_ROLE_MAX ||

	    nla_get_u8(tb[CTA_PROTOINFO_DCCP_STATE]) >= CT_DCCP_IGNORE) {

		return -EINVAL;

	}



	write_lock_bh(&dccp_lock);

	ct->proto.dccp.state = nla_get_u8(tb[CTA_PROTOINFO_DCCP_STATE]);

	if (nla_get_u8(tb[CTA_PROTOINFO_DCCP_ROLE]) == CT_DCCP_ROLE_CLIENT) {

		ct->proto.dccp.role[IP_CT_DIR_ORIGINAL] = CT_DCCP_ROLE_CLIENT;

		ct->proto.dccp.role[IP_CT_DIR_REPLY] = CT_DCCP_ROLE_SERVER;

	} else {

		ct->proto.dccp.role[IP_CT_DIR_ORIGINAL] = CT_DCCP_ROLE_SERVER;

		ct->proto.dccp.role[IP_CT_DIR_REPLY] = CT_DCCP_ROLE_CLIENT;

	}

	write_unlock_bh(&dccp_lock);

	return 0;

}