diff options
author | Alexander Aring <alex.aring@gmail.com> | 2015-10-13 07:42:54 -0400 |
---|---|---|
committer | Marcel Holtmann <marcel@holtmann.org> | 2015-10-20 18:49:24 -0400 |
commit | 71cd2aa53dbf9eb8cb954fc9e65de8dab774b7f6 (patch) | |
tree | ac2d7e05f436543b55ba33e3e6b932b00fc79e6b /net | |
parent | a6ad2a6b9cc1d9d791aee5462cfb8528f366f1d4 (diff) |
mac802154: llsec: use kzfree
This patch will use kzfree instead kfree for security related
information which can be offered by acccident.
Signed-off-by: Alexander Aring <alex.aring@gmail.com>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
Diffstat (limited to 'net')
-rw-r--r-- | net/mac802154/llsec.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/net/mac802154/llsec.c b/net/mac802154/llsec.c index 7799d3c41fe2..a13d02b7cee4 100644 --- a/net/mac802154/llsec.c +++ b/net/mac802154/llsec.c | |||
@@ -55,7 +55,7 @@ void mac802154_llsec_destroy(struct mac802154_llsec *sec) | |||
55 | 55 | ||
56 | msl = container_of(sl, struct mac802154_llsec_seclevel, level); | 56 | msl = container_of(sl, struct mac802154_llsec_seclevel, level); |
57 | list_del(&sl->list); | 57 | list_del(&sl->list); |
58 | kfree(msl); | 58 | kzfree(msl); |
59 | } | 59 | } |
60 | 60 | ||
61 | list_for_each_entry_safe(dev, dn, &sec->table.devices, list) { | 61 | list_for_each_entry_safe(dev, dn, &sec->table.devices, list) { |
@@ -72,7 +72,7 @@ void mac802154_llsec_destroy(struct mac802154_llsec *sec) | |||
72 | mkey = container_of(key->key, struct mac802154_llsec_key, key); | 72 | mkey = container_of(key->key, struct mac802154_llsec_key, key); |
73 | list_del(&key->list); | 73 | list_del(&key->list); |
74 | llsec_key_put(mkey); | 74 | llsec_key_put(mkey); |
75 | kfree(key); | 75 | kzfree(key); |
76 | } | 76 | } |
77 | } | 77 | } |
78 | 78 | ||
@@ -161,7 +161,7 @@ err_tfm: | |||
161 | if (key->tfm[i]) | 161 | if (key->tfm[i]) |
162 | crypto_free_aead(key->tfm[i]); | 162 | crypto_free_aead(key->tfm[i]); |
163 | 163 | ||
164 | kfree(key); | 164 | kzfree(key); |
165 | return NULL; | 165 | return NULL; |
166 | } | 166 | } |
167 | 167 | ||
@@ -176,7 +176,7 @@ static void llsec_key_release(struct kref *ref) | |||
176 | crypto_free_aead(key->tfm[i]); | 176 | crypto_free_aead(key->tfm[i]); |
177 | 177 | ||
178 | crypto_free_blkcipher(key->tfm0); | 178 | crypto_free_blkcipher(key->tfm0); |
179 | kfree(key); | 179 | kzfree(key); |
180 | } | 180 | } |
181 | 181 | ||
182 | static struct mac802154_llsec_key* | 182 | static struct mac802154_llsec_key* |
@@ -267,7 +267,7 @@ int mac802154_llsec_key_add(struct mac802154_llsec *sec, | |||
267 | return 0; | 267 | return 0; |
268 | 268 | ||
269 | fail: | 269 | fail: |
270 | kfree(new); | 270 | kzfree(new); |
271 | return -ENOMEM; | 271 | return -ENOMEM; |
272 | } | 272 | } |
273 | 273 | ||
@@ -347,10 +347,10 @@ static void llsec_dev_free(struct mac802154_llsec_device *dev) | |||
347 | devkey); | 347 | devkey); |
348 | 348 | ||
349 | list_del(&pos->list); | 349 | list_del(&pos->list); |
350 | kfree(devkey); | 350 | kzfree(devkey); |
351 | } | 351 | } |
352 | 352 | ||
353 | kfree(dev); | 353 | kzfree(dev); |
354 | } | 354 | } |
355 | 355 | ||
356 | int mac802154_llsec_dev_add(struct mac802154_llsec *sec, | 356 | int mac802154_llsec_dev_add(struct mac802154_llsec *sec, |
@@ -681,7 +681,7 @@ llsec_do_encrypt_auth(struct sk_buff *skb, const struct mac802154_llsec *sec, | |||
681 | 681 | ||
682 | rc = crypto_aead_encrypt(req); | 682 | rc = crypto_aead_encrypt(req); |
683 | 683 | ||
684 | kfree(req); | 684 | kzfree(req); |
685 | 685 | ||
686 | return rc; | 686 | return rc; |
687 | } | 687 | } |
@@ -881,7 +881,7 @@ llsec_do_decrypt_auth(struct sk_buff *skb, const struct mac802154_llsec *sec, | |||
881 | 881 | ||
882 | rc = crypto_aead_decrypt(req); | 882 | rc = crypto_aead_decrypt(req); |
883 | 883 | ||
884 | kfree(req); | 884 | kzfree(req); |
885 | skb_trim(skb, skb->len - authlen); | 885 | skb_trim(skb, skb->len - authlen); |
886 | 886 | ||
887 | return rc; | 887 | return rc; |
@@ -921,7 +921,7 @@ llsec_update_devkey_record(struct mac802154_llsec_device *dev, | |||
921 | if (!devkey) | 921 | if (!devkey) |
922 | list_add_rcu(&next->devkey.list, &dev->dev.keys); | 922 | list_add_rcu(&next->devkey.list, &dev->dev.keys); |
923 | else | 923 | else |
924 | kfree(next); | 924 | kzfree(next); |
925 | 925 | ||
926 | spin_unlock_bh(&dev->lock); | 926 | spin_unlock_bh(&dev->lock); |
927 | } | 927 | } |