diff options
| author | David S. Miller <davem@davemloft.net> | 2021-04-08 01:04:55 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2021-04-08 01:04:55 +0300 |
| commit | 5d1dbacde1a2770fda1d80d6423e08365c8d6e9a (patch) | |
| tree | 323e5a36958e53b05dab0710d50c8cb6966a1385 /net/mac802154/llsec.c | |
| parent | 107adc694558dd51c35fca07b025c2fe2168afb5 (diff) | |
| parent | 1165affd484889d4986cf3b724318935a0b120d8 (diff) | |
| download | linux-5d1dbacde1a2770fda1d80d6423e08365c8d6e9a.tar.xz | |
Merge tag 'ieee802154-for-davem-2021-04-07' of git://git.kernel.org/pub/scm/linux/kernel/git/sschmidt/wpan
Stefan Schmidt says:
====================
pull-request: ieee802154 for net 2021-04-07
An update from ieee802154 for your *net* tree.
Most of these are coming from the flood of syzkaller reports
lately got for the ieee802154 subsystem. There are likely to
come more for this, but this is a good batch to get out for now.
Alexander Aring created a patchset to avoid llsec handling on a
monitor interface, which we do not support.
Alex Shi removed a unused macro.
Pavel Skripkin fixed another protection fault found by syzkaller.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/mac802154/llsec.c')
| -rw-r--r-- | net/mac802154/llsec.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/mac802154/llsec.c b/net/mac802154/llsec.c index 585d33144c33..55550ead2ced 100644 --- a/net/mac802154/llsec.c +++ b/net/mac802154/llsec.c @@ -152,7 +152,7 @@ err_tfm0: crypto_free_sync_skcipher(key->tfm0); err_tfm: for (i = 0; i < ARRAY_SIZE(key->tfm); i++) - if (key->tfm[i]) + if (!IS_ERR_OR_NULL(key->tfm[i])) crypto_free_aead(key->tfm[i]); kfree_sensitive(key); |