UBUNTU: SAUCE: Yama: follow changes to generic_permission
authorAndy Whitcroft <apw@canonical.com>
Mon, 17 Jan 2011 10:57:56 +0000 (10:57 +0000)
committerLeann Ogasawara <leann.ogasawara@canonical.com>
Mon, 28 Mar 2011 13:52:55 +0000 (06:52 -0700)
Signed-off-by: Andy Whitcroft <apw@canonical.com>

security/yama/yama_lsm.c

index 1fb1f90..a1aed18 100644 (file)
@@ -347,7 +347,7 @@ int yama_path_link(struct dentry *old_dentry, struct path *new_dir,
        if (cred->fsuid != inode->i_uid &&
            (!S_ISREG(mode) || (mode & S_ISUID) ||
             ((mode & (S_ISGID | S_IXGRP)) == (S_ISGID | S_IXGRP)) ||
-            (generic_permission(inode, MAY_READ | MAY_WRITE, NULL))) &&
+            (generic_permission(inode, MAY_READ | MAY_WRITE, 0, NULL))) &&
            !capable(CAP_FOWNER)) {
                char name[sizeof(current->comm)];
                printk_ratelimited(KERN_INFO "non-accessible hardlink"