Merge tag 'ceph-for-4.16-rc4' of git://github.com/ceph/ceph-client

Pull ceph fixes from Ilya Dryomov:
 "A cap handling fix from Zhi that ensures that metadata writeback isn't
  delayed and three error path memory leak fixups from Chengguang"

* tag 'ceph-for-4.16-rc4' of git://github.com/ceph/ceph-client:
  ceph: fix potential memory leak in init_caches()
  ceph: fix dentry leak when failing to init debugfs
  libceph, ceph: avoid memory leak when specifying same option several times
  ceph: flush dirty caps of unlinked inode ASAP

1 files changed, 7 insertions, 0 deletions

diff --git a/net/ceph/ceph_common.c b/net/ceph/ceph_common.c
index 1e492ef2a33d..4d4c82229e9e 100644
--- a/net/ceph/ceph_common.c
+++ b/net/ceph/ceph_common.c
@@ -418,6 +418,7 @@ ceph_parse_options(char *options, const char *dev_name,
                                 opt->flags |= CEPH_OPT_FSID;
                         break;
                 case Opt_name:
+                        kfree(opt->name);
                         opt->name = kstrndup(argstr[0].from,
                                               argstr[0].to-argstr[0].from,
                                               GFP_KERNEL);
@@ -427,6 +428,9 @@ ceph_parse_options(char *options, const char *dev_name,
                         }
                         break;
                 case Opt_secret:
+                        ceph_crypto_key_destroy(opt->key);
+                        kfree(opt->key);
+
                         opt->key = kzalloc(sizeof(*opt->key), GFP_KERNEL);
                         if (!opt->key) {
                                 err = -ENOMEM;
@@ -437,6 +441,9 @@ ceph_parse_options(char *options, const char *dev_name,
                                 goto out;
                         break;
                 case Opt_key:
+                        ceph_crypto_key_destroy(opt->key);
+                        kfree(opt->key);
+
                         opt->key = kzalloc(sizeof(*opt->key), GFP_KERNEL);
                         if (!opt->key) {
                                 err = -ENOMEM;