Smack: Fix build when NETWORK_SECMARK is not set

cschaufler · cschaufler · commit bf0afe673b99 · 2020-09-22T14:59:31.000-07:00
Use proper conditional compilation for the secmark field in
the network skb.

Reported-by: kernel test robot &lt;lkp@intel.com&gt;
Signed-off-by: Casey Schaufler &lt;casey@schaufler-ca.com&gt;
diff --git a/security/smack/smack_lsm.c b/security/smack/smack_lsm.c
@@ -3838,13 +3838,20 @@ 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)
 		return NULL;
 
 	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

Original file line number	Diff line number	Diff line change
`@@ -3838,13 +3838,20 @@ static int smk_skb_to_addr_ipv6(struct sk_buff skb, struct sockaddr_in6 sip)`
`3838`	`3838`	`*`
`3839`	`3839`	`* Returns smack_known of the secmark or NULL if that won't work.`
`3840`	`3840`	`*/`
	`3841`	`+#ifdef CONFIG_NETWORK_SECMARK`
`3841`	`3842`	`static struct smack_known smack_from_skb(struct sk_buff skb)`
`3842`	`3843`	`{`
`3843`	`3844`	`if (skb == NULL \|\| skb->secmark == 0)`
`3844`	`3845`	`return NULL;`
`3845`	`3846`
`3846`	`3847`	`return smack_from_secid(skb->secmark);`
`3847`	`3848`	`}`
	`3849`	`+#else`
	`3850`	`+static inline struct smack_known smack_from_skb(struct sk_buff skb)`
	`3851`	`+{`
	`3852`	`+ return NULL;`
	`3853`	`+}`
	`3854`	`+#endif`
`3848`	`3855`
`3849`	`3856`	`/**`
`3850`	`3857`	`* smack_from_netlbl - Smack data from the IP options in an skb`