From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Wed, 14 Apr 2021 04:31:41 +0000 (+1000)
Subject: Merge remote-tracking branch 'apparmor/apparmor-next'
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=05c53590f38a2b00f3c27708b03c7dab8afde605;p=users%2Fjedix%2Flinux-maple.git

Merge remote-tracking branch 'apparmor/apparmor-next'
---

05c53590f38a2b00f3c27708b03c7dab8afde605
diff --cc security/apparmor/lsm.c
index 240a53387e6b,64d6020ffd50..befd4ef14dfb
--- a/security/apparmor/lsm.c
+++ b/security/apparmor/lsm.c
@@@ -1710,9 -1701,9 +1710,9 @@@ static int __init alloc_buffers(void
  
  #ifdef CONFIG_SYSCTL
  static int apparmor_dointvec(struct ctl_table *table, int write,
 -			     void __user *buffer, size_t *lenp, loff_t *ppos)
 +			     void *buffer, size_t *lenp, loff_t *ppos)
  {
- 	if (!policy_admin_capable(NULL))
+ 	if (!aa_current_policy_admin_capable(NULL))
  		return -EPERM;
  	if (!apparmor_enabled)
  		return -EINVAL;