ovl: don't remove non-empty opaque directory
authorMiklos Szeredi <mszeredi@suse.cz>
Thu, 14 May 2015 08:04:44 +0000 (10:04 +0200)
committerMiklos Szeredi <mszeredi@suse.cz>
Thu, 14 May 2015 08:04:44 +0000 (10:04 +0200)
commitd377c5eb54dd05aeb3094b7740252d19ba7791f7
treee0af790ebf150f97fbb1ea79bdb0d5aa6f2a3474
parent030bbdbf4c833bc69f502eae58498bc5572db736
ovl: don't remove non-empty opaque directory

When removing an opaque directory we can't just call rmdir() to check for
emptiness, because the directory will need to be replaced with a whiteout.
The replacement is done with RENAME_EXCHANGE, which doesn't check
emptiness.

Solution is just to check emptiness by reading the directory.  In the
future we could add a new rename flag to check for emptiness even for
RENAME_EXCHANGE to optimize this case.

Reported-by: Vincent Batts <vbatts@gmail.com>
Signed-off-by: Miklos Szeredi <mszeredi@suse.cz>
Tested-by: Jordi Pujol Palomer <jordipujolp@gmail.com>
Fixes: 263b4a0fee43 ("ovl: dont replace opaque dir")
Cc: <stable@vger.kernel.org> # v4.0+
fs/overlayfs/dir.c