netdev - Re: [PATCH] netfilter: nft_fwd_netdev: Fix CONFIG_NET_CLS

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite for Android: free password hash cracker in your pocket

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Date:   Wed, 25 Mar 2020 12:02:18 +0100
From:   Pablo Neira Ayuso <pablo@...filter.org>
To:     Geert Uytterhoeven <geert@...ux-m68k.org>
Cc:     Jozsef Kadlecsik <kadlec@...filter.org>,
        Florian Westphal <fw@...len.de>,
        "David S . Miller" <davem@...emloft.net>,
        Jakub Kicinski <kuba@...nel.org>,
        NetFilter <netfilter-devel@...r.kernel.org>,
        coreteam@...filter.org, netdev <netdev@...r.kernel.org>,
        Linux-Next <linux-next@...r.kernel.org>
Subject: Re: [PATCH] netfilter: nft_fwd_netdev: Fix CONFIG_NET_CLS_ACT=n build

On Wed, Mar 25, 2020 at 12:00:08PM +0100, Geert Uytterhoeven wrote:
> Hi Pablo,
> 
> On Wed, Mar 25, 2020 at 11:40 AM Pablo Neira Ayuso <pablo@...filter.org> wrote:
> > On Wed, Mar 25, 2020 at 10:33:00AM +0100, Geert Uytterhoeven wrote:
> > > If CONFIG_NET_CLS_ACT=n:
> > >
> > >     net/netfilter/nft_fwd_netdev.c: In function ‘nft_fwd_netdev_eval’:
> > >     net/netfilter/nft_fwd_netdev.c:32:10: error: ‘struct sk_buff’ has no member named ‘tc_redirected’
> > >       pkt->skb->tc_redirected = 1;
> > >             ^~
> > >     net/netfilter/nft_fwd_netdev.c:33:10: error: ‘struct sk_buff’ has no member named ‘tc_from_ingress’
> > >       pkt->skb->tc_from_ingress = 1;
> > >             ^~
> > >
> > > Fix this by protecting this code hunk with the appropriate #ifdef.
> >
> > Sorry about this, and thank you for fixing up this so fast.
> >
> > I'm attaching an alternative fix to avoid a dependency on tc from
> > netfilter. Still testing, if fine and no objections I'll formally
> > submit this.
> 
> Thanks, that fixes the issue, too.
> (Note that I didn't do a full build).

Thanks. I'll submit formaly asap.

There was another spot I forgot to update in net/core/pktgen.c, I will
include that chunk too in my formal submission.