linux-bluetooth.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Brian Gix <bgix@codeaurora.org>
To: linux-bluetooth@vger.kernel.org
Cc: Brian Gix <bgix@codeaurora.org>
Subject: [PATCH 6/9] Bluetooth: Cleanup blkcipher on SMP termination
Date: Tue, 15 Nov 2011 16:32:50 -0800	[thread overview]
Message-ID: <1321403573-7143-7-git-send-email-bgix@codeaurora.org> (raw)
In-Reply-To: <1321403573-7143-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 |    8 +++++++-
 1 files changed, 7 insertions(+), 1 deletions(-)

diff --git a/net/bluetooth/smp.c b/net/bluetooth/smp.c
index 94e94ca..3b3726a 100644
--- a/net/bluetooth/smp.c
+++ b/net/bluetooth/smp.c
@@ -379,7 +379,13 @@ 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;
+
+	if (smp && !IS_ERR(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 

  parent reply	other threads:[~2011-11-16  0:32 UTC|newest]

Thread overview: 11+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-11-16  0:32 [PATCH 0/9] Bluetooth: Add MITM protection to LE-SMP Brian Gix
2011-11-16  0:32 ` [PATCH 1/9] Bluetooth: Add HCI defines for User Passkey entry Brian Gix
2011-11-16  0:32 ` [PATCH 2/9] Bluetooth: Add MGMT opcodes for Passkey Entry Brian Gix
2011-11-16  0:32 ` [PATCH 3/9] Bluetooth: User Pairing Response restructuring Brian Gix
2011-11-16  0:32 ` [PATCH 4/9] Bluetooth: Add User Passkey Response handling Brian Gix
2011-11-16  0:32 ` [PATCH 5/9] Bluetooth: Add HCI User Passkey Req Evt handling Brian Gix
2011-11-16  0:32 ` Brian Gix [this message]
2011-11-16  0:32 ` [PATCH 7/9] Bluetooth: Centralize SMP pairing failure handling Brian Gix
2011-11-16  0:32 ` [PATCH 8/9] Bluetooth: Add MITM mechanism to LE-SMP Brian Gix
2011-11-16  0:32 ` [PATCH 9/9] Bluetooth: Add SMP to User Passkey and Confirm Brian Gix
  -- strict thread matches above, loose matches on Subject: below --
2011-11-13  6:01 [PATCH 0/9] Bluetooth: Add MITM protection to LE-SMP Brian Gix
2011-11-13  6:01 ` [PATCH 6/9] Bluetooth: Cleanup blkcipher on SMP termination 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=1321403573-7143-7-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).