]> git.baikalelectronics.ru Git - kernel.git/commit
netfilter: nft_socket: fix build with CONFIG_SOCK_CGROUP_DATA=n
authorArnd Bergmann <arnd@arndb.de>
Tue, 27 Apr 2021 19:45:19 +0000 (21:45 +0200)
committerPablo Neira Ayuso <pablo@netfilter.org>
Tue, 27 Apr 2021 20:34:05 +0000 (22:34 +0200)
commit719dc356e1e17866b2e4db8c0bbcc75ec9ac6463
treeafa1f67dbeb4b2e9459caaae6767db83d0419bab
parenta9a69939b42ee480b26135a3ecbe594a82888777
netfilter: nft_socket: fix build with CONFIG_SOCK_CGROUP_DATA=n

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: b7332d704204 ("netfilter: nft_socket: add support for cgroupsv2")
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
net/netfilter/nft_socket.c