summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrederick Lawler <fred@cloudflare.com>2023-08-01 08:57:09 -0500
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2023-09-13 09:48:42 +0200
commit01474630c56668c3b1261d572b24c748a1cc17ff (patch)
tree494bf639f01cc8721abc27217ea485a84cdbd35b
parent6eac3965901489ae114a664a78cd2d1415d1af5c (diff)
downloadlinux-stable-01474630c56668c3b1261d572b24c748a1cc17ff.tar.gz
linux-stable-01474630c56668c3b1261d572b24c748a1cc17ff.tar.bz2
linux-stable-01474630c56668c3b1261d572b24c748a1cc17ff.zip
crypto: af_alg - Decrement struct key.usage in alg_set_by_key_serial()
commit 6b4b53ca0b7300ba2af98a49dbce22054bf034fe upstream. Calls to lookup_user_key() require a corresponding key_put() to decrement the usage counter. Once it reaches zero, we schedule key GC. Therefore decrement struct key.usage in alg_set_by_key_serial(). Fixes: 7984ceb134bf ("crypto: af_alg - Support symmetric encryption via keyring keys") Cc: <stable@vger.kernel.org> Signed-off-by: Frederick Lawler <fred@cloudflare.com> Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--crypto/af_alg.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/crypto/af_alg.c b/crypto/af_alg.c
index 5f7252a5b7b4..703fb426ff5d 100644
--- a/crypto/af_alg.c
+++ b/crypto/af_alg.c
@@ -320,18 +320,21 @@ static int alg_setkey_by_key_serial(struct alg_sock *ask, sockptr_t optval,
if (IS_ERR(ret)) {
up_read(&key->sem);
+ key_put(key);
return PTR_ERR(ret);
}
key_data = sock_kmalloc(&ask->sk, key_datalen, GFP_KERNEL);
if (!key_data) {
up_read(&key->sem);
+ key_put(key);
return -ENOMEM;
}
memcpy(key_data, ret, key_datalen);
up_read(&key->sem);
+ key_put(key);
err = type->setkey(ask->private, key_data, key_datalen);