Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
L
linux
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
linux
Commits
6e9918b7
Commit
6e9918b7
authored
May 05, 2015
by
Al Viro
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
namei: explicitly pass seq number to unlazy_walk() when dentry != NULL
Signed-off-by:
Al Viro
<
viro@zeniv.linux.org.uk
>
parent
3595e234
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
8 additions
and
7 deletions
+8
-7
fs/namei.c
fs/namei.c
+8
-7
No files found.
fs/namei.c
View file @
6e9918b7
...
@@ -567,13 +567,14 @@ static inline int nd_alloc_stack(struct nameidata *nd)
...
@@ -567,13 +567,14 @@ static inline int nd_alloc_stack(struct nameidata *nd)
* unlazy_walk - try to switch to ref-walk mode.
* unlazy_walk - try to switch to ref-walk mode.
* @nd: nameidata pathwalk data
* @nd: nameidata pathwalk data
* @dentry: child of nd->path.dentry or NULL
* @dentry: child of nd->path.dentry or NULL
* @seq: seq number to check dentry against
* Returns: 0 on success, -ECHILD on failure
* Returns: 0 on success, -ECHILD on failure
*
*
* unlazy_walk attempts to legitimize the current nd->path, nd->root and dentry
* unlazy_walk attempts to legitimize the current nd->path, nd->root and dentry
* for ref-walk mode. @dentry must be a path found by a do_lookup call on
* for ref-walk mode. @dentry must be a path found by a do_lookup call on
* @nd or NULL. Must be called from rcu-walk context.
* @nd or NULL. Must be called from rcu-walk context.
*/
*/
static
int
unlazy_walk
(
struct
nameidata
*
nd
,
struct
dentry
*
dentry
)
static
int
unlazy_walk
(
struct
nameidata
*
nd
,
struct
dentry
*
dentry
,
unsigned
seq
)
{
{
struct
fs_struct
*
fs
=
current
->
fs
;
struct
fs_struct
*
fs
=
current
->
fs
;
struct
dentry
*
parent
=
nd
->
path
.
dentry
;
struct
dentry
*
parent
=
nd
->
path
.
dentry
;
...
@@ -615,7 +616,7 @@ static int unlazy_walk(struct nameidata *nd, struct dentry *dentry)
...
@@ -615,7 +616,7 @@ static int unlazy_walk(struct nameidata *nd, struct dentry *dentry)
}
else
{
}
else
{
if
(
!
lockref_get_not_dead
(
&
dentry
->
d_lockref
))
if
(
!
lockref_get_not_dead
(
&
dentry
->
d_lockref
))
goto
out
;
goto
out
;
if
(
read_seqcount_retry
(
&
dentry
->
d_seq
,
nd
->
seq
))
if
(
read_seqcount_retry
(
&
dentry
->
d_seq
,
seq
))
goto
drop_dentry
;
goto
drop_dentry
;
}
}
...
@@ -671,7 +672,7 @@ static int complete_walk(struct nameidata *nd)
...
@@ -671,7 +672,7 @@ static int complete_walk(struct nameidata *nd)
if
(
nd
->
flags
&
LOOKUP_RCU
)
{
if
(
nd
->
flags
&
LOOKUP_RCU
)
{
if
(
!
(
nd
->
flags
&
LOOKUP_ROOT
))
if
(
!
(
nd
->
flags
&
LOOKUP_ROOT
))
nd
->
root
.
mnt
=
NULL
;
nd
->
root
.
mnt
=
NULL
;
if
(
unlikely
(
unlazy_walk
(
nd
,
NULL
)))
if
(
unlikely
(
unlazy_walk
(
nd
,
NULL
,
0
)))
return
-
ECHILD
;
return
-
ECHILD
;
}
}
...
@@ -1451,7 +1452,7 @@ static int lookup_fast(struct nameidata *nd,
...
@@ -1451,7 +1452,7 @@ static int lookup_fast(struct nameidata *nd,
if
(
likely
(
__follow_mount_rcu
(
nd
,
path
,
inode
)))
if
(
likely
(
__follow_mount_rcu
(
nd
,
path
,
inode
)))
return
0
;
return
0
;
unlazy:
unlazy:
if
(
unlazy_walk
(
nd
,
dentry
))
if
(
unlazy_walk
(
nd
,
dentry
,
nd
->
seq
))
return
-
ECHILD
;
return
-
ECHILD
;
}
else
{
}
else
{
dentry
=
__d_lookup
(
parent
,
&
nd
->
last
);
dentry
=
__d_lookup
(
parent
,
&
nd
->
last
);
...
@@ -1511,7 +1512,7 @@ static inline int may_lookup(struct nameidata *nd)
...
@@ -1511,7 +1512,7 @@ static inline int may_lookup(struct nameidata *nd)
int
err
=
inode_permission
(
nd
->
inode
,
MAY_EXEC
|
MAY_NOT_BLOCK
);
int
err
=
inode_permission
(
nd
->
inode
,
MAY_EXEC
|
MAY_NOT_BLOCK
);
if
(
err
!=
-
ECHILD
)
if
(
err
!=
-
ECHILD
)
return
err
;
return
err
;
if
(
unlazy_walk
(
nd
,
NULL
))
if
(
unlazy_walk
(
nd
,
NULL
,
0
))
return
-
ECHILD
;
return
-
ECHILD
;
}
}
return
inode_permission
(
nd
->
inode
,
MAY_EXEC
);
return
inode_permission
(
nd
->
inode
,
MAY_EXEC
);
...
@@ -1552,7 +1553,7 @@ static int pick_link(struct nameidata *nd, struct path *link)
...
@@ -1552,7 +1553,7 @@ static int pick_link(struct nameidata *nd, struct path *link)
}
}
if
(
nd
->
flags
&
LOOKUP_RCU
)
{
if
(
nd
->
flags
&
LOOKUP_RCU
)
{
if
(
unlikely
(
nd
->
path
.
mnt
!=
link
->
mnt
||
if
(
unlikely
(
nd
->
path
.
mnt
!=
link
->
mnt
||
unlazy_walk
(
nd
,
link
->
dentry
)))
{
unlazy_walk
(
nd
,
link
->
dentry
,
nd
->
seq
)))
{
return
-
ECHILD
;
return
-
ECHILD
;
}
}
}
}
...
@@ -2297,7 +2298,7 @@ mountpoint_last(struct nameidata *nd, struct path *path)
...
@@ -2297,7 +2298,7 @@ mountpoint_last(struct nameidata *nd, struct path *path)
/* If we're in rcuwalk, drop out of it to handle last component */
/* If we're in rcuwalk, drop out of it to handle last component */
if
(
nd
->
flags
&
LOOKUP_RCU
)
{
if
(
nd
->
flags
&
LOOKUP_RCU
)
{
if
(
unlazy_walk
(
nd
,
NULL
))
if
(
unlazy_walk
(
nd
,
NULL
,
0
))
return
-
ECHILD
;
return
-
ECHILD
;
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment