linux-bluetooth.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Luiz Augusto von Dentz <luiz.dentz@gmail.com>
To: Howard Chung <howardchung@google.com>
Cc: "linux-bluetooth@vger.kernel.org"
	<linux-bluetooth@vger.kernel.org>,
	Yun-Hao Chung <howardchung@chromium.org>,
	Miao-chen Chou <mcchou@chromium.org>
Subject: Re: [Bluez PATCH v3 07/13] plugins/admin_policy: add admin_policy adapter driver
Date: Wed, 28 Jul 2021 10:42:29 -0700	[thread overview]
Message-ID: <CABBYNZLfv3FiB0nM6nEh=fnfa0+oqaWSGgjJqoZxeL9aLoAXsA@mail.gmail.com> (raw)
In-Reply-To: <20210728211405.Bluez.v3.7.I29607be7ac91b0a494ab51713ba14f583eb858ed@changeid>

Hi Howard,

On Wed, Jul 28, 2021 at 6:16 AM Howard Chung <howardchung@google.com> wrote:
>
> From: Yun-Hao Chung <howardchung@chromium.org>
>
> This adds code to register admin_policy driver to adapter when
> admin_policy plugin is enabled.
>
> The following test steps were performed:
> 1. restart bluetoothd
> 2. check if "Admin Policy is enabled" in system log
>
> Reviewed-by: Miao-chen Chou <mcchou@chromium.org>
> ---
>
> (no changes since v1)
>
>  plugins/admin.c        | 67 ++++++++++++++++++++++++++++++++++++++++++
>  plugins/admin_policy.c | 67 ++++++++++++++++++++++++++++++++++++++++++

Looks like the old file still being added, besides you should update
your patch description as well since you still mentioning it as
admin_policy in quite a few of them.

>  2 files changed, 134 insertions(+)
>
> diff --git a/plugins/admin.c b/plugins/admin.c
> index 42866bcf7..923e08cb8 100644
> --- a/plugins/admin.c
> +++ b/plugins/admin.c
> @@ -12,17 +12,84 @@
>  #include <config.h>
>  #endif
>
> +#include "lib/bluetooth.h"
> +
> +#include "src/adapter.h"
> +#include "src/error.h"
>  #include "src/log.h"
>  #include "src/plugin.h"
>
> +#include "src/shared/queue.h"
> +
> +/* |policy_data| has the same life cycle as btd_adapter */
> +static struct btd_admin_policy {
> +       struct btd_adapter *adapter;
> +       uint16_t adapter_id;
> +} *policy_data = NULL;
> +
> +static struct btd_admin_policy *admin_policy_new(struct btd_adapter *adapter)
> +{
> +       struct btd_admin_policy *admin_policy = NULL;
> +
> +       admin_policy = g_try_malloc(sizeof(*admin_policy));
> +       if (!admin_policy) {
> +               btd_error(btd_adapter_get_index(adapter),
> +                               "Failed to allocate memory for admin_policy");
> +               return NULL;
> +       }
> +
> +       admin_policy->adapter = adapter;
> +       admin_policy->adapter_id = btd_adapter_get_index(adapter);
> +
> +       return admin_policy;
> +}
> +
> +static void admin_policy_free(void *data)
> +{
> +       struct btd_admin_policy *admin_policy = data;
> +
> +       g_free(admin_policy);
> +}
> +
> +static int admin_policy_adapter_probe(struct btd_adapter *adapter)
> +{
> +       if (policy_data) {
> +               btd_warn(policy_data->adapter_id,
> +                                               "Policy data already exists");
> +               admin_policy_free(policy_data);
> +               policy_data = NULL;
> +       }
> +
> +       policy_data = admin_policy_new(adapter);
> +       if (!policy_data)
> +               return -ENOMEM;
> +
> +       btd_info(policy_data->adapter_id, "Admin Policy has been enabled");
> +
> +       return 0;
> +}
> +
> +static struct btd_adapter_driver admin_policy_driver = {
> +       .name   = "admin_policy",
> +       .probe  = admin_policy_adapter_probe,
> +       .resume = NULL,
> +};
> +
>  static int admin_init(void)
>  {
>         DBG("");
> +
> +       return btd_register_adapter_driver(&admin_policy_driver);
>  }
>
>  static void admin_exit(void)
>  {
>         DBG("");
> +
> +       btd_unregister_adapter_driver(&admin_policy_driver);
> +
> +       if (policy_data)
> +               admin_policy_free(policy_data);
>  }
>
>  BLUETOOTH_PLUGIN_DEFINE(admin, VERSION,
> diff --git a/plugins/admin_policy.c b/plugins/admin_policy.c
> index dd8d89736..2ece87156 100644
> --- a/plugins/admin_policy.c
> +++ b/plugins/admin_policy.c
> @@ -12,17 +12,84 @@
>  #include <config.h>
>  #endif
>
> +#include "lib/bluetooth.h"
> +
> +#include "src/adapter.h"
> +#include "src/error.h"
>  #include "src/log.h"
>  #include "src/plugin.h"
>
> +#include "src/shared/queue.h"
> +
> +/* |policy_data| has the same life cycle as btd_adapter */
> +static struct btd_admin_policy {
> +       struct btd_adapter *adapter;
> +       uint16_t adapter_id;
> +} *policy_data = NULL;
> +
> +static struct btd_admin_policy *admin_policy_new(struct btd_adapter *adapter)
> +{
> +       struct btd_admin_policy *admin_policy = NULL;
> +
> +       admin_policy = g_try_malloc(sizeof(*admin_policy));
> +       if (!admin_policy) {
> +               btd_error(btd_adapter_get_index(adapter),
> +                               "Failed to allocate memory for admin_policy");
> +               return NULL;
> +       }
> +
> +       admin_policy->adapter = adapter;
> +       admin_policy->adapter_id = btd_adapter_get_index(adapter);
> +
> +       return admin_policy;
> +}
> +
> +static void admin_policy_free(void *data)
> +{
> +       struct btd_admin_policy *admin_policy = data;
> +
> +       g_free(admin_policy);
> +}
> +
> +static int admin_policy_adapter_probe(struct btd_adapter *adapter)
> +{
> +       if (policy_data) {
> +               btd_warn(policy_data->adapter_id,
> +                                               "Policy data already exists");
> +               admin_policy_free(policy_data);
> +               policy_data = NULL;
> +       }
> +
> +       policy_data = admin_policy_new(adapter);
> +       if (!policy_data)
> +               return -ENOMEM;
> +
> +       btd_info(policy_data->adapter_id, "Admin Policy has been enabled");
> +
> +       return 0;
> +}
> +
> +static struct btd_adapter_driver admin_policy_driver = {
> +       .name   = "admin_policy",
> +       .probe  = admin_policy_adapter_probe,
> +       .resume = NULL,
> +};
> +
>  static int admin_policy_init(void)
>  {
>         DBG("");
> +
> +       return btd_register_adapter_driver(&admin_policy_driver);
>  }
>
>  static void admin_policy_exit(void)
>  {
>         DBG("");
> +
> +       btd_unregister_adapter_driver(&admin_policy_driver);
> +
> +       if (policy_data)
> +               admin_policy_free(policy_data);
>  }
>
>  BLUETOOTH_PLUGIN_DEFINE(admin_policy, VERSION,
> --
> 2.32.0.432.gabb21c7263-goog
>


-- 
Luiz Augusto von Dentz

  reply	other threads:[~2021-07-28 17:42 UTC|newest]

Thread overview: 16+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-07-28 13:15 [Bluez PATCH v3 00/13] Admin policy series Howard Chung
2021-07-28 13:15 ` [Bluez PATCH v3 01/13] core: add is_allowed property in btd_service Howard Chung
2021-07-28 13:39   ` Admin policy series bluez.test.bot
2021-07-28 13:15 ` [Bluez PATCH v3 02/13] core: add adapter and device allowed_uuid functions Howard Chung
2021-07-28 13:15 ` [Bluez PATCH v3 03/13] mcap: add adapter authorization Howard Chung
2021-07-28 13:15 ` [Bluez PATCH v3 04/13] core: block not allowed UUID connect in auth Howard Chung
2021-07-28 13:15 ` [Bluez PATCH v3 05/13] core: add device_added and device_removed to adapter driver Howard Chung
2021-07-28 13:15 ` [Bluez PATCH v3 06/13] plugins: new plugin Howard Chung
2021-07-28 13:15 ` [Bluez PATCH v3 07/13] plugins/admin_policy: add admin_policy adapter driver Howard Chung
2021-07-28 17:42   ` Luiz Augusto von Dentz [this message]
2021-07-28 13:15 ` [Bluez PATCH v3 08/13] plugins/admin_policy: add ServiceAllowList method Howard Chung
2021-07-28 13:15 ` [Bluez PATCH v3 09/13] plugins/admin_policy: add ServiceAllowList property Howard Chung
2021-07-28 13:15 ` [Bluez PATCH v3 10/13] plugins/admin_policy: add device callbacks Howard Chung
2021-07-28 13:15 ` [Bluez PATCH v3 11/13] plugins/admin_policy: add AffectedByPolicy property Howard Chung
2021-07-28 13:15 ` [Bluez PATCH v3 12/13] plugins/admin_policy: persist policy settings Howard Chung
2021-07-28 13:15 ` [Bluez PATCH v3 13/13] doc: add description of admin policy Howard Chung

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='CABBYNZLfv3FiB0nM6nEh=fnfa0+oqaWSGgjJqoZxeL9aLoAXsA@mail.gmail.com' \
    --to=luiz.dentz@gmail.com \
    --cc=howardchung@chromium.org \
    --cc=howardchung@google.com \
    --cc=linux-bluetooth@vger.kernel.org \
    --cc=mcchou@chromium.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).