raspi/linux
1
0
Fork 1
mirror of https://github.com/raspberrypi/linux.git synced 2025-12-08 02:49:48 +00:00
Code Issues Projects Releases Wiki Activity

ovl: fix missing unlock_rename() in ovl_do_copy_up()

Browse Source 
commit 5820dc0888 upstream.

Use the ovl_lock_rename_workdir() helper which requires
unlock_rename() only on lock success.

Fixes: ("fd210b7d67ee ovl: move copy up lock out")
Signed-off-by: Amir Goldstein <amir73il@gmail.com>
Signed-off-by: Miklos Szeredi <mszeredi@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Amir Goldstein
2017-09-25 16:39:55 +03:00
committed by Greg Kroah-Hartman
parent caf7d229de
commit 1135139af4
4 changed files with 22 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
fs/overlayfs/copy_up.c
View File

@@ -561,10 +561,8 @@ static int ovl_do_copy_up(struct ovl_copy_up_ctx *c)
c->tmpfile = true; c->tmpfile = true;
err = ovl_copy_up_locked(c); err = ovl_copy_up_locked(c);
} else { } else {
err = -EIO; err = ovl_lock_rename_workdir(c->workdir, c->destdir);
if (lock_rename(c->workdir, c->destdir) != NULL) { if (!err) {
pr_err("overlayfs: failed to lock workdir+upperdir\n");
} else {
err = ovl_copy_up_locked(c); err = ovl_copy_up_locked(c);
unlock_rename(c->workdir, c->destdir); unlock_rename(c->workdir, c->destdir);
} }

20
fs/overlayfs/dir.c
View File

@@ -216,26 +216,6 @@ out_unlock:
return err; return err;
} }
static int ovl_lock_rename_workdir(struct dentry *workdir,
struct dentry *upperdir)
{
/* Workdir should not be the same as upperdir */
if (workdir == upperdir)
goto err;
/* Workdir should not be subdir of upperdir and vice versa */
if (lock_rename(workdir, upperdir) != NULL)
goto err_unlock;
return 0;
err_unlock:
unlock_rename(workdir, upperdir);
err:
pr_err("overlayfs: failed to lock workdir+upperdir\n");
return -EIO;
}
static struct dentry *ovl_clear_empty(struct dentry *dentry, static struct dentry *ovl_clear_empty(struct dentry *dentry,
struct list_head *list) struct list_head *list)
{ {

1
fs/overlayfs/overlayfs.h
View File

@@ -234,6 +234,7 @@ bool ovl_inuse_trylock(struct dentry *dentry);
void ovl_inuse_unlock(struct dentry *dentry); void ovl_inuse_unlock(struct dentry *dentry);
int ovl_nlink_start(struct dentry *dentry, bool *locked); int ovl_nlink_start(struct dentry *dentry, bool *locked);
void ovl_nlink_end(struct dentry *dentry, bool locked); void ovl_nlink_end(struct dentry *dentry, bool locked);
int ovl_lock_rename_workdir(struct dentry *workdir, struct dentry *upperdir);
static inline bool ovl_is_impuredir(struct dentry *dentry) static inline bool ovl_is_impuredir(struct dentry *dentry)
{ {

19
fs/overlayfs/util.c
View File

@@ -548,3 +548,22 @@ void ovl_nlink_end(struct dentry *dentry, bool locked)
mutex_unlock(&OVL_I(d_inode(dentry))->lock); mutex_unlock(&OVL_I(d_inode(dentry))->lock);
} }
} }
int ovl_lock_rename_workdir(struct dentry *workdir, struct dentry *upperdir)
{
/* Workdir should not be the same as upperdir */
if (workdir == upperdir)
goto err;
/* Workdir should not be subdir of upperdir and vice versa */
if (lock_rename(workdir, upperdir) != NULL)
goto err_unlock;
return 0;
err_unlock:
unlock_rename(workdir, upperdir);
err:
pr_err("overlayfs: failed to lock workdir+upperdir\n");
return -EIO;
}