Patch "ovl: fix d_real() for stacked fs" has been added to the 4.8-stable tree
Subsystems (2)
This is a note to let you know that I've just added the patch titled
ovl: fix d_real() for stacked fs
to the 4.8-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
ovl-fix-d_real-for-stacked-fs.patch
and it can be found in the queue-4.8 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.
Quoted 1 line
From
c4fcfc1619ea43a8a89ad2f83ff23905eee088bdMon Sep 17 00:00:00 2001
From: Miklos Szeredi <[email protected]>
Date: Tue, 29 Nov 2016 10:20:24 +0100
Subject: ovl: fix d_real() for stacked fs
From: Miklos Szeredi <[email protected]>
commit c4fcfc1619ea43a8a89ad2f83ff23905eee088bd upstream.
Handling of recursion in d_real() is completely broken. Recursion is only done in the 'inode != NULL' case. But when opening the file we have 'inode == NULL' hence d_real() will return an overlay dentry. This won't work since overlayfs doesn't define its own file operations, so all file ops will fail.
Fix by doing the recursion first and the check against the inode second.
Bash script to reproduce the issue written by Quentin:
- 8< - - - - - 8< - - - - - 8< - - - - - 8< - - - -
tmpdir=$(mktemp -d)
pushd ${tmpdir}
mkdir -p {upper,lower,work}
echo -n 'rocks' > lower/ksplice
mount -t overlay level_zero upper -o lowerdir=lower,upperdir=upper,workdir=work cat upper/ksplice
tmpdir2=$(mktemp -d)
pushd ${tmpdir2}
mkdir -p {upper,work}
mount -t overlay level_one upper -o lowerdir=${tmpdir}/upper,upperdir=upper,workdir=work ls -l upper/ksplice
cat upper/ksplice
- 8< - - - - - 8< - - - - - 8< - - - - - 8< - - - -
--- fs/overlayfs/super.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
fs/overlayfs/super.c +3 -3
@@ -329,11 +329,11 @@ static struct dentry *ovl_d_real(structif (!real) goto bug; +/* Handle recursion */ + real =d_real (real, inode, open_flags); +if (!inode || inode ==d_inode (real))return real; - -/* Handle recursion */ -return d_real (real, inode, open_flags); bug:WARN (1 ,"ovl_d_real(%pd4, %s:%lu): real dentry not found\n" , dentry, inode ? inode->i_sb->s_id :"NULL" , inode ? inode->i_ino :0 );
Patches currently in stable-queue which might be from [email protected] are
queue-4.8/ovl-fix-d_real-for-stacked-fs.patch