Merge branch 'fixes' of git://git.armlinux.org.uk/~rmk/linux-arm

[mirror_ubuntu-bionic-kernel.git] / net / ceph / crypto.c

diff --git a/net/ceph/crypto.c b/net/ceph/crypto.c
index 489610ac1cddad2e284515def1bb2185f620d3aa..bf9d079cbafd6e89d56ef5f10d81727bd5cbd42b 100644 (file)
--- a/net/ceph/crypto.c
+++ b/net/ceph/crypto.c
@@ -37,7 +37,9 @@ static int set_secret(struct ceph_crypto_key *key, void *buf)
                return -ENOTSUPP;
        }
 
-       WARN_ON(!key->len);
+       if (!key->len)
+               return -EINVAL;
+
        key->key = kmemdup(buf, key->len, GFP_NOIO);
        if (!key->key) {
                ret = -ENOMEM;