From patchwork Thu Jul 29 12:27:39 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Howard Chung X-Patchwork-Id: 12408535 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-26.3 required=3.0 tests=BAYES_00,DKIMWL_WL_MED, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED,USER_AGENT_GIT,USER_IN_DEF_DKIM_WL autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 311F4C4338F for ; Thu, 29 Jul 2021 12:28:07 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 1A6ED60F02 for ; Thu, 29 Jul 2021 12:28:07 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236736AbhG2M2J (ORCPT ); Thu, 29 Jul 2021 08:28:09 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59760 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237062AbhG2M2G (ORCPT ); Thu, 29 Jul 2021 08:28:06 -0400 Received: from mail-yb1-xb4a.google.com (mail-yb1-xb4a.google.com [IPv6:2607:f8b0:4864:20::b4a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4256AC0613D3 for ; Thu, 29 Jul 2021 05:28:03 -0700 (PDT) Received: by mail-yb1-xb4a.google.com with SMTP id d69-20020a25e6480000b02904f4a117bd74so6546028ybh.17 for ; Thu, 29 Jul 2021 05:28:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=date:in-reply-to:message-id:mime-version:references:subject:from:to :cc; bh=7/BH4MTePnsOXoTp3DTt/qwyX+9hfoN3ZmatM1G6LFE=; b=WaYqKoqeUlRE7eaI58WIn+y4fUOsmn3vSuybGvJ2P719h1PgmxbiipXlqg/2U4Owy1 aKLulJRS0NlIPlyEyXGoFp1BtzRd1SOnnDNp95pBVPR/kdF4CkN4HitaxhMZBPh7BQDp QPhSDI9EWnaRLtmyLUvGxsHarg+aZdq4XGs8Gqkht0etX5wyJ/ma//PkZmeFKFbYsWAn SLep3sTdSeYQ8ZYMV7KwQaWKwHXjqs8bHRSKDM/7k/5Coal80TweyY1y4acSFbcVGrUy PAsAj+NJNEzgj3HNKyBrPrRpk3Q5nK3eAFZ8yzZUwTQBM2c3sHeLIejdgSDD9/YJXZ/J m8oQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:in-reply-to:message-id:mime-version :references:subject:from:to:cc; bh=7/BH4MTePnsOXoTp3DTt/qwyX+9hfoN3ZmatM1G6LFE=; b=cEuEe6VA4tPaRAs9VrWSptKWUClFuoyypm1E0IKn5xiQQWlG+uX5Dso+w/2LZSLFlE f3igJL0kejrRW9t8S2ymhkMthTjUR7mZ8eDyHWhQ6+clj2jw0v6xUIoAK6PLSEFHQ6gc tr9tZ48ynswvUuJv/8sCKOF86d4cN9Zvp/4c1wTHDNSYbTa93chyMRIVMWwWIZnW6eT7 c/y/5Tj3UAL8Ej4vw/9Sctwmq0XMnndky+Ij/jaC/J1TI19DJ/jm1sKZCo45BDJSoN8r 09dBl8jyoQHoD91eJ+U3Lvo+GvX/42JWuHZHXpQYX8WFh0OhwrmrZlVnHAFSQssVYcPw f24Q== X-Gm-Message-State: AOAM532WrU0MlODKDs9GkNM3fy21czMQFEtyB/1db9PYX8mz/pGYHwCT Ej74Azce9DR8676k9EYnYFer/h6WajPA5/Nq3LGnuNI5nEL+ZQkz/pCRtbYSFhssY8wukCOUXrc c3SIBoO9CC/Qh2pcSISCP7IC9R0NZoeRkeyuuDVqZfFIXR8Q9MSMMfmM2WvRjyRtcq5xOolrPMd UQ0dcRhIW0nWM= X-Google-Smtp-Source: ABdhPJzJY4GqvvAcNV1h9GG/ZgHjVPNkbV8GMOnLcnQAtrA6z/MtKz6KbQM1aQ9SgMhbHf4tok+X/g1k05qP/lLP4g== X-Received: from howardchung-p920.tpe.corp.google.com ([2401:fa00:1:10:ff72:1420:4502:fdaf]) (user=howardchung job=sendgmr) by 2002:a25:a286:: with SMTP id c6mr2317983ybi.349.1627561682444; Thu, 29 Jul 2021 05:28:02 -0700 (PDT) Date: Thu, 29 Jul 2021 20:27:39 +0800 In-Reply-To: <20210729122751.3728885-1-howardchung@google.com> Message-Id: <20210729202648.Bluez.v6.1.Ic71b1ed97538a06d02425ba502690bdab1c5d836@changeid> Mime-Version: 1.0 References: <20210729122751.3728885-1-howardchung@google.com> X-Mailer: git-send-email 2.32.0.554.ge1b32706d8-goog Subject: [Bluez PATCH v6 01/13] core: add is_allowed property in btd_service From: Howard Chung To: linux-bluetooth@vger.kernel.org, luiz.dentz@gmail.com Cc: Yun-Hao Chung , Miao-chen Chou Precedence: bulk List-ID: X-Mailing-List: linux-bluetooth@vger.kernel.org From: Yun-Hao Chung This adds is_allowed property in btd_service. When is_allowed is set to false, calling btd_service_connect and service_accept will fail and the existing service connection gets disconnected. Reviewed-by: Miao-chen Chou --- Changes in v6: - include instead of in plugins/admin.c Changes in v5: - Fix compiler errors in plugins/admin.c Changes in v4: - Update commit message (admin_policy -> admin) - remove old plugins/admin_policy.c Changes in v3: - Rename plugins/admin_policy.c -> plugins/admin.c - Use device_added callback in btd_adapter_driver instead of listen for dbus - Add authorization method in profiles/health/mcap.c and block incoming connections in adapter authorization function. Changes in v2: - Move bt_uuid_hash and bt_uuid_equal functions to adapter.c. - Modify the criteria to say a device is `Affected` from any-of-uuid to any-of-auto-connect-profile. - Remove the code to remove/reprobe disallowed/allowed profiles, instead, check if the service is allowed in bt_io_accept connect_cb. - Fix a typo in emit_property_change in plugin/admin_policy.c:set_service_allowlist - Instead of using device_state_cb, utilize D-BUS client to watch device added/removed. - Add a document in doc/ src/service.c | 39 +++++++++++++++++++++++++++++++++++++++ src/service.h | 2 ++ 2 files changed, 41 insertions(+) diff --git a/src/service.c b/src/service.c index 21a52762e637..929d6c136b6d 100644 --- a/src/service.c +++ b/src/service.c @@ -41,6 +41,7 @@ struct btd_service { void *user_data; btd_service_state_t state; int err; + bool is_allowed; }; struct service_state_callback { @@ -133,6 +134,7 @@ struct btd_service *service_create(struct btd_device *device, service->device = device; /* Weak ref */ service->profile = profile; service->state = BTD_SERVICE_STATE_UNAVAILABLE; + service->is_allowed = true; return service; } @@ -186,6 +188,18 @@ int service_accept(struct btd_service *service) if (!service->profile->accept) return -ENOSYS; + if (!service->is_allowed) { + info("service %s is not allowed", + service->profile->remote_uuid); + return -ECONNABORTED; + } + + if (!service->is_allowed) { + info("service %s is not allowed", + service->profile->remote_uuid); + return -ECONNABORTED; + } + err = service->profile->accept(service); if (!err) goto done; @@ -245,6 +259,12 @@ int btd_service_connect(struct btd_service *service) return -EBUSY; } + if (!service->is_allowed) { + info("service %s is not allowed", + service->profile->remote_uuid); + return -ECONNABORTED; + } + err = profile->connect(service); if (err == 0) { change_state(service, BTD_SERVICE_STATE_CONNECTING, 0); @@ -361,6 +381,25 @@ bool btd_service_remove_state_cb(unsigned int id) return false; } +void btd_service_set_allowed(struct btd_service *service, bool allowed) +{ + if (allowed == service->is_allowed) + return; + + service->is_allowed = allowed; + + if (!allowed && (service->state == BTD_SERVICE_STATE_CONNECTING || + service->state == BTD_SERVICE_STATE_CONNECTED)) { + btd_service_disconnect(service); + return; + } +} + +bool btd_service_is_allowed(struct btd_service *service) +{ + return service->is_allowed; +} + void btd_service_connecting_complete(struct btd_service *service, int err) { if (service->state != BTD_SERVICE_STATE_DISCONNECTED && diff --git a/src/service.h b/src/service.h index 88530cc17d53..5a2a02447b24 100644 --- a/src/service.h +++ b/src/service.h @@ -51,6 +51,8 @@ int btd_service_get_error(const struct btd_service *service); unsigned int btd_service_add_state_cb(btd_service_state_cb cb, void *user_data); bool btd_service_remove_state_cb(unsigned int id); +void btd_service_set_allowed(struct btd_service *service, bool allowed); +bool btd_service_is_allowed(struct btd_service *service); /* Functions used by profile implementation */ void btd_service_connecting_complete(struct btd_service *service, int err);