From: Brian Gix <bgix@codeaurora.org>
To: linux-bluetooth@vger.kernel.org
Cc: Brian Gix <bgix@codeaurora.org>
Subject: [PATCH-v5 3/6] Bluetooth: Cleanup blkcipher on SMP termination
Date: Wed, 23 Nov 2011 08:28:35 -0800 [thread overview]
Message-ID: <1322065718-11570-4-git-send-email-bgix@codeaurora.org> (raw)
In-Reply-To: <1322065718-11570-1-git-send-email-bgix@codeaurora.org>
The blkcipher must be freed to avoid memory leak.
Signed-off-by: Brian Gix <bgix@codeaurora.org>
---
net/bluetooth/smp.c | 10 +++++++++-
1 files changed, 9 insertions(+), 1 deletions(-)
diff --git a/net/bluetooth/smp.c b/net/bluetooth/smp.c
index 94e94ca..b9af488 100644
--- a/net/bluetooth/smp.c
+++ b/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);
}
--
1.7.7.2
--
Brian Gix
bgix@codeaurora.org
Employee of Qualcomm Innovation Center, Inc.
Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum
next prev parent reply other threads:[~2011-11-23 16:28 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-11-23 16:28 [PATCH-v5 0/6] Bluetooth: Add MITM protection to LE-SMP Brian Gix
2011-11-23 16:28 ` [PATCH-v5 1/6] Bluetooth: Add User Passkey Response handling Brian Gix
2011-11-23 16:28 ` [PATCH-v5 2/6] Bluetooth: Add HCI User Passkey Req Evt handling Brian Gix
2011-11-23 16:28 ` Brian Gix [this message]
2011-11-23 16:28 ` [PATCH-v5 4/6] Bluetooth: Centralize SMP pairing failure handling Brian Gix
2011-12-01 14:13 ` Gustavo Padovan
2011-11-23 16:28 ` [PATCH-v5 5/6] Bluetooth: Add MITM mechanism to LE-SMP Brian Gix
2011-12-01 14:11 ` Gustavo Padovan
2011-12-01 18:35 ` Brian Gix
2011-12-01 23:38 ` Gustavo Padovan
2011-11-23 16:28 ` [PATCH-v5 6/6] Bluetooth: Add SMP to User Passkey and Confirm Brian Gix
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1322065718-11570-4-git-send-email-bgix@codeaurora.org \
--to=bgix@codeaurora.org \
--cc=linux-bluetooth@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).