summaryrefslogtreecommitdiff
path: root/net/tipc
diff options
context:
space:
mode:
authorTadeusz Struk <tadeusz.struk@linaro.org>2021-11-15 19:01:43 +0300
committerJakub Kicinski <kuba@kernel.org>2021-11-18 07:04:52 +0300
commit3e6db079751afd527bf3db32314ae938dc571916 (patch)
tree0836439dc111faab4307a8c53471575773cd7215 /net/tipc
parentc366ce28750e9633f8d4b07829a9cde0e59034eb (diff)
downloadlinux-3e6db079751afd527bf3db32314ae938dc571916.tar.xz
tipc: check for null after calling kmemdup
kmemdup can return a null pointer so need to check for it, otherwise the null key will be dereferenced later in tipc_crypto_key_xmit as can be seen in the trace [1]. Cc: tipc-discussion@lists.sourceforge.net Cc: stable@vger.kernel.org # 5.15, 5.14, 5.10 [1] https://syzkaller.appspot.com/bug?id=bca180abb29567b189efdbdb34cbf7ba851c2a58 Reported-by: Dmitry Vyukov <dvyukov@google.com> Signed-off-by: Tadeusz Struk <tadeusz.struk@linaro.org> Acked-by: Ying Xue <ying.xue@windriver.com> Acked-by: Jon Maloy <jmaloy@redhat.com> Link: https://lore.kernel.org/r/20211115160143.5099-1-tadeusz.struk@linaro.org Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Diffstat (limited to 'net/tipc')
-rw-r--r--net/tipc/crypto.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/net/tipc/crypto.c b/net/tipc/crypto.c
index e701651f6533..b4d9419a015b 100644
--- a/net/tipc/crypto.c
+++ b/net/tipc/crypto.c
@@ -597,6 +597,10 @@ static int tipc_aead_init(struct tipc_aead **aead, struct tipc_aead_key *ukey,
tmp->cloned = NULL;
tmp->authsize = TIPC_AES_GCM_TAG_SIZE;
tmp->key = kmemdup(ukey, tipc_aead_key_size(ukey), GFP_KERNEL);
+ if (!tmp->key) {
+ tipc_aead_free(&tmp->rcu);
+ return -ENOMEM;
+ }
memcpy(&tmp->salt, ukey->key + keylen, TIPC_AES_GCM_SALT_SIZE);
atomic_set(&tmp->users, 0);
atomic64_set(&tmp->seqno, 0);