These changes are the raw update to linux-4.4.6-rt14. Kernel sources

[kvmfornfv.git] / kernel / net / mac802154 / llsec.c

diff --git a/kernel/net/mac802154/llsec.c b/kernel/net/mac802154/llsec.c
index 5b2be12..a13d02b 100644 (file)
--- a/kernel/net/mac802154/llsec.c
+++ b/kernel/net/mac802154/llsec.c
@@ -17,8 +17,9 @@
 #include <linux/err.h>
 #include <linux/bug.h>
 #include <linux/completion.h>
+#include <linux/crypto.h>
 #include <linux/ieee802154.h>
-#include <crypto/algapi.h>
+#include <crypto/aead.h>
 
 #include "ieee802154_i.h"
 #include "llsec.h"
@@ -54,7 +55,7 @@ void mac802154_llsec_destroy(struct mac802154_llsec *sec)
 
                msl = container_of(sl, struct mac802154_llsec_seclevel, level);
                list_del(&sl->list);
-               kfree(msl);
+               kzfree(msl);
        }
 
        list_for_each_entry_safe(dev, dn, &sec->table.devices, list) {
@@ -71,7 +72,7 @@ void mac802154_llsec_destroy(struct mac802154_llsec *sec)
                mkey = container_of(key->key, struct mac802154_llsec_key, key);
                list_del(&key->list);
                llsec_key_put(mkey);
-               kfree(key);
+               kzfree(key);
        }
 }
 
@@ -160,7 +161,7 @@ err_tfm:
                if (key->tfm[i])
                        crypto_free_aead(key->tfm[i]);
 
-       kfree(key);
+       kzfree(key);
        return NULL;
 }
 
@@ -175,7 +176,7 @@ static void llsec_key_release(struct kref *ref)
                crypto_free_aead(key->tfm[i]);
 
        crypto_free_blkcipher(key->tfm0);
-       kfree(key);
+       kzfree(key);
 }
 
 static struct mac802154_llsec_key*
@@ -266,7 +267,7 @@ int mac802154_llsec_key_add(struct mac802154_llsec *sec,
        return 0;
 
 fail:
-       kfree(new);
+       kzfree(new);
        return -ENOMEM;
 }
 
@@ -346,10 +347,10 @@ static void llsec_dev_free(struct mac802154_llsec_device *dev)
                                      devkey);
 
                list_del(&pos->list);
-               kfree(devkey);
+               kzfree(devkey);
        }
 
-       kfree(dev);
+       kzfree(dev);
 }
 
 int mac802154_llsec_dev_add(struct mac802154_llsec *sec,
@@ -400,6 +401,7 @@ int mac802154_llsec_dev_del(struct mac802154_llsec *sec, __le64 device_addr)
 
        hash_del_rcu(&pos->bucket_s);
        hash_del_rcu(&pos->bucket_hw);
+       list_del_rcu(&pos->dev.list);
        call_rcu(&pos->rcu, llsec_dev_free_rcu);
 
        return 0;
@@ -649,7 +651,7 @@ llsec_do_encrypt_auth(struct sk_buff *skb, const struct mac802154_llsec *sec,
        u8 iv[16];
        unsigned char *data;
        int authlen, assoclen, datalen, rc;
-       struct scatterlist src, assoc[2], dst[2];
+       struct scatterlist sg;
        struct aead_request *req;
 
        authlen = ieee802154_sechdr_authtag_len(&hdr->sec);
@@ -659,34 +661,27 @@ llsec_do_encrypt_auth(struct sk_buff *skb, const struct mac802154_llsec *sec,
        if (!req)
                return -ENOMEM;
 
-       sg_init_table(assoc, 2);
-       sg_set_buf(&assoc[0], skb_mac_header(skb), skb->mac_len);
        assoclen = skb->mac_len;
 
        data = skb_mac_header(skb) + skb->mac_len;
        datalen = skb_tail_pointer(skb) - data;
 
-       if (hdr->sec.level & IEEE802154_SCF_SECLEVEL_ENC) {
-               sg_set_buf(&assoc[1], data, 0);
-       } else {
-               sg_set_buf(&assoc[1], data, datalen);
+       skb_put(skb, authlen);
+
+       sg_init_one(&sg, skb_mac_header(skb), assoclen + datalen + authlen);
+
+       if (!(hdr->sec.level & IEEE802154_SCF_SECLEVEL_ENC)) {
                assoclen += datalen;
                datalen = 0;
        }
 
-       sg_init_one(&src, data, datalen);
-
-       sg_init_table(dst, 2);
-       sg_set_buf(&dst[0], data, datalen);
-       sg_set_buf(&dst[1], skb_put(skb, authlen), authlen);
-
        aead_request_set_callback(req, 0, NULL, NULL);
-       aead_request_set_assoc(req, assoc, assoclen);
-       aead_request_set_crypt(req, &src, dst, datalen, iv);
+       aead_request_set_crypt(req, &sg, &sg, datalen, iv);
+       aead_request_set_ad(req, assoclen);
 
        rc = crypto_aead_encrypt(req);
 
-       kfree(req);
+       kzfree(req);
 
        return rc;
 }
@@ -858,7 +853,7 @@ llsec_do_decrypt_auth(struct sk_buff *skb, const struct mac802154_llsec *sec,
        u8 iv[16];
        unsigned char *data;
        int authlen, datalen, assoclen, rc;
-       struct scatterlist src, assoc[2];
+       struct scatterlist sg;
        struct aead_request *req;
 
        authlen = ieee802154_sechdr_authtag_len(&hdr->sec);
@@ -868,31 +863,25 @@ llsec_do_decrypt_auth(struct sk_buff *skb, const struct mac802154_llsec *sec,
        if (!req)
                return -ENOMEM;
 
-       sg_init_table(assoc, 2);
-       sg_set_buf(&assoc[0], skb_mac_header(skb), skb->mac_len);
        assoclen = skb->mac_len;
 
        data = skb_mac_header(skb) + skb->mac_len;
        datalen = skb_tail_pointer(skb) - data;
 
-       if (hdr->sec.level & IEEE802154_SCF_SECLEVEL_ENC) {
-               sg_set_buf(&assoc[1], data, 0);
-       } else {
-               sg_set_buf(&assoc[1], data, datalen - authlen);
+       sg_init_one(&sg, skb_mac_header(skb), assoclen + datalen);
+
+       if (!(hdr->sec.level & IEEE802154_SCF_SECLEVEL_ENC)) {
                assoclen += datalen - authlen;
-               data += datalen - authlen;
                datalen = authlen;
        }
 
-       sg_init_one(&src, data, datalen);
-
        aead_request_set_callback(req, 0, NULL, NULL);
-       aead_request_set_assoc(req, assoc, assoclen);
-       aead_request_set_crypt(req, &src, &src, datalen, iv);
+       aead_request_set_crypt(req, &sg, &sg, datalen, iv);
+       aead_request_set_ad(req, assoclen);
 
        rc = crypto_aead_decrypt(req);
 
-       kfree(req);
+       kzfree(req);
        skb_trim(skb, skb->len - authlen);
 
        return rc;
@@ -932,7 +921,7 @@ llsec_update_devkey_record(struct mac802154_llsec_device *dev,
                if (!devkey)
                        list_add_rcu(&next->devkey.list, &dev->dev.keys);
                else
-                       kfree(next);
+                       kzfree(next);
 
                spin_unlock_bh(&dev->lock);
        }