---

yaml --- r: 278591 b: refs/heads/master c: c8eb969 h: refs/heads/master i: 278589: 01c59d0 278587: afbcfd1 278583: c992180 278575: 2857712 278559: c448a65 278527: 60182f3 v: v3
git-mirror · Dec 1, 2011 · 96f282b · 96f282b
1 parent f0bf501
commit 96f282b
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1143d45846f190465382dd667c7f893b9d1fd131
+refs/heads/master: c8eb969071032defb1dc493ae28cf2e2a31193a5
diff --git a/trunk/net/bluetooth/smp.c b/trunk/net/bluetooth/smp.c
@@ -379,7 +379,15 @@ static struct smp_chan *smp_chan_create(struct l2cap_conn *conn)
 
 void smp_chan_destroy(struct l2cap_conn *conn)
 {
-	kfree(conn->smp_chan);
+	struct smp_chan *smp = conn->smp_chan;
+
+	clear_bit(HCI_CONN_LE_SMP_PEND, &conn->hcon->pend);
+
+	if (smp->tfm)
+		crypto_free_blkcipher(smp->tfm);
+
+	kfree(smp);
+	conn->smp_chan = NULL;
 	hci_conn_put(conn->hcon);
 }