On Tue, Apr 18, 2017 at 12:43:15PM -0700, Matthias Kaehlcke wrote:
> El Tue, Apr 18, 2017 at 12:41:16PM -0700 Matthias Kaehlcke ha dit:
>
> > Hi Pablo,
> >
> > Thanks for your reply!
> >
> > El Tue, Apr 18, 2017 at 10:39:47AM +0200 Pablo Neira Ayuso ha dit:
> >
> > > On Mon, Apr 17, 2017 at 03:37:30PM -0700, Matthias Kaehlcke wrote:
> > > > Hi,
> > > >
> > > > While working on clang support for kernel builds I came across at what
> > > > at first sight looks like an enum mismatch in the netfilter conntrack
> > > > code:
> > > >
> > > > In multiple occasions CTA_EXPECT_* values (of type enum ctattr_expect)
> > > > are passed to ctnetlink_parse_tuple(), which expects an 'enum
> > > > ctattr_type' as type argument.
> > >
> > > Are you refering to this? See patch.
> >
> > Almost, see patch :)
>
> This time with patch
> diff --git a/net/netfilter/nf_conntrack_netlink.c b/net/netfilter/nf_conntrack_netlink.c
> index 27540455dc62..4d7f3780d64b 100644
> --- a/net/netfilter/nf_conntrack_netlink.c
> +++ b/net/netfilter/nf_conntrack_netlink.c
> @@ -1006,9 +1006,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;
> @@ -2405,7 +2404,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)
> + uint32_t type)
> {
> struct nlattr *nest_parms;
>
Looks fine. Please, add title, description and Signed-off-by tag, I'll
take it :)
--
To unsubscribe from this list: send the line "unsubscribe netfilter-devel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
