aboutsummaryrefslogtreecommitdiffstats
path: root/fs/overlayfs/util.c
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2018-10-08 09:33:21 -0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2018-10-08 09:33:21 -0400
commitba1cb318dcbfc9754acda9656262aea97ebe77e6 (patch)
tree770fadb8b2c77da5d4dd9d33535b2d7adcdb02fd /fs/overlayfs/util.c
parent8f523d6db7ed69f69720267af170c0719023f373 (diff)
parent0238df646e6224016a45505d2c111a24669ebe21 (diff)
Merge 4.19-rc7 into char-misc-next
We want the fixes in here as well. Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'fs/overlayfs/util.c')
-rw-r--r--fs/overlayfs/util.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/fs/overlayfs/util.c b/fs/overlayfs/util.c
index 8cfb62cc8672..ace4fe4c39a9 100644
--- a/fs/overlayfs/util.c
+++ b/fs/overlayfs/util.c
@@ -683,7 +683,7 @@ static void ovl_cleanup_index(struct dentry *dentry)
683 struct dentry *upperdentry = ovl_dentry_upper(dentry); 683 struct dentry *upperdentry = ovl_dentry_upper(dentry);
684 struct dentry *index = NULL; 684 struct dentry *index = NULL;
685 struct inode *inode; 685 struct inode *inode;
686 struct qstr name; 686 struct qstr name = { };
687 int err; 687 int err;
688 688
689 err = ovl_get_index_name(lowerdentry, &name); 689 err = ovl_get_index_name(lowerdentry, &name);
@@ -726,6 +726,7 @@ static void ovl_cleanup_index(struct dentry *dentry)
726 goto fail; 726 goto fail;
727 727
728out: 728out:
729 kfree(name.name);
729 dput(index); 730 dput(index);
730 return; 731 return;
731 732