Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
Date:   Tue, 27 Apr 2021 22:36:20 +0200
From:   Pablo Neira Ayuso <pablo@netfilter.org>
To:     Arnd Bergmann <arnd@kernel.org>
Cc:     Jozsef Kadlecsik <kadlec@netfilter.org>,
        Florian Westphal <fw@strlen.de>,
        "David S. Miller" <davem@davemloft.net>,
        Jakub Kicinski <kuba@kernel.org>,
        Arnd Bergmann <arnd@arndb.de>,
        Balazs Scheidler <bazsi77@gmail.com>,
        netfilter-devel@vger.kernel.org, coreteam@netfilter.org,
        netdev@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: Re: [PATCH 2/2] netfilter: nft_socket: fix build with
 CONFIG_SOCK_CGROUP_DATA=n
Message-ID: <20210427203620.GB14154@salvia>
References: <20210427194528.2325108-1-arnd@kernel.org>
 <20210427194528.2325108-2-arnd@kernel.org>
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Disposition: inline
In-Reply-To: <20210427194528.2325108-2-arnd@kernel.org>
User-Agent: Mutt/1.10.1 (2018-07-13)
Precedence: bulk

On Tue, Apr 27, 2021 at 09:45:19PM +0200, Arnd Bergmann wrote:
> From: Arnd Bergmann <arnd@arndb.de>
> 
> In some configurations, the sock_cgroup_ptr() function is not available:
> 
> net/netfilter/nft_socket.c: In function 'nft_sock_get_eval_cgroupv2':
> net/netfilter/nft_socket.c:47:16: error: implicit declaration of function 'sock_cgroup_ptr'; did you mean 'obj_cgroup_put'? [-Werror=implicit-function-declaration]
>    47 |         cgrp = sock_cgroup_ptr(&sk->sk_cgrp_data);
>       |                ^~~~~~~~~~~~~~~
>       |                obj_cgroup_put
> net/netfilter/nft_socket.c:47:14: error: assignment to 'struct cgroup *' from 'int' makes pointer from integer without a cast [-Werror=int-conversion]
>    47 |         cgrp = sock_cgroup_ptr(&sk->sk_cgrp_data);
>       |              ^
> 
> Change the caller to match the same #ifdef check, only calling it
> when the function is defined.
> 
> Fixes: e0bb96db96f8 ("netfilter: nft_socket: add support for cgroupsv2")
> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
> ---
> I don't actually know what the right fix is for this, I only checked
> that my patch fixes the build failure. Is is possible that the function
> should always be defined.
> 
> Please make sure you review carefully before applying.

LGTM.

Applied, thanks Arnd.