overlayfs: fix possible leak in ovl_new_inode
Subsystems (2)
PATCH 1/2 overlayfs: fix possible leak in ovl_new_inode
From: root <[email protected]>
After allocating a new inode, if the mode of inode is incorrect, we should release it by iput().
--- fs/overlayfs/inode.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-)
fs/overlayfs/inode.c +1 -0
@@ -376,6 +376,7 @@ struct inode *ovl_new_inode(struct super_block *sb, umode_t mode,default :WARN (1 ,"illegal file type: %i\n" , mode); +iput (inode); inode =NULL ; }
Signature · 1 line
1.7.3.2
PATCH 2/2 overlayfs: create new inode in ovl_link
From: root <[email protected]>
Imaging using ext4 as upperdir which has a file "hello" and lowdir is totally empty.
1. mount -t overlayfs overlayfs -o lowerdir=/lower,upperdir=/upper /overlay
2. cd /overlay
3. ln hello bye
then the overlayfs code will call vfs_link to create a real ext4 dentry for "bye" and create
a new overlayfs dentry point to overlayfs inode (which standed for "hello"). That means:
two overlayfs dentries and only one overlayfs inode.
and then
4. umount /overlay
5. mount -t overlayfs overlayfs -o lowerdir=/lower,upperdir=/upper /overlay (again)
6. cd /overlay
7. ls hello bye
the overlayfs will create two inodes(one for the "hello", another for the "bye") and two dentries (each point a inode).That means:
two dentries and two inodes.
As above, with different order of "create link" and "mount", the result is not the same.
In order to make the behavior coherent, we need to create inode in ovl_link.
--- fs/overlayfs/dir.c | 9 +++++++-- 1 files changed, 7 insertions(+), 2 deletions(-)
fs/overlayfs/dir.c +7 -2
@@ -416,6 +416,7 @@ static int ovl_link(struct dentry *old, struct inode *newdir,struct dentry *olddentry;struct dentry *newdentry;struct dentry *upperdir; +struct inode *newinode; err =ovl_copy_up (old);if (err)
@@ -440,13 +441,17 @@ static int ovl_link(struct dentry *old, struct inode *newdir, err = -ENOENT ; goto out_unlock; } + newinode =ovl_new_inode (old->d_sb, newdentry->d_inode->i_mode, + new->d_fsdata); +if (!newinode) + goto link_fail;ovl_dentry_version_inc (new->d_parent);ovl_dentry_update (new, newdentry); -ihold (old->d_inode); -d_instantiate (new, old->d_inode); +d_instantiate (new, newinode); }else { +link_fail:if (ovl_dentry_is_opaque (new))ovl_whiteout (upperdir, new);dput (newdentry);
Signature · 1 line
1.7.3.2
Miklos Szeredi
maintainerRe: [PATCH 2/2] overlayfs: create new inode in ovl_link
Quoted 1 line · Robin Dong
From: root <[email protected]>
Not sure what to make of this. Are you not the author of the patch? Why isn't there a real name here?
Otherwise the patches look fine and I've applied them.
Thanks,
Miklos