p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Smack: Fix build when NETWORK_SECMARK is not set 

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

Reported-by: kernel test robot <lkp@intel.com>
Signed-off-by: Casey Schaufler <casey@schaufler-ca.com>
This commit is contained in:
Casey Schaufler 2020-09-22 14:59:31 -07:00
parent 322dd63c7f
commit bf0afe673b
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
security/smack/smack_lsm.c
View File

@ -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. * 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) static struct smack_known *smack_from_skb(struct sk_buff *skb)
{ {
if (skb == NULL || skb->secmark == 0) 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); 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 * smack_from_netlbl - Smack data from the IP options in an skb