From: John Johansen Date: Sun, 10 Jul 2016 06:46:33 +0000 (-0700) Subject: apparmor: fix arg_size computation for when setprocattr is null terminated X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=d4d03f74a73f3b8b2801d4d02011b6b69778cbcc;p=deliverable%2Flinux.git apparmor: fix arg_size computation for when setprocattr is null terminated Signed-off-by: John Johansen --- diff --git a/security/apparmor/lsm.c b/security/apparmor/lsm.c index c6921a0145ed..3be30c701bfa 100644 --- 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,