From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Thu, 6 May 2021 00:05:10 +0000 (+1000)
Subject: Merge remote-tracking branch 'apparmor/apparmor-next'
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=25cee3a9d0f0409374fdb16b0e322e3de9e68eb5;p=users%2Fjedix%2Flinux-maple.git

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

25cee3a9d0f0409374fdb16b0e322e3de9e68eb5
diff --cc security/apparmor/lsm.c
index f72406fe1bf27,64d6020ffd509..0834ba6a8a2e7
--- a/security/apparmor/lsm.c
+++ b/security/apparmor/lsm.c
@@@ -1711,9 -1701,9 +1711,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;