summaryrefslogtreecommitdiffstats
path: root/fs/overlayfs
diff options
context:
space:
mode:
authorAmir Goldstein <amir73il@gmail.com>2018-10-10 19:10:06 +0300
committerMiklos Szeredi <mszeredi@redhat.com>2018-10-26 23:34:39 +0200
commitbabf4770be0adc69e6d2de150f4040f175e24beb (patch)
tree74103db8c537314f7c56708ed36aa54961993fc1 /fs/overlayfs
parent84df9525b0c27f3ebc2ebb1864fa62a97fdedb7d (diff)
downloadblackbird-op-linux-babf4770be0adc69e6d2de150f4040f175e24beb.tar.gz
blackbird-op-linux-babf4770be0adc69e6d2de150f4040f175e24beb.zip
ovl: fix error handling in ovl_verify_set_fh()
We hit a BUG on kfree of an ERR_PTR()... Reported-by: syzbot+ff03fe05c717b82502d0@syzkaller.appspotmail.com Fixes: 8b88a2e64036 ("ovl: verify upper root dir matches lower root dir") Cc: <stable@vger.kernel.org> # v4.13 Signed-off-by: Amir Goldstein <amir73il@gmail.com> Signed-off-by: Miklos Szeredi <mszeredi@redhat.com>
Diffstat (limited to 'fs/overlayfs')
-rw-r--r--fs/overlayfs/namei.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/fs/overlayfs/namei.c b/fs/overlayfs/namei.c
index 9c0ca6a7becf..efd372312ef1 100644
--- a/fs/overlayfs/namei.c
+++ b/fs/overlayfs/namei.c
@@ -422,8 +422,10 @@ int ovl_verify_set_fh(struct dentry *dentry, const char *name,
fh = ovl_encode_real_fh(real, is_upper);
err = PTR_ERR(fh);
- if (IS_ERR(fh))
+ if (IS_ERR(fh)) {
+ fh = NULL;
goto fail;
+ }
err = ovl_verify_fh(dentry, name, fh);
if (set && err == -ENODATA)
OpenPOWER on IntegriCloud