Hi Vinicius,
* Vinicius Costa Gomes <vinicius.gomes@xxxxxxxxxxxxx> [2010-12-07 14:51:17 -0300]:
> Hi Gustavo,
>
> On 15:27 Tue 07 Dec, Gustavo F. Padovan wrote:
> > Hi Vinicius,
> >
> > * Vinicius Costa Gomes <vinicius.gomes@xxxxxxxxxxxxx> [2010-12-06 18:43:48 -0300]:
> >
> > > This will allow using the crypto subsystem for encrypting data. As SMP
> > > (Security Manager Protocol) is implemented almost entirely on the host
> > > side and the crypto module already implements the needed methods
> > > (AES-128), it makes sense to use it.
> > >
> > > Signed-off-by: Vinicius Costa Gomes <vinicius.gomes@xxxxxxxxxxxxx>
> > > ---
> > > include/net/bluetooth/hci_core.h | 2 ++
> > > net/bluetooth/hci_core.c | 10 ++++++++++
> > > 2 files changed, 12 insertions(+), 0 deletions(-)
> > >
> > > diff --git a/include/net/bluetooth/hci_core.h b/include/net/bluetooth/hci_core.h
> > > index 0687e2f..d0a9f5d 100644
> > > --- a/include/net/bluetooth/hci_core.h
> > > +++ b/include/net/bluetooth/hci_core.h
> > > @@ -135,6 +135,8 @@ struct hci_dev {
> > > __u32 req_status;
> > > __u32 req_result;
> > >
> > > + struct crypto_blkcipher *tfm;
> > > +
> > > struct inquiry_cache inq_cache;
> > > struct hci_conn_hash conn_hash;
> > > struct list_head blacklist;
> > > diff --git a/net/bluetooth/hci_core.c b/net/bluetooth/hci_core.c
> > > index 12c6735..b96c3dd 100644
> > > --- a/net/bluetooth/hci_core.c
> > > +++ b/net/bluetooth/hci_core.c
> > > @@ -41,6 +41,7 @@
> > > #include <linux/interrupt.h>
> > > #include <linux/notifier.h>
> > > #include <linux/rfkill.h>
> > > +#include <linux/crypto.h>
> > > #include <net/sock.h>
> > >
> > > #include <asm/system.h>
> > > @@ -961,6 +962,13 @@ int hci_register_dev(struct hci_dev *hdev)
> > > if (!hdev->workqueue)
> > > goto nomem;
> > >
> > > + hdev->tfm = crypto_alloc_blkcipher("ecb(aes)", 0, CRYPTO_ALG_ASYNC);
> > > + if (IS_ERR(hdev->tfm)) {
> > > + BT_ERR("Failed to load transform for ecb(aes): %ld",
> > > + PTR_ERR(hdev->tfm));
> > > + goto nomem;
> >
> > You are leaking hdev->workqueue here.
>
> Thanks, see below.
>
> >
> > Also you will need to add CRYPTO_BLKCIPHER dependence in the Kconfig.
> > Maybe we should add a CONFIG_BLUETOOTH_SMP, and just build with blkcipher
> > in the case SMP was selected to be built.
>
> Sounds fair. Another alternative is: instead of not being able to register the
> HCI device if the blockcypher allocation fails, we could reply "Pairing Not
> Supported" at the SMP level. We would just need to document somewhere that the
> crypto subsystem and support for AES are needed for SMP to work.
>
> What do you think?
No, because the build will fail if we don't select CRYPTO_BLKCIPHER and
CRYPTO_AES. It that case you can add a #ifdef CONFIG_CRYTO... to avoid the
build failure and comment that you need to enable such features. But I think
that would be better to add an Kconfig option for SMP in this case instead of
document somewhere that we need to enable some other options in the kernel to
have SMP working.
--
Gustavo F. Padovan
http://profusion.mobi
--
To unsubscribe from this list: send the line "unsubscribe linux-bluetooth" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
