From: Luiz Augusto von Dentz <luiz.dentz@gmail.com>
To: linux-bluetooth@vger.kernel.org
Subject: [PATCH BlueZ] shared/crypto: Transform bt_cryto in a singleton
Date: Fri, 15 Jan 2021 11:02:29 -0800 [thread overview]
Message-ID: <20210115190229.186479-1-luiz.dentz@gmail.com> (raw)
From: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>
This makes bt_crypto always return the same instance thus avoiding the
problem of having multiple PF sockets opened which may hit the file
descriptor limit.
---
src/shared/crypto.c | 37 ++++++++++++++++++++++---------------
1 file changed, 22 insertions(+), 15 deletions(-)
diff --git a/src/shared/crypto.c b/src/shared/crypto.c
index 6d14903e4..d5efa416d 100644
--- a/src/shared/crypto.c
+++ b/src/shared/crypto.c
@@ -126,34 +126,40 @@ static int cmac_aes_setup(void)
return fd;
}
+static struct bt_crypto *singleton;
+
struct bt_crypto *bt_crypto_new(void)
{
- struct bt_crypto *crypto;
+ if (singleton)
+ return bt_crypto_ref(singleton);
- crypto = new0(struct bt_crypto, 1);
+ singleton = new0(struct bt_crypto, 1);
- crypto->ecb_aes = ecb_aes_setup();
- if (crypto->ecb_aes < 0) {
- free(crypto);
+ singleton->ecb_aes = ecb_aes_setup();
+ if (singleton->ecb_aes < 0) {
+ free(singleton);
+ singleton = NULL;
return NULL;
}
- crypto->urandom = urandom_setup();
- if (crypto->urandom < 0) {
- close(crypto->ecb_aes);
- free(crypto);
+ singleton->urandom = urandom_setup();
+ if (singleton->urandom < 0) {
+ close(singleton->ecb_aes);
+ free(singleton);
+ singleton = NULL;
return NULL;
}
- crypto->cmac_aes = cmac_aes_setup();
- if (crypto->cmac_aes < 0) {
- close(crypto->urandom);
- close(crypto->ecb_aes);
- free(crypto);
+ singleton->cmac_aes = cmac_aes_setup();
+ if (singleton->cmac_aes < 0) {
+ close(singleton->urandom);
+ close(singleton->ecb_aes);
+ free(singleton);
+ singleton = NULL;
return NULL;
}
- return bt_crypto_ref(crypto);
+ return bt_crypto_ref(singleton);
}
struct bt_crypto *bt_crypto_ref(struct bt_crypto *crypto)
@@ -179,6 +185,7 @@ void bt_crypto_unref(struct bt_crypto *crypto)
close(crypto->cmac_aes);
free(crypto);
+ singleton = NULL;
}
bool bt_crypto_random_bytes(struct bt_crypto *crypto,
--
2.26.2
next reply other threads:[~2021-01-15 19:03 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-01-15 19:02 Luiz Augusto von Dentz [this message]
2021-01-15 19:15 ` [BlueZ] shared/crypto: Transform bt_cryto in a singleton bluez.test.bot
2021-01-15 19:56 ` Luiz Augusto von Dentz
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=20210115190229.186479-1-luiz.dentz@gmail.com \
--to=luiz.dentz@gmail.com \
--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