Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge tag 'apparmor-pr-2019-02-01' of git://git.kernel.org/pub/scm/linux/kernel/git/jj/linux-apparmor
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
+6
-1
+4
-1
security/apparmor/domain.c
+4
-1
security/apparmor/domain.c
···
1444
1444
new = aa_label_merge(label, target, GFP_KERNEL);
1445
1445
if (IS_ERR_OR_NULL(new)) {
1446
1446
info = "failed to build target label";
1447
-
error = PTR_ERR(new);
1447
+
if (!new)
1448
+
error = -ENOMEM;
1449
+
else
1450
+
error = PTR_ERR(new);
1448
1451
new = NULL;
1449
1452
perms.allow = 0;
1450
1453
goto audit;
+2
security/apparmor/lsm.c
+2
security/apparmor/lsm.c
···
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
{