apparmor: fix arg_size computation for when setprocattr is null terminated

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

diff --git a/security/apparmor/lsm.c b/security/apparmor/lsm.c
index c6921a0145ed543dd3300f2941a26c0083cad5e9..3be30c701bfab4030f11a652992c26423aba4ddf 100644 (file)
--- a/security/apparmor/lsm.c
+++ b/security/apparmor/lsm.c
@@ -529,7 +529,7 @@ static int apparmor_setprocattr(struct task_struct *task, char *name,
        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,