mm, treewide: rename kzfree() to kfree_sensitive()

[linux-2.6-microblaze.git] / net / bluetooth / smp.c

diff --git a/net/bluetooth/smp.c b/net/bluetooth/smp.c
index 433227f..bf4bef1 100644 (file)
--- a/net/bluetooth/smp.c
+++ b/net/bluetooth/smp.c
@@ -753,9 +753,9 @@ static void smp_chan_destroy(struct l2cap_conn *conn)
        complete = test_bit(SMP_FLAG_COMPLETE, &smp->flags);
        mgmt_smp_complete(hcon, complete);
 
-       kzfree(smp->csrk);
-       kzfree(smp->slave_csrk);
-       kzfree(smp->link_key);
+       kfree_sensitive(smp->csrk);
+       kfree_sensitive(smp->slave_csrk);
+       kfree_sensitive(smp->link_key);
 
        crypto_free_shash(smp->tfm_cmac);
        crypto_free_kpp(smp->tfm_ecdh);
@@ -789,7 +789,7 @@ static void smp_chan_destroy(struct l2cap_conn *conn)
        }
 
        chan->data = NULL;
-       kzfree(smp);
+       kfree_sensitive(smp);
        hci_conn_drop(hcon);
 }
 
@@ -1156,7 +1156,7 @@ static void sc_generate_link_key(struct smp_chan *smp)
                const u8 salt[16] = { 0x31, 0x70, 0x6d, 0x74 };
 
                if (smp_h7(smp->tfm_cmac, smp->tk, salt, smp->link_key)) {
-                       kzfree(smp->link_key);
+                       kfree_sensitive(smp->link_key);
                        smp->link_key = NULL;
                        return;
                }
@@ -1165,14 +1165,14 @@ static void sc_generate_link_key(struct smp_chan *smp)
                const u8 tmp1[4] = { 0x31, 0x70, 0x6d, 0x74 };
 
                if (smp_h6(smp->tfm_cmac, smp->tk, tmp1, smp->link_key)) {
-                       kzfree(smp->link_key);
+                       kfree_sensitive(smp->link_key);
                        smp->link_key = NULL;
                        return;
                }
        }
 
        if (smp_h6(smp->tfm_cmac, smp->link_key, lebr, smp->link_key)) {
-               kzfree(smp->link_key);
+               kfree_sensitive(smp->link_key);
                smp->link_key = NULL;
                return;
        }
@@ -1407,7 +1407,7 @@ static struct smp_chan *smp_chan_create(struct l2cap_conn *conn)
 free_shash:
        crypto_free_shash(smp->tfm_cmac);
 zfree_smp:
-       kzfree(smp);
+       kfree_sensitive(smp);
        return NULL;
 }
 
@@ -3278,7 +3278,7 @@ static struct l2cap_chan *smp_add_cid(struct hci_dev *hdev, u16 cid)
        tfm_cmac = crypto_alloc_shash("cmac(aes)", 0, 0);
        if (IS_ERR(tfm_cmac)) {
                BT_ERR("Unable to create CMAC crypto context");
-               kzfree(smp);
+               kfree_sensitive(smp);
                return ERR_CAST(tfm_cmac);
        }
 
@@ -3286,7 +3286,7 @@ static struct l2cap_chan *smp_add_cid(struct hci_dev *hdev, u16 cid)
        if (IS_ERR(tfm_ecdh)) {
                BT_ERR("Unable to create ECDH crypto context");
                crypto_free_shash(tfm_cmac);
-               kzfree(smp);
+               kfree_sensitive(smp);
                return ERR_CAST(tfm_ecdh);
        }
 
@@ -3300,7 +3300,7 @@ create_chan:
                if (smp) {
                        crypto_free_shash(smp->tfm_cmac);
                        crypto_free_kpp(smp->tfm_ecdh);
-                       kzfree(smp);
+                       kfree_sensitive(smp);
                }
                return ERR_PTR(-ENOMEM);
        }
@@ -3347,7 +3347,7 @@ static void smp_del_chan(struct l2cap_chan *chan)
                chan->data = NULL;
                crypto_free_shash(smp->tfm_cmac);
                crypto_free_kpp(smp->tfm_ecdh);
-               kzfree(smp);
+               kfree_sensitive(smp);
        }
 
        l2cap_chan_put(chan);