lkml.org 
[lkml]   [2010]   [Jul]   [29]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
Date
From
SubjectRe: [AppArmor #7 0/13] AppArmor security module
On Thu, 29 Jul 2010, John Johansen wrote:

> This is the seveth general posting of the newest version of the
> AppArmor security module it has been rewritten to use the security_path
> hooks instead of the previous vfs approach. The current implementation
> is aimed at being as semantically close to previous versions of AppArmor
> as possible while using the existing LSM infrastructure.

Applied to
git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6#next

Please carry out any further development against the above tree.

Note that I added the patch below to update AA against the latest
version of path_truncate:


commit 08c702abe63c2da88f811d5c9f98eb01eb8edc77
Author: James Morris <jmorris@namei.org>
Date: Fri Jul 30 09:02:04 2010 +1000

AppArmor: update path_truncate method to latest version

Remove extraneous path_truncate arguments from the AppArmor hook,
as they've been removed from the LSM API.

Signed-off-by: James Morris <jmorris@namei.org>

diff --git a/security/apparmor/lsm.c b/security/apparmor/lsm.c
index 7daf0d5..8db33a8 100644
--- a/security/apparmor/lsm.c
+++ b/security/apparmor/lsm.c
@@ -278,8 +278,7 @@ static int apparmor_path_mknod(struct path *dir, struct dentry *dentry,
return common_perm_create(OP_MKNOD, dir, dentry, AA_MAY_CREATE, mode);
}

-static int apparmor_path_truncate(struct path *path, loff_t length,
- unsigned int time_attrs)
+static int apparmor_path_truncate(struct path *path)
{
struct path_cond cond = { path->dentry->d_inode->i_uid,
path->dentry->d_inode->i_mode

--
James Morris
<jmorris@namei.org>


\
 
 \ /
  Last update: 2010-07-30 01:07    [from the cache]
©2003-2011 Jasper Spaans