Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
X
xcap-capability-linux
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Model registry
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
xcap
xcap-capability-linux
Commits
f598f9f1
Commit
f598f9f1
authored
15 years ago
by
Al Viro
Browse files
Options
Downloads
Patches
Plain Diff
Sanitize autofs_dev_ioctl_ismountpoint()
Signed-off-by:
Al Viro
<
viro@zeniv.linux.org.uk
>
parent
b1e4594b
Loading
Loading
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
fs/autofs4/dev-ioctl.c
+4
-7
4 additions, 7 deletions
fs/autofs4/dev-ioctl.c
with
4 additions
and
7 deletions
fs/autofs4/dev-ioctl.c
+
4
−
7
View file @
f598f9f1
...
...
@@ -544,10 +544,9 @@ static int autofs_dev_ioctl_ismountpoint(struct file *fp,
goto
out
;
devid
=
new_encode_dev
(
path
.
mnt
->
mnt_sb
->
s_dev
);
err
=
0
;
if
(
path
.
dentry
->
d_inode
&&
path
.
mnt
->
mnt_root
==
path
.
dentry
)
{
if
(
path
.
mnt
->
mnt_root
==
path
.
dentry
)
{
err
=
1
;
magic
=
path
.
dentry
->
d_inode
->
i
_sb
->
s_magic
;
magic
=
path
.
mnt
->
mnt
_sb
->
s_magic
;
}
}
else
{
dev_t
dev
=
sbi
->
sb
->
s_dev
;
...
...
@@ -560,10 +559,8 @@ static int autofs_dev_ioctl_ismountpoint(struct file *fp,
err
=
have_submounts
(
path
.
dentry
);
if
(
path
.
mnt
->
mnt_mountpoint
!=
path
.
mnt
->
mnt_root
)
{
if
(
follow_down
(
&
path
))
magic
=
path
.
mnt
->
mnt_sb
->
s_magic
;
}
if
(
follow_down
(
&
path
))
magic
=
path
.
mnt
->
mnt_sb
->
s_magic
;
}
param
->
ismountpoint
.
out
.
devid
=
devid
;
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment