diff mbox series

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

Message ID 20210427194528.2325108-2-arnd@kernel.org
State New
Headers show
Series [1/2] netfilter: nft_socket: fix an unused variable warning | expand

Commit Message

Arnd Bergmann April 27, 2021, 7:45 p.m. UTC 
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.
---
 net/netfilter/nft_socket.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

-- 
2.29.2

Comments

Pablo Neira Ayuso April 27, 2021, 8:36 p.m. UTC | #1 
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.
diff mbox series

Patch

diff --git a/net/netfilter/nft_socket.c b/net/netfilter/nft_socket.c
index f9c5ff6024e0..d601974c9d2e 100644
--- a/net/netfilter/nft_socket.c
+++ b/net/netfilter/nft_socket.c
@@ -34,7 +34,7 @@  static void nft_socket_wildcard(const struct nft_pktinfo *pkt,
 	}
 }
 
-#ifdef CONFIG_CGROUPS
+#ifdef CONFIG_SOCK_CGROUP_DATA
 static noinline bool
 nft_sock_get_eval_cgroupv2(u32 *dest, const struct nft_pktinfo *pkt, u32 level)
 {
@@ -106,7 +106,7 @@  static void nft_socket_eval(const struct nft_expr *expr,
 		}
 		nft_socket_wildcard(pkt, regs, sk, dest);
 		break;
-#ifdef CONFIG_CGROUPS
+#ifdef CONFIG_SOCK_CGROUP_DATA
 	case NFT_SOCKET_CGROUPV2:
 		if (!nft_sock_get_eval_cgroupv2(dest, pkt, priv->level)) {
 			regs->verdict.code = NFT_BREAK;