| From a2b7cbdd2559aff06cebc28a7150f81c307a90d3 Mon Sep 17 00:00:00 2001 |
| From: Matthias Kaehlcke <mka@chromium.org> |
| Date: Wed, 19 Apr 2017 11:39:20 -0700 |
| Subject: netfilter: ctnetlink: Make some parameters integer to avoid enum mismatch |
| |
| From: Matthias Kaehlcke <mka@chromium.org> |
| |
| commit a2b7cbdd2559aff06cebc28a7150f81c307a90d3 upstream. |
| |
| 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> |
| Cc: Nathan Chancellor <natechancellor@gmail.com> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| |
| --- |
| net/netfilter/nf_conntrack_netlink.c | 7 +++---- |
| 1 file changed, 3 insertions(+), 4 deletions(-) |
| |
| --- a/net/netfilter/nf_conntrack_netlink.c |
| +++ b/net/netfilter/nf_conntrack_netlink.c |
| @@ -1008,9 +1008,8 @@ static const struct nla_policy tuple_nla |
| |
| 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; |
| @@ -2409,7 +2408,7 @@ static struct nfnl_ct_hook ctnetlink_glu |
| |
| 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; |
| |