Commit bf0afe67 authored by Casey Schaufler's avatar Casey Schaufler
Browse files

Smack: Fix build when NETWORK_SECMARK is not set 



Use proper conditional compilation for the secmark field in
the network skb.

Reported-by: default avatarkernel test robot <lkp@intel.com>
Signed-off-by: default avatarCasey Schaufler <casey@schaufler-ca.com>
parent 322dd63c

security/smack/smack_lsm.c

+7 −0
Original line number Diff line number Diff line
@@ -3838,6 +3838,7 @@ static int smk_skb_to_addr_ipv6(struct sk_buff *skb, struct sockaddr_in6 *sip) 
 *

 * Returns smack_known of the secmark or NULL if that won't work.

 */

#ifdef CONFIG_NETWORK_SECMARK

static struct smack_known *smack_from_skb(struct sk_buff *skb)

{

	if (skb == NULL || skb->secmark == 0)
@@ -3845,6 +3846,12 @@ static struct smack_known *smack_from_skb(struct sk_buff *skb) 


	return smack_from_secid(skb->secmark);

}

#else

static inline struct smack_known *smack_from_skb(struct sk_buff *skb)

{

	return NULL;

}

#endif



/**

 * smack_from_netlbl - Smack data from the IP options in an skb

CRA Git | Maintained and supported by SUSTech CRA and CCSE