From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id F0449C433EF for ; Thu, 24 Feb 2022 22:22:53 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235445AbiBXWXW (ORCPT ); Thu, 24 Feb 2022 17:23:22 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54500 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235427AbiBXWXU (ORCPT ); Thu, 24 Feb 2022 17:23:20 -0500 Received: from Chamillionaire.breakpoint.cc (Chamillionaire.breakpoint.cc [IPv6:2a0a:51c0:0:12e:520::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4BD252177C7 for ; Thu, 24 Feb 2022 14:22:50 -0800 (PST) Received: from fw by Chamillionaire.breakpoint.cc with local (Exim 4.92) (envelope-from ) id 1nNMVc-0007HG-SC; Thu, 24 Feb 2022 23:22:48 +0100 Date: Thu, 24 Feb 2022 23:22:48 +0100 From: Florian Westphal To: Florian Westphal Cc: netfilter-devel , Pablo Neira Ayuso Subject: Re: [netfilter-nf:master 47/47] nf_queue.c:undefined reference to `sock_gen_put' Message-ID: <20220224222248.GJ28705@breakpoint.cc> References: <202202250551.bHhoyNSe-lkp@intel.com> <20220224221728.GI28705@breakpoint.cc> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20220224221728.GI28705@breakpoint.cc> User-Agent: Mutt/1.10.1 (2018-07-13) Precedence: bulk List-ID: X-Mailing-List: netfilter-devel@vger.kernel.org Florian Westphal wrote: [ trimmed CC ] > CONFIG_NETFILTER=y > CONFIG_DECNET=y > CONFIG_INET=n > > I could add ugly ifdef to use sock_put() like before for !INET case. > OTOH, the entire nfqueue infra is doubtful in this config. > > Maybe elide that completely? Any advice/preferred solution? Minimal fix would be: diff --git a/net/netfilter/nf_queue.c b/net/netfilter/nf_queue.c --- a/net/netfilter/nf_queue.c +++ b/net/netfilter/nf_queue.c @@ -46,6 +46,15 @@ void nf_unregister_queue_handler(void) } EXPORT_SYMBOL(nf_unregister_queue_handler); +static void nf_queue_sock_put(struct sock *sk) +{ +#ifdef CONFIG_INET + sock_gen_put(sk); +#else + sock_put(sk); +#endif +} + static void nf_queue_entry_release_refs(struct nf_queue_entry *entry) { struct nf_hook_state *state = &entry->state; @@ -54,7 +63,7 @@ static void nf_queue_entry_release_refs(struct nf_queue_entry *entry) dev_put(state->in); dev_put(state->out); if (state->sk) - sock_gen_put(state->sk); + nf_queue_sock_put(state->sk); #if IS_ENABLED(CONFIG_BRIDGE_NETFILTER) dev_put(entry->physin);