From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933869AbdA0LPZ (ORCPT ); Fri, 27 Jan 2017 06:15:25 -0500 Received: from mx2.suse.de ([195.135.220.15]:35798 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933988AbdA0LN0 (ORCPT ); Fri, 27 Jan 2017 06:13:26 -0500 X-Amavis-Alert: BAD HEADER SECTION, Duplicate header field: "References" From: Jiri Slaby To: stable@vger.kernel.org Cc: linux-kernel@vger.kernel.org, John Johansen , Jiri Slaby Subject: [PATCH 3.12 221/235] apparmor: fix arg_size computation for when setprocattr is null terminated Date: Fri, 27 Jan 2017 11:55:54 +0100 Message-Id: <6b0fedeaca5aea94f78edc434aac02d2b37bca51.1485514374.git.jslaby@suse.cz> X-Mailer: git-send-email 2.11.0 In-Reply-To: <5b46dc789ca2be4046e4e40a131858d386cac741.1485514374.git.jslaby@suse.cz> References: <5b46dc789ca2be4046e4e40a131858d386cac741.1485514374.git.jslaby@suse.cz> In-Reply-To: References: Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: John Johansen 3.12-stable review patch. If anyone has any objections, please let me know. =============== commit d4d03f74a73f3b8b2801d4d02011b6b69778cbcc upstream. Signed-off-by: John Johansen Signed-off-by: Jiri Slaby --- security/apparmor/lsm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/security/apparmor/lsm.c b/security/apparmor/lsm.c index 90905af74a8d..c623e4744f55 100644 --- a/security/apparmor/lsm.c +++ b/security/apparmor/lsm.c @@ -562,7 +562,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, -- 2.11.0