From: James Morris <james.l.morris@oracle.com>
Date: Thu, 9 Feb 2017 23:28:49 +0000 (+1100)
Subject: Merge branch 'stable-4.11' of git://git.infradead.org/users/pcmoore/selinux into... 
X-Git-Tag: rel_imx_4.19.35_1.1.0~13141^2~8
X-Git-Url: https://git.somdevices.com/?a=commitdiff_plain;h=a2a15479d617ebbab67c60b4eed02524536af780;p=linux.git

Merge branch 'stable-4.11' of git://git.infradead.org/users/pcmoore/selinux into next
---

a2a15479d617ebbab67c60b4eed02524536af780
diff --cc security/apparmor/lsm.c
index b63d39ca6278,8202e5583479..709eacd23909
--- a/security/apparmor/lsm.c
+++ b/security/apparmor/lsm.c
@@@ -505,9 -495,11 +505,9 @@@ static int apparmor_getprocattr(struct 
  	return error;
  }
  
- static int apparmor_setprocattr(struct task_struct *task, char *name,
- 				void *value, size_t size)
+ static int apparmor_setprocattr(const char *name, void *value,
+ 				size_t size)
  {
 -	struct common_audit_data sa;
 -	struct apparmor_audit_data aad = {0,};
  	char *command, *largs = NULL, *args = value;
  	size_t arg_size;
  	int error;