From: Gustavo Padovan <padovan@profusion.mobi>
To: Brian Gix <bgix@codeaurora.org>
Cc: linux-bluetooth@vger.kernel.org
Subject: Re: [PATCH-v4 6/9] Bluetooth: Cleanup blkcipher on SMP termination
Date: Mon, 21 Nov 2011 13:48:30 -0200 [thread overview]
Message-ID: <20111121154829.GC2552@joana> (raw)
In-Reply-To: <1321480400-17397-7-git-send-email-bgix@codeaurora.org>
Hi Brian,
* Brian Gix <bgix@codeaurora.org> [2011-11-16 13:53:17 -0800]:
> 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);
smp->tfm doesn't say what you want, if its allocation failed its value is
still 0. And I don't think we need to check for smp == NULL. It can't be null
at this point.
Gustavo
next prev parent reply other threads:[~2011-11-21 15:48 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-11-16 21:53 [PATCH-v4 0/9] Bluetooth: Add MITM protection to LE-SMP Brian Gix
2011-11-16 21:53 ` [PATCH-v4 1/9] Bluetooth: Add MGMT event for Passkey Entry Brian Gix
2011-11-17 0:57 ` Gustavo Padovan
2011-11-16 21:53 ` [PATCH-v4 2/9] Bluetooth: User Pairing Response restructuring Brian Gix
2011-11-21 15:58 ` Gustavo Padovan
2011-11-16 21:53 ` [PATCH-v4 3/9] Bluetooth: Differentiate LE User Pairing Responses Brian Gix
2011-11-21 15:58 ` Gustavo Padovan
2011-11-16 21:53 ` [PATCH-v4 4/9] Bluetooth: Add User Passkey Response handling Brian Gix
2011-11-21 15:32 ` Gustavo Padovan
2011-11-16 21:53 ` [PATCH-v4 5/9] Bluetooth: Add HCI User Passkey Req Evt handling Brian Gix
2011-11-16 23:47 ` Vinicius Costa Gomes
2011-11-21 15:35 ` Gustavo Padovan
2011-11-16 21:53 ` [PATCH-v4 6/9] Bluetooth: Cleanup blkcipher on SMP termination Brian Gix
2011-11-21 15:48 ` Gustavo Padovan [this message]
2011-11-22 17:47 ` Brian Gix
2011-11-16 21:53 ` [PATCH-v4 7/9] Bluetooth: Centralize SMP pairing failure handling Brian Gix
2011-11-16 21:53 ` [PATCH-v4 8/9] Bluetooth: Add MITM mechanism to LE-SMP Brian Gix
2011-11-17 0:15 ` Vinicius Costa Gomes
2011-11-16 21:53 ` [PATCH-v4 9/9] 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=20111121154829.GC2552@joana \
--to=padovan@profusion.mobi \
--cc=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).