FEX-Emu/linux
1
0
Fork 0
mirror of https://github.com/FEX-Emu/linux.git synced 2025-02-04 18:18:54 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

namei: kill nd->link

Browse Source 
Just store it in nd->stack[nd->depth].link right in pick_link().
Now that we make sure of stack expansion in pick_link(), we can
do so...

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
This commit is contained in:
Al Viro 2015-05-06 16:01:56 -04:00
parent fec2fa24e8
commit 1cf2665b5b
1 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
fs/namei.c
View File

@ -495,10 +495,7 @@ EXPORT_SYMBOL(path_put);
#define EMBEDDED_LEVELS 2 #define EMBEDDED_LEVELS 2
struct nameidata { struct nameidata {
struct path path; struct path path;
union { struct qstr last;
struct qstr last;
struct path link;
};
struct path root; struct path root;
struct inode *inode; /* path.dentry.d_inode */ struct inode *inode; /* path.dentry.d_inode */
unsigned int flags; unsigned int flags;
@ -787,7 +784,7 @@ static inline int may_follow_link(struct nameidata *nd)
return 0; return 0;
/* Allowed if owner and follower match. */ /* Allowed if owner and follower match. */
inode = nd->link.dentry->d_inode; inode = nd->stack[0].link.dentry->d_inode;
if (uid_eq(current_cred()->fsuid, inode->i_uid)) if (uid_eq(current_cred()->fsuid, inode->i_uid))
return 0; return 0;
@ -800,8 +797,8 @@ static inline int may_follow_link(struct nameidata *nd)
if (uid_eq(parent->i_uid, inode->i_uid)) if (uid_eq(parent->i_uid, inode->i_uid))
return 0; return 0;
audit_log_link_denied("follow_link", &nd->link); audit_log_link_denied("follow_link", &nd->stack[0].link);
path_put(&nd->link); path_put(&nd->stack[0].link);
path_put(&nd->path); path_put(&nd->path);
return -EACCES; return -EACCES;
} }
@ -879,14 +876,13 @@ static __always_inline
const char *get_link(struct nameidata *nd) const char *get_link(struct nameidata *nd)
{ {
struct saved *last = nd->stack + nd->depth; struct saved *last = nd->stack + nd->depth;
struct dentry *dentry = nd->link.dentry; struct dentry *dentry = last->link.dentry;
struct inode *inode = dentry->d_inode; struct inode *inode = dentry->d_inode;
int error; int error;
const char *res; const char *res;
BUG_ON(nd->flags & LOOKUP_RCU); BUG_ON(nd->flags & LOOKUP_RCU);
last->link = nd->link;
last->cookie = NULL; last->cookie = NULL;
nd->depth++; nd->depth++;
@ -1560,6 +1556,7 @@ static void terminate_walk(struct nameidata *nd)
static int pick_link(struct nameidata *nd, struct path *link) static int pick_link(struct nameidata *nd, struct path *link)
{ {
int error; int error;
struct saved *last;
if (unlikely(nd->total_link_count++ >= MAXSYMLINKS)) { if (unlikely(nd->total_link_count++ >= MAXSYMLINKS)) {
path_to_nameidata(link, nd); path_to_nameidata(link, nd);
return -ELOOP; return -ELOOP;
@ -1578,7 +1575,8 @@ static int pick_link(struct nameidata *nd, struct path *link)
return error; return error;
} }
nd->link = *link; last = nd->stack + nd->depth;
last->link = *link;
return 1; return 1;
} }