Commit 1a93a6ea authored by Javier Martinez Canillas's avatar Javier Martinez Canillas Committed by Paul Moore
Browse files

security: Use IS_ENABLED() instead of checking for built-in or module 



The IS_ENABLED() macro checks if a Kconfig symbol has been enabled
either built-in or as a module, use that macro instead of open coding
the same.

Signed-off-by: default avatarJavier Martinez Canillas <javier@osg.samsung.com>
Acked-by: default avatarCasey Schaufler <casey@schaufler-ca.com>
Signed-off-by: default avatarPaul Moore <paul@paul-moore.com>
parent 29b4817d

security/lsm_audit.c

+1 −1
Original line number Diff line number Diff line
@@ -99,7 +99,7 @@ int ipv4_skb_to_auditdata(struct sk_buff *skb, 
	}

	return ret;

}

#if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE)

#if IS_ENABLED(CONFIG_IPV6)

/**

 * ipv6_skb_to_auditdata : fill auditdata from skb

 * @skb : the skb

security/selinux/hooks.c

+6 −6
Original line number Diff line number Diff line
@@ -3984,7 +3984,7 @@ out: 
	return ret;

}



#if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE)

#if IS_ENABLED(CONFIG_IPV6)



/* Returns error only if unable to parse addresses */

static int selinux_parse_skb_ipv6(struct sk_buff *skb,
@@ -4075,7 +4075,7 @@ static int selinux_parse_skb(struct sk_buff *skb, struct common_audit_data *ad, 
				       &ad->u.net->v4info.daddr);

		goto okay;



#if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE)

#if IS_ENABLED(CONFIG_IPV6)

	case PF_INET6:

		ret = selinux_parse_skb_ipv6(skb, ad, proto);

		if (ret)
@@ -5029,7 +5029,7 @@ static unsigned int selinux_ipv4_forward(void *priv, 
	return selinux_ip_forward(skb, state->in, PF_INET);

}



#if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE)

#if IS_ENABLED(CONFIG_IPV6)

static unsigned int selinux_ipv6_forward(void *priv,

					 struct sk_buff *skb,

					 const struct nf_hook_state *state)
@@ -5087,7 +5087,7 @@ static unsigned int selinux_ipv4_output(void *priv, 
	return selinux_ip_output(skb, PF_INET);

}



#if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE)

#if IS_ENABLED(CONFIG_IPV6)

static unsigned int selinux_ipv6_output(void *priv,

					struct sk_buff *skb,

					const struct nf_hook_state *state)
@@ -5273,7 +5273,7 @@ static unsigned int selinux_ipv4_postroute(void *priv, 
	return selinux_ip_postroute(skb, state->out, PF_INET);

}



#if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE)

#if IS_ENABLED(CONFIG_IPV6)

static unsigned int selinux_ipv6_postroute(void *priv,

					   struct sk_buff *skb,

					   const struct nf_hook_state *state)
@@ -6317,7 +6317,7 @@ static struct nf_hook_ops selinux_nf_ops[] = { 
		.hooknum =	NF_INET_LOCAL_OUT,

		.priority =	NF_IP_PRI_SELINUX_FIRST,

	},

#if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE)

#if IS_ENABLED(CONFIG_IPV6)

	{

		.hook =		selinux_ipv6_postroute,

		.pf =		NFPROTO_IPV6,

security/smack/smack_netfilter.c

+2 −2
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ 
#include <net/inet_sock.h>

#include "smack.h"



#if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE)

#if IS_ENABLED(CONFIG_IPV6)



static unsigned int smack_ipv6_output(void *priv,

					struct sk_buff *skb,
@@ -64,7 +64,7 @@ static struct nf_hook_ops smack_nf_ops[] = { 
		.hooknum =	NF_INET_LOCAL_OUT,

		.priority =	NF_IP_PRI_SELINUX_FIRST,

	},

#if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE)

#if IS_ENABLED(CONFIG_IPV6)

	{

		.hook =		smack_ipv6_output,

		.pf =		NFPROTO_IPV6,

CRA Git | Maintained and supported by SUSTech CRA and CCSE