Received: by 2002:a05:6a10:f347:0:0:0:0 with SMTP id d7csp2615742pxu; Sat, 28 Nov 2020 22:23:54 -0800 (PST) X-Google-Smtp-Source: ABdhPJyFYXYS3UL9Yx/cwPZ2E/aIWRMU0gaWaSvrHorVq4+yH6MyJQBomUDsP7XAq0KsSYkt5v8I X-Received: by 2002:a17:907:720e:: with SMTP id dr14mr15408234ejc.303.1606631034066; Sat, 28 Nov 2020 22:23:54 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1606631034; cv=none; d=google.com; s=arc-20160816; b=wnqOq9W/BviEOe4TQYxH7U7d7LwTXrbkjheBEiwFN6QyTkxjeCBOyoCwUibQwSwY8a 7pRHKtABP9Pq2N+t2VuVYfkK1ygvcYfbiulzMzf4hjawrf0VICNtMpidjZXpBn8W714+ 9dpkYoy7eU5ZiAmrduocYU3vK9MTfnBqyFz2TBVnozlriLQwn16Mo3/UwlplcPv+tlcc HZKt+MxT/ohlpUriHyt+c3E3KAXxMo4/RU4tVAxfVkfiEQsZFLA5ZVIOTQcKkKo8onHR xg53moKJU9Eb7Uw0WYnd9ZULZGHPjpdF21EmDRFa+PKzryDEUf4CrUEK6FaSmKSr98Fn JXnQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from:ironport-sdr:ironport-sdr; bh=lODjWVR6+IFxzILpMBUx2TtAHl1T7qeKxyKI9v2JAzA=; b=Bm4xFA6rPeayaaEhSABatBUULY/g1pykZXFF0mgkYWbVYvPykEBrDPdf5aplIqr5dL WL4fBvGAxQHJtISNhRNxja4L1iZruKaWZlazH4ndrkTnoxmWF/eg+z6WzFFsZkymCvSP ZHU/JXHojgl8AoojFYfjw7G9uoFU2WP/cyWxDi8FI/CEc2g46Te8zIKrqpCIhgQL2UTL wrhG209PsWvkhxgoUPoKm5izQfdXIAklN1nW+jRvzn8BGy/YRouMNKUrD9lGY6mqjN4c rBGf62khglA9WCKKLuIYoph69ChQ4kq0JVDnj2zzrdanw7yzY+dA4bMPeyjKKR0JkEH/ Z0Mw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-bluetooth-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-bluetooth-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id h14si2703419eje.288.2020.11.28.22.23.30; Sat, 28 Nov 2020 22:23:54 -0800 (PST) Received-SPF: pass (google.com: domain of linux-bluetooth-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-bluetooth-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-bluetooth-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1725616AbgK2GX3 (ORCPT + 99 others); Sun, 29 Nov 2020 01:23:29 -0500 Received: from mga17.intel.com ([192.55.52.151]:18352 "EHLO mga17.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725468AbgK2GX3 (ORCPT ); Sun, 29 Nov 2020 01:23:29 -0500 IronPort-SDR: /kFJ/uMI1kr0iXNJKUpOCZpEhLB8BK+RAA4Q66dhwgOsAdWaGYVUj6iMthG7mxhCNlwbXubysf 7jZRXsvKWhRg== X-IronPort-AV: E=McAfee;i="6000,8403,9819"; a="152348443" X-IronPort-AV: E=Sophos;i="5.78,378,1599548400"; d="scan'208";a="152348443" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga006.jf.intel.com ([10.7.209.51]) by fmsmga107.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 28 Nov 2020 22:22:47 -0800 IronPort-SDR: mPkFmj9dXqN7TVXzT1qiSzbu/XW48wkbs6op2CSNPEkVnpaKBXtQUlECHuuscpvBhpaA5M0wf7 8XvNrgZ8ZQDQ== X-IronPort-AV: E=Sophos;i="5.78,378,1599548400"; d="scan'208";a="334197787" Received: from brayanix-mobl1.amr.corp.intel.com (HELO ingas-nuc1.intel.com) ([10.209.42.173]) by orsmga006-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 28 Nov 2020 22:22:46 -0800 From: Inga Stotland To: linux-bluetooth@vger.kernel.org Cc: brian.gix@intel.com, sbrown@ewol.com, Inga Stotland Subject: [PATCH BlueZ v2] mesh: Fix check for mkdir return value in keyring.c Date: Sat, 28 Nov 2020 22:22:02 -0800 Message-Id: <20201129062202.91034-1-inga.stotland@intel.com> X-Mailer: git-send-email 2.26.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-bluetooth@vger.kernel.org Remove check for mkdir() return value, since checking for zero does not cover "already exists" condition and adding extra check for errno value unnecessarily complicates the code. If mkdir() fails due to any reason than "already exists", the subsequent call to open() fails and the error is detected and corectly processed by the code. --- mesh/keyring.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/mesh/keyring.c b/mesh/keyring.c index 1ef4fc3ef..0b74ee914 100644 --- a/mesh/keyring.c +++ b/mesh/keyring.c @@ -51,8 +51,7 @@ bool keyring_put_net_key(struct mesh_node *node, uint16_t net_idx, snprintf(key_file, PATH_MAX, "%s%s", node_path, net_key_dir); - if (!mkdir(key_file, 0755)) - return false; + mkdir(key_file, 0755); snprintf(key_file, PATH_MAX, "%s%s/%3.3x", node_path, net_key_dir, net_idx); @@ -88,8 +87,7 @@ bool keyring_put_app_key(struct mesh_node *node, uint16_t app_idx, snprintf(key_file, PATH_MAX, "%s%s", node_path, app_key_dir); - if (!mkdir(key_file, 0755)) - return false; + mkdir(key_file, 0755); snprintf(key_file, PATH_MAX, "%s%s/%3.3x", node_path, app_key_dir, app_idx); @@ -207,8 +205,7 @@ bool keyring_put_remote_dev_key(struct mesh_node *node, uint16_t unicast, snprintf(key_file, PATH_MAX, "%s%s", node_path, dev_key_dir); - if (!mkdir(key_file, 0755)) - return false; + mkdir(key_file, 0755); for (i = 0; i < count; i++) { snprintf(key_file, PATH_MAX, "%s%s/%4.4x", node_path, -- 2.26.2