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

Commit a2b7cbdd authored by Matthias Kaehlcke's avatar Matthias Kaehlcke Committed by Pablo Neira Ayuso
Browse files

netfilter: ctnetlink: Make some parameters integer to avoid enum mismatch 



Not all parameters passed to ctnetlink_parse_tuple() and
ctnetlink_exp_dump_tuple() match the enum type in the signatures of these
functions. Since this is intended change the argument type of to be an
unsigned integer value.

Signed-off-by: default avatarMatthias Kaehlcke <mka@chromium.org>
Signed-off-by: default avatarPablo Neira Ayuso <pablo@netfilter.org>
parent 1c4d5f51

net/netfilter/nf_conntrack_netlink.c

+3 −4
Original line number Diff line number Diff line
@@ -1007,9 +1007,8 @@ static const struct nla_policy tuple_nla_policy[CTA_TUPLE_MAX+1] = { 


static int

ctnetlink_parse_tuple(const struct nlattr * const cda[],

		      struct nf_conntrack_tuple *tuple,

		      enum ctattr_type type, u_int8_t l3num,

		      struct nf_conntrack_zone *zone)

		      struct nf_conntrack_tuple *tuple, u32 type,

		      u_int8_t l3num, struct nf_conntrack_zone *zone)

{

	struct nlattr *tb[CTA_TUPLE_MAX+1];

	int err;
@@ -2447,7 +2446,7 @@ static struct nfnl_ct_hook ctnetlink_glue_hook = { 


static int ctnetlink_exp_dump_tuple(struct sk_buff *skb,

				    const struct nf_conntrack_tuple *tuple,

				    enum ctattr_expect type)

				    u32 type)

{

	struct nlattr *nest_parms;