Merge tag 'apparmor-pr-2019-02-01' of git://git.kernel.org/pub/scm/linux/kernel/git/jj/linux-apparmor

torvalds · torvalds · commit b7bd29b530b9 · 2019-02-01T16:18:38.000-08:00
Pull apparmor bug fixes from John Johansen:
 "Two bug fixes for apparmor:

   - Fix aa_label_build() error handling for failed merges

   - Fix warning about unused function apparmor_ipv6_postroute"

* tag 'apparmor-pr-2019-02-01' of git://git.kernel.org/pub/scm/linux/kernel/git/jj/linux-apparmor:
  apparmor: Fix aa_label_build() error handling for failed merges
  apparmor: Fix warning about unused function apparmor_ipv6_postroute
diff --git a/security/apparmor/domain.c b/security/apparmor/domain.c
@@ -1444,7 +1444,10 @@ int aa_change_profile(const char *fqname, int flags)
 			new = aa_label_merge(label, target, GFP_KERNEL);
 		if (IS_ERR_OR_NULL(new)) {
 			info = "failed to build target label";
-			error = PTR_ERR(new);
+			if (!new)
+				error = -ENOMEM;
+			else
+				error = PTR_ERR(new);
 			new = NULL;
 			perms.allow = 0;
 			goto audit;
diff --git a/security/apparmor/lsm.c b/security/apparmor/lsm.c
@@ -1599,12 +1599,14 @@ static unsigned int apparmor_ipv4_postroute(void *priv,
 	return apparmor_ip_postroute(priv, skb, state);
 }
 
+#if IS_ENABLED(CONFIG_IPV6)
 static unsigned int apparmor_ipv6_postroute(void *priv,
 					    struct sk_buff *skb,
 					    const struct nf_hook_state *state)
 {
 	return apparmor_ip_postroute(priv, skb, state);
 }
+#endif
 
 static const struct nf_hook_ops apparmor_nf_ops[] = {
 	{

Original file line number	Diff line number	Diff line change
`@@ -1599,12 +1599,14 @@ static unsigned int apparmor_ipv4_postroute(void *priv,`
`1599`	`1599`	`return apparmor_ip_postroute(priv, skb, state);`
`1600`	`1600`	`}`
`1601`	`1601`
	`1602`	`+#if IS_ENABLED(CONFIG_IPV6)`
`1602`	`1603`	`static unsigned int apparmor_ipv6_postroute(void *priv,`
`1603`	`1604`	`struct sk_buff *skb,`
`1604`	`1605`	`const struct nf_hook_state *state)`
`1605`	`1606`	`{`
`1606`	`1607`	`return apparmor_ip_postroute(priv, skb, state);`
`1607`	`1608`	`}`
	`1609`	`+#endif`
`1608`	`1610`
`1609`	`1611`	`static const struct nf_hook_ops apparmor_nf_ops[] = {`
`1610`	`1612`	`{`