Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
L
linux
Manage
Activity
Members
Labels
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Analyze
Value stream analytics
Contributor analytics
CI/CD 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
Martyn Welch
linux
Commits
b148cba4
Commit
b148cba4
authored
7 years ago
by
Miklos Szeredi
Browse files
Options
Downloads
Patches
Plain Diff
ovl: clean up copy-up error paths
Signed-off-by:
Miklos Szeredi
<
mszeredi@redhat.com
>
parent
dd8ac699
No related branches found
No related tags found
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
fs/overlayfs/copy_up.c
+18
-36
18 additions, 36 deletions
fs/overlayfs/copy_up.c
with
18 additions
and
36 deletions
fs/overlayfs/copy_up.c
+
18
−
36
View file @
b148cba4
...
...
@@ -366,12 +366,13 @@ static int ovl_create_index(struct dentry *dentry, struct dentry *origin,
return
err
;
temp
=
ovl_create_temp
(
indexdir
,
OVL_CATTR
(
S_IFDIR
|
0
));
err
=
PTR_ERR
(
temp
);
if
(
IS_ERR
(
temp
))
goto
temp_err
;
goto
free_name
;
err
=
ovl_set_upper_fh
(
upper
,
temp
);
if
(
err
)
goto
out
_cleanup
;
goto
out
;
index
=
lookup_one_len
(
name
.
name
,
indexdir
,
name
.
len
);
if
(
IS_ERR
(
index
))
{
...
...
@@ -380,23 +381,13 @@ static int ovl_create_index(struct dentry *dentry, struct dentry *origin,
err
=
ovl_do_rename
(
dir
,
temp
,
dir
,
index
,
0
);
dput
(
index
);
}
if
(
err
)
goto
out_cleanup
;
out:
if
(
err
)
ovl_cleanup
(
dir
,
temp
);
dput
(
temp
);
free_name:
kfree
(
name
.
name
);
return
err
;
temp_err:
err
=
PTR_ERR
(
temp
);
temp
=
NULL
;
goto
out
;
out_cleanup:
ovl_cleanup
(
dir
,
temp
);
goto
out
;
}
struct
ovl_copy_up_ctx
{
...
...
@@ -476,7 +467,7 @@ static int ovl_install_temp(struct ovl_copy_up_ctx *c, struct dentry *temp,
return
err
;
}
static
int
ovl_get_tmpfile
(
struct
ovl_copy_up_ctx
*
c
,
struct
dentry
**
tempp
)
static
struct
dentry
*
ovl_get_tmpfile
(
struct
ovl_copy_up_ctx
*
c
)
{
int
err
;
struct
dentry
*
temp
;
...
...
@@ -490,6 +481,7 @@ static int ovl_get_tmpfile(struct ovl_copy_up_ctx *c, struct dentry **tempp)
};
err
=
security_inode_copy_up
(
c
->
dentry
,
&
new_creds
);
temp
=
ERR_PTR
(
err
);
if
(
err
<
0
)
goto
out
;
...
...
@@ -500,21 +492,13 @@ static int ovl_get_tmpfile(struct ovl_copy_up_ctx *c, struct dentry **tempp)
temp
=
ovl_do_tmpfile
(
c
->
workdir
,
c
->
stat
.
mode
);
else
temp
=
ovl_create_temp
(
c
->
workdir
,
&
cattr
);
if
(
IS_ERR
(
temp
))
goto
temp_err
;
err
=
0
;
*
tempp
=
temp
;
out:
if
(
new_creds
)
{
revert_creds
(
old_creds
);
put_cred
(
new_creds
);
}
return
err
;
temp_err:
err
=
PTR_ERR
(
temp
);
goto
out
;
return
temp
;
}
static
int
ovl_copy_up_inode
(
struct
ovl_copy_up_ctx
*
c
,
struct
dentry
*
temp
)
...
...
@@ -564,21 +548,21 @@ static int ovl_copy_up_locked(struct ovl_copy_up_ctx *c)
struct
inode
*
udir
=
c
->
destdir
->
d_inode
;
struct
inode
*
inode
;
struct
dentry
*
newdentry
=
NULL
;
struct
dentry
*
temp
=
NULL
;
struct
dentry
*
temp
;
int
err
;
err
=
ovl_get_tmpfile
(
c
,
&
temp
);
if
(
err
)
goto
out
;
temp
=
ovl_get_tmpfile
(
c
);
if
(
IS_ERR
(
temp
)
)
return
PTR_ERR
(
temp
)
;
err
=
ovl_copy_up_inode
(
c
,
temp
);
if
(
err
)
goto
out
_cleanup
;
goto
out
;
if
(
S_ISDIR
(
c
->
stat
.
mode
)
&&
c
->
indexed
)
{
err
=
ovl_create_index
(
c
->
dentry
,
c
->
lowerpath
.
dentry
,
temp
);
if
(
err
)
goto
out
_cleanup
;
goto
out
;
}
if
(
c
->
tmpfile
)
{
...
...
@@ -589,7 +573,7 @@ static int ovl_copy_up_locked(struct ovl_copy_up_ctx *c)
err
=
ovl_install_temp
(
c
,
temp
,
&
newdentry
);
}
if
(
err
)
goto
out
_cleanup
;
goto
out
;
inode
=
d_inode
(
c
->
dentry
);
ovl_inode_update
(
inode
,
newdentry
);
...
...
@@ -597,13 +581,11 @@ static int ovl_copy_up_locked(struct ovl_copy_up_ctx *c)
ovl_set_flag
(
OVL_WHITEOUTS
,
inode
);
out:
if
(
err
&&
!
c
->
tmpfile
)
ovl_cleanup
(
d_inode
(
c
->
workdir
),
temp
);
dput
(
temp
);
return
err
;
out_cleanup:
if
(
!
c
->
tmpfile
)
ovl_cleanup
(
d_inode
(
c
->
workdir
),
temp
);
goto
out
;
}
/*
...
...
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