Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 89eb6d06 authored by Wei Yongjun's avatar Wei Yongjun Committed by Marcel Holtmann
Browse files

mac802154: llsec: fix return value check in llsec_key_alloc() 



In case of error, the functions crypto_alloc_aead() and crypto_alloc_blkcipher()
returns ERR_PTR() and never returns NULL. The NULL test in the return value check
should be replaced with IS_ERR().

Signed-off-by: default avatarWei Yongjun <yongjun_wei@trendmicro.com.cn>
Signed-off-by: default avatarAlexander Aring <alex.aring@gmail.com>
Signed-off-by: default avatarMarcel Holtmann <marcel@holtmann.org>
parent 2b4d413c

net/mac802154/llsec.c

+2 −2
Original line number Diff line number Diff line
@@ -134,7 +134,7 @@ llsec_key_alloc(const struct ieee802154_llsec_key *template) 
	for (i = 0; i < ARRAY_SIZE(key->tfm); i++) {

		key->tfm[i] = crypto_alloc_aead("ccm(aes)", 0,

						CRYPTO_ALG_ASYNC);

		if (!key->tfm[i])

		if (IS_ERR(key->tfm[i]))

			goto err_tfm;

		if (crypto_aead_setkey(key->tfm[i], template->key,

				       IEEE802154_LLSEC_KEY_SIZE))
@@ -144,7 +144,7 @@ llsec_key_alloc(const struct ieee802154_llsec_key *template) 
	}



	key->tfm0 = crypto_alloc_blkcipher("ctr(aes)", 0, CRYPTO_ALG_ASYNC);

	if (!key->tfm0)

	if (IS_ERR(key->tfm0))

		goto err_tfm;



	if (crypto_blkcipher_setkey(key->tfm0, template->key,