netdev - [PATCH] [net-next] ifb: fix building without 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: Windows password security audit tool. GUI, reports in PDF.

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

Message-Id: <20211029113102.769823-1-arnd@kernel.org>
Date:   Fri, 29 Oct 2021 13:30:51 +0200
From:   Arnd Bergmann <arnd@...nel.org>
To:     "David S. Miller" <davem@...emloft.net>,
        Jakub Kicinski <kuba@...nel.org>,
        Lukas Wunner <lukas@...ner.de>
Cc:     Arnd Bergmann <arnd@...db.de>,
        Willem de Bruijn <willemb@...gle.com>,
        Hui Tang <tanghui20@...wei.com>,
        Emil Renner Berthing <kernel@...il.dk>,
        Pablo Neira Ayuso <pablo@...filter.org>,
        Alexander Lobakin <alobakin@...me>, netdev@...r.kernel.org,
        linux-kernel@...r.kernel.org
Subject: [PATCH] [net-next] ifb: fix building without CONFIG_NET_CLS_ACT

From: Arnd Bergmann <arnd@...db.de>

The driver no longer depends on this option, but it fails to
build if it's disabled because the skb->tc_skip_classify is
hidden behind an #ifdef:

drivers/net/ifb.c:81:8: error: no member named 'tc_skip_classify' in 'struct sk_buff'
                skb->tc_skip_classify = 1;

Use the same #ifdef around the assignment.

Fixes: 046178e726c2 ("ifb: Depend on netfilter alternatively to tc")
Signed-off-by: Arnd Bergmann <arnd@...db.de>
---
 drivers/net/ifb.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/drivers/net/ifb.c b/drivers/net/ifb.c
index 2c319dd27f29..31f522b8e54e 100644
--- a/drivers/net/ifb.c
+++ b/drivers/net/ifb.c
@@ -78,7 +78,9 @@ static void ifb_ri_tasklet(struct tasklet_struct *t)
 	while ((skb = __skb_dequeue(&txp->tq)) != NULL) {
 		/* Skip tc and netfilter to prevent redirection loop. */
 		skb->redirected = 0;
+#ifdef CONFIG_NET_CLS_ACT
 		skb->tc_skip_classify = 1;
+#endif
 		nf_skip_egress(skb, true);
 
 		u64_stats_update_begin(&txp->tsync);
-- 
2.29.2