commit d4d03f74a73f3b8b2801d4d02011b6b69778cbcc
author John Johansen <john.johansen@canonical.com> Sat Jul 09 23:46:33 2016 -0700
committer John Johansen <john.johansen@canonical.com> Tue Jul 12 08:43:10 2016 -0700
tree 47f8751de4824ffe3def8e782cba942998a26843
parent e89b8081327ac9efbf273e790b8677e64fd0361a

apparmor: fix arg_size computation for when setprocattr is null terminated

Signed-off-by: John Johansen <john.johansen@canonical.com>

security/apparmor/lsm.c

diff --git a/security/apparmor/lsm.c b/security/apparmor/lsm.c
index c6921a0..3be30c7 100644
--- a/security/apparmor/lsm.c
+++ b/security/apparmor/lsm.c
@@ -529,7 +529,7 @@
 	if (!*args)
 		goto out;
 
-	arg_size = size - (args - (char *) value);
+	arg_size = size - (args - (largs ? largs : (char *) value));
 	if (strcmp(name, "current") == 0) {
 		if (strcmp(command, "changehat") == 0) {
 			error = aa_setprocattr_changehat(args, arg_size,