From: jjohansen@suse.de Subject: [AppArmor 02/41] Remove redundant check from proc_setattr() Date: Thu, 12 Apr 2007 02:08:11 -0700 Message-ID: <20070412090836.582976000@suse.de> References: <20070412090809.917795000@suse.de> Cc: linux-security-module@vger.kernel.org, linux-fsdevel@vger.kernel.org, chrisw@sous-sol.org, Tony Jones , Andreas Gruenbacher , John Johansen To: linux-kernel@vger.kernel.org Return-path: Received: from mx1.suse.de ([195.135.220.2]:57867 "EHLO mx1.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1945952AbXDLJk3 (ORCPT ); Thu, 12 Apr 2007 05:40:29 -0400 Content-Disposition: inline; filename=proc_setattr.diff Sender: linux-fsdevel-owner@vger.kernel.org List-Id: linux-fsdevel.vger.kernel.org notify_change() already calls security_inode_setattr() before calling iop->setattr. Signed-off-by: Tony Jones Signed-off-by: Andreas Gruenbacher Signed-off-by: John Johansen --- fs/proc/base.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) --- a/fs/proc/base.c +++ b/fs/proc/base.c @@ -344,11 +344,8 @@ static int proc_setattr(struct dentry *d return -EPERM; error = inode_change_ok(inode, attr); - if (!error) { - error = security_inode_setattr(dentry, attr); - if (!error) - error = inode_setattr(inode, attr); - } + if (!error) + error = inode_setattr(inode, attr); return error; } --