Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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: Matthias Kaehlcke <mka@chromium.org>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>

authored by

Matthias Kaehlcke and committed by
Pablo Neira Ayuso
a2b7cbdd 1c4d5f51

+3 -4
+3 -4
net/netfilter/nf_conntrack_netlink.c
··· 1007 1007 1008 1008 static int 1009 1009 ctnetlink_parse_tuple(const struct nlattr * const cda[], 1010 - struct nf_conntrack_tuple *tuple, 1011 - enum ctattr_type type, u_int8_t l3num, 1012 - struct nf_conntrack_zone *zone) 1010 + struct nf_conntrack_tuple *tuple, u32 type, 1011 + u_int8_t l3num, struct nf_conntrack_zone *zone) 1013 1012 { 1014 1013 struct nlattr *tb[CTA_TUPLE_MAX+1]; 1015 1014 int err; ··· 2446 2447 2447 2448 static int ctnetlink_exp_dump_tuple(struct sk_buff *skb, 2448 2449 const struct nf_conntrack_tuple *tuple, 2449 - enum ctattr_expect type) 2450 + u32 type) 2450 2451 { 2451 2452 struct nlattr *nest_parms; 2452 2453