From patchwork Thu Feb 18 00:39:56 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Stotland, Inga" X-Patchwork-Id: 12092723 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=-11.8 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE, SPF_PASS,USER_AGENT_GIT 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 CEB59C433DB for ; Thu, 18 Feb 2021 00:40:45 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 8759C64E45 for ; Thu, 18 Feb 2021 00:40:45 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230021AbhBRAkp (ORCPT ); Wed, 17 Feb 2021 19:40:45 -0500 Received: from mga05.intel.com ([192.55.52.43]:53341 "EHLO mga05.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229889AbhBRAko (ORCPT ); Wed, 17 Feb 2021 19:40:44 -0500 IronPort-SDR: viX0fWZCFRzsYKE6o7hsVJcxoSyLGRf2kSD0QPJG2DJCdwyH2DI12UYTZemlFcq4lsmu5xvKvt ACAwKMzemDKg== X-IronPort-AV: E=McAfee;i="6000,8403,9898"; a="268209980" X-IronPort-AV: E=Sophos;i="5.81,185,1610438400"; d="scan'208";a="268209980" Received: from fmsmga003.fm.intel.com ([10.253.24.29]) by fmsmga105.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 17 Feb 2021 16:40:03 -0800 IronPort-SDR: DlXV/0qy6Hdt9atshPKKfYT0IX9q/4PXrff08KJ0xEDuETSPWLfJ24JKthxUJpxua89HSYLSTR OF/165MiT/Dw== X-IronPort-AV: E=Sophos;i="5.81,185,1610438400"; d="scan'208";a="426941947" Received: from gjdunham-mobl1.amr.corp.intel.com (HELO istotlan-desk.intel.com) ([10.213.167.30]) by fmsmga003-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 17 Feb 2021 16:40:03 -0800 From: Inga Stotland To: linux-bluetooth@vger.kernel.org Cc: brian.gix@intel.com, Inga Stotland Subject: [PATCH BlueZ v2] mesh: Combine common functions for NetKeys and AppKeys Date: Wed, 17 Feb 2021 16:39:56 -0800 Message-Id: <20210218003956.23887-1-inga.stotland@intel.com> X-Mailer: git-send-email 2.26.2 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-bluetooth@vger.kernel.org No change in functionality, code tightening. --- mesh/keyring.c | 117 +++++++++++++++++++++---------------------------- 1 file changed, 49 insertions(+), 68 deletions(-) diff --git a/mesh/keyring.c b/mesh/keyring.c index 0b74ee914..cb04437ed 100644 --- a/mesh/keyring.c +++ b/mesh/keyring.c @@ -33,31 +33,45 @@ const char *dev_key_dir = "/dev_keys"; const char *app_key_dir = "/app_keys"; const char *net_key_dir = "/net_keys"; -bool keyring_put_net_key(struct mesh_node *node, uint16_t net_idx, - struct keyring_net_key *key) +static int open_key_file(struct mesh_node *node, const char *key_dir, + uint16_t idx, int flags) { const char *node_path; - char key_file[PATH_MAX]; - bool result = false; - int fd; + char fname[PATH_MAX]; - if (!node || !key) - return false; + if (!node) + return -1; node_path = node_get_storage_dir(node); - if (strlen(node_path) + strlen(net_key_dir) + 1 + 3 >= PATH_MAX) - return false; + if (strlen(node_path) + strlen(key_dir) + 1 + 3 >= PATH_MAX) + return -1; + + if (flags & O_CREAT) { + snprintf(fname, PATH_MAX, "%s%s", node_path, key_dir); + mkdir(fname, 0755); + } - snprintf(key_file, PATH_MAX, "%s%s", node_path, net_key_dir); + snprintf(fname, PATH_MAX, "%s%s/%3.3x", node_path, key_dir, idx); - mkdir(key_file, 0755); + if (flags & O_CREAT) + return open(fname, flags, S_IRUSR | S_IWUSR); + else + return open(fname, flags); +} - snprintf(key_file, PATH_MAX, "%s%s/%3.3x", node_path, net_key_dir, - net_idx); - l_debug("Put Net Key %s", key_file); +bool keyring_put_net_key(struct mesh_node *node, uint16_t net_idx, + struct keyring_net_key *key) +{ + bool result = false; + int fd; + + if (!key) + return false; + + fd = open_key_file(node, net_key_dir, net_idx, + O_WRONLY | O_CREAT | O_TRUNC); - fd = open(key_file, O_WRONLY | O_CREAT | O_TRUNC, S_IRUSR | S_IWUSR); if (fd < 0) return false; @@ -72,28 +86,14 @@ bool keyring_put_net_key(struct mesh_node *node, uint16_t net_idx, bool keyring_put_app_key(struct mesh_node *node, uint16_t app_idx, uint16_t net_idx, struct keyring_app_key *key) { - const char *node_path; - char key_file[PATH_MAX]; bool result = false; int fd; - if (!node || !key) - return false; - - node_path = node_get_storage_dir(node); - - if (strlen(node_path) + strlen(app_key_dir) + 1 + 3 >= PATH_MAX) + if (!key) return false; - snprintf(key_file, PATH_MAX, "%s%s", node_path, app_key_dir); - - mkdir(key_file, 0755); + fd = open_key_file(node, app_key_dir, app_idx, O_RDWR); - snprintf(key_file, PATH_MAX, "%s%s/%3.3x", node_path, app_key_dir, - app_idx); - l_debug("Put App Key %s", key_file); - - fd = open(key_file, O_RDWR); if (fd >= 0) { struct keyring_app_key old_key; @@ -105,12 +105,12 @@ bool keyring_put_app_key(struct mesh_node *node, uint16_t app_idx, } lseek(fd, 0, SEEK_SET); - } else { - fd = open(key_file, O_WRONLY | O_CREAT | O_TRUNC, - S_IRUSR | S_IWUSR); - if (fd < 0) - return false; - } + } else + fd = open_key_file(node, app_key_dir, app_idx, + O_WRONLY | O_CREAT | O_TRUNC); + + if (fd < 0) + return false; if (write(fd, key, sizeof(*key)) == sizeof(*key)) result = true; @@ -226,24 +226,19 @@ bool keyring_put_remote_dev_key(struct mesh_node *node, uint16_t unicast, return result; } -bool keyring_get_net_key(struct mesh_node *node, uint16_t net_idx, - struct keyring_net_key *key) +static bool get_key(struct mesh_node *node, const char *key_dir, + uint16_t key_idx, void *key, ssize_t sz) { - const char *node_path; - char key_file[PATH_MAX]; bool result = false; int fd; - if (!node || !key) + if (!key) return false; - node_path = node_get_storage_dir(node); - snprintf(key_file, PATH_MAX, "%s%s/%3.3x", node_path, net_key_dir, - net_idx); + fd = open_key_file(node, key_dir, key_idx, O_RDONLY); - fd = open(key_file, O_RDONLY); if (fd >= 0) { - if (read(fd, key, sizeof(*key)) == sizeof(*key)) + if (read(fd, key, sz) == sz) result = true; close(fd); @@ -252,30 +247,16 @@ bool keyring_get_net_key(struct mesh_node *node, uint16_t net_idx, return result; } +bool keyring_get_net_key(struct mesh_node *node, uint16_t net_idx, + struct keyring_net_key *key) +{ + return get_key(node, net_key_dir, net_idx, key, sizeof(*key)); +} + bool keyring_get_app_key(struct mesh_node *node, uint16_t app_idx, struct keyring_app_key *key) { - const char *node_path; - char key_file[PATH_MAX]; - bool result = false; - int fd; - - if (!node || !key) - return false; - - node_path = node_get_storage_dir(node); - snprintf(key_file, PATH_MAX, "%s%s/%3.3x", node_path, app_key_dir, - app_idx); - - fd = open(key_file, O_RDONLY); - if (fd >= 0) { - if (read(fd, key, sizeof(*key)) == sizeof(*key)) - result = true; - - close(fd); - } - - return result; + return get_key(node, app_key_dir, app_idx, key, sizeof(*key)); } bool keyring_get_remote_dev_key(struct mesh_node *node, uint16_t unicast,