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
49055906
Commit
49055906
authored
Mar 03, 2020
by
Al Viro
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
pick_link(): take reserving space on stack into a new helper
Signed-off-by:
Al Viro
<
viro@zeniv.linux.org.uk
>
parent
aef9404d
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
25 additions
and
21 deletions
+25
-21
fs/namei.c
fs/namei.c
+25
-21
No files found.
fs/namei.c
View file @
49055906
...
@@ -1580,22 +1580,15 @@ static inline int may_lookup(struct nameidata *nd)
...
@@ -1580,22 +1580,15 @@ static inline int may_lookup(struct nameidata *nd)
return
inode_permission
(
nd
->
inode
,
MAY_EXEC
);
return
inode_permission
(
nd
->
inode
,
MAY_EXEC
);
}
}
enum
{
WALK_TRAILING
=
1
,
WALK_MORE
=
2
,
WALK_NOFOLLOW
=
4
};
static
int
reserve_stack
(
struct
nameidata
*
nd
,
struct
path
*
link
,
unsigned
seq
)
static
const
char
*
pick_link
(
struct
nameidata
*
nd
,
struct
path
*
link
,
struct
inode
*
inode
,
unsigned
seq
,
int
flags
)
{
{
struct
saved
*
last
;
const
char
*
res
;
int
error
;
int
error
;
if
(
unlikely
(
nd
->
total_link_count
++
>=
MAXSYMLINKS
))
{
if
(
unlikely
(
nd
->
total_link_count
++
>=
MAXSYMLINKS
))
if
(
!
(
nd
->
flags
&
LOOKUP_RCU
))
return
-
ELOOP
;
path_put
(
link
);
return
ERR_PTR
(
-
ELOOP
);
}
error
=
nd_alloc_stack
(
nd
);
error
=
nd_alloc_stack
(
nd
);
if
(
unlikely
(
error
))
{
if
(
likely
(
!
error
))
return
0
;
if
(
error
==
-
ECHILD
)
{
if
(
error
==
-
ECHILD
)
{
// we must grab link first
// we must grab link first
bool
grabbed_link
=
legitimize_path
(
nd
,
link
,
seq
);
bool
grabbed_link
=
legitimize_path
(
nd
,
link
,
seq
);
...
@@ -1606,12 +1599,23 @@ static const char *pick_link(struct nameidata *nd, struct path *link,
...
@@ -1606,12 +1599,23 @@ static const char *pick_link(struct nameidata *nd, struct path *link,
if
(
!
error
)
if
(
!
error
)
error
=
nd_alloc_stack
(
nd
);
error
=
nd_alloc_stack
(
nd
);
}
}
if
(
error
)
{
return
error
;
}
enum
{
WALK_TRAILING
=
1
,
WALK_MORE
=
2
,
WALK_NOFOLLOW
=
4
};
static
const
char
*
pick_link
(
struct
nameidata
*
nd
,
struct
path
*
link
,
struct
inode
*
inode
,
unsigned
seq
,
int
flags
)
{
struct
saved
*
last
;
const
char
*
res
;
int
error
=
reserve_stack
(
nd
,
link
,
seq
);
if
(
unlikely
(
error
))
{
if
(
!
(
nd
->
flags
&
LOOKUP_RCU
))
path_put
(
link
);
path_put
(
link
);
return
ERR_PTR
(
error
);
return
ERR_PTR
(
error
);
}
}
}
last
=
nd
->
stack
+
nd
->
depth
++
;
last
=
nd
->
stack
+
nd
->
depth
++
;
last
->
link
=
*
link
;
last
->
link
=
*
link
;
clear_delayed_call
(
&
last
->
done
);
clear_delayed_call
(
&
last
->
done
);
...
...
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