Merge tag 'powerpc-4.16-2' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc...

[sfrench/cifs-2.6.git] / net / ceph / ceph_common.c

diff --git a/net/ceph/ceph_common.c b/net/ceph/ceph_common.c
index 5c036d2f401e25b42ece6d7cc6c4fc30c00dea43..1e492ef2a33d945699a327831640db04c1f158fa 100644 (file)
--- a/net/ceph/ceph_common.c
+++ b/net/ceph/ceph_common.c
@@ -421,6 +421,10 @@ ceph_parse_options(char *options, const char *dev_name,
                        opt->name = kstrndup(argstr[0].from,
                                              argstr[0].to-argstr[0].from,
                                              GFP_KERNEL);
+                       if (!opt->name) {
+                               err = -ENOMEM;
+                               goto out;
+                       }
                        break;
                case Opt_secret:
                        opt->key = kzalloc(sizeof(*opt->key), GFP_KERNEL);