From f1782148d09281fe75b6848e47fe55ccb4d7222f Mon Sep 17 00:00:00 2001 From: Randy Dunlap Date: Sat, 18 Aug 2012 17:39:25 -0700 Subject: [PATCH] --- yaml --- r: 322096 b: refs/heads/master c: 55852635a8e2803cbc22d0e143d727813f0fcdb5 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/fs/namei.c | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index f1a636bcb6a7..f8a87eba9fb4 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 98022748f6c7bce85b9f123fd4d1a621219dd8d9 +refs/heads/master: 55852635a8e2803cbc22d0e143d727813f0fcdb5 diff --git a/trunk/fs/namei.c b/trunk/fs/namei.c index db76b866a097..dd1ed1b8e98e 100644 --- a/trunk/fs/namei.c +++ b/trunk/fs/namei.c @@ -352,6 +352,7 @@ int __inode_permission(struct inode *inode, int mask) /** * sb_permission - Check superblock-level permissions * @sb: Superblock of inode to check permission on + * @inode: Inode to check permission on * @mask: Right to check for (%MAY_READ, %MAY_WRITE, %MAY_EXEC) * * Separate out file-system wide checks from inode-specific permission checks. @@ -656,6 +657,7 @@ int sysctl_protected_hardlinks __read_mostly = 1; /** * may_follow_link - Check symlink following for unsafe situations * @link: The path of the symlink + * @nd: nameidata pathwalk data * * In the case of the sysctl_protected_symlinks sysctl being enabled, * CAP_DAC_OVERRIDE needs to be specifically ignored if the symlink is