Re: [PATCH 2/2] netfilter: nft_socket: fix build with CONFIG_SOCK_CGROUP_DATA=n

Pablo Neira Ayuso
2021-04-27T20:36:31Z

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.