Received: by 2002:a05:6a10:d5a5:0:0:0:0 with SMTP id gn37csp2640326pxb; Fri, 8 Oct 2021 11:51:01 -0700 (PDT) X-Google-Smtp-Source: ABdhPJw7pVJUZbcvBem7BHR1b6M6xLQUS66XQWP1z96Pbl0RwGazpbpnouV23BMYydpPUfDdeOAT X-Received: by 2002:a17:90a:a78f:: with SMTP id f15mr13665591pjq.106.1633719060851; Fri, 08 Oct 2021 11:51:00 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1633719060; cv=none; d=google.com; s=arc-20160816; b=DgG3JQXQJHtrvqDXTO6szLddTLa5FVtREtjR7ATlcdHLk+IYXfB+VfUaw0wJZk01Nw zSQQ22YrOfEWBB5KjubGXNhZh3ND563ahIUPdNjP6lPc//pvqVlvhVJRHC3MarhutVhK Xat81ydNQq0I6dmnVZyYxMWUV2Q/Zgf2qxSQiL/lP7TmJSD93T5Q8TEKGxP8stMIsgBB bLEBNPHhSZNX2OaMasXlPoWFCRuW2cd7441reKwmKnDW36jKDBno53W5rOzNlcMoMKvA bHxARzxKxhNVsUmCEfurRXmm81sdAZ1ajFjOK0mnqt2AU3zNjoq0Ohr+WoHHn1YacRdb +Q6A== 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; bh=UOZh1dOe63hyfVrteoCxPW+3/AqYfaIeGuHjgvbFsDc=; b=JX+At8FBnRLa4sv025ADSOGdimZL8HlMrLb6cCSJqIeuuTe7GIKxaqtObU8ra6p7aa g4gqnZjeR7G6BJv3HIWZVom1N1ZtQ2Ou7adBhc0pZe0W5zrCZBIycWtqctpOS/pQHudq iGKkih2ZFVElby0fqBnMUgfZsF7R4fYUm3PPjCagSd8BQE72kbJk0MqrbtQjH7z0SebX uvOgvBOU5s6PaZkvp8KBxsEfMBFx1kaZMZyba94/HAThdJvM3gf7VH2Xwv3WbzvXGBZA k7AjB5lciPETlD4LHB9Iy3bBP4wq7uTKahC+Ksz3PD+N+swZ0S6SHn+3vN0OHrFVPqKP ql0Q== 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 l64si4535pge.289.2021.10.08.11.50.29; Fri, 08 Oct 2021 11:51:00 -0700 (PDT) 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 S231377AbhJHSug (ORCPT + 99 others); Fri, 8 Oct 2021 14:50:36 -0400 Received: from mga06.intel.com ([134.134.136.31]:15201 "EHLO mga06.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231316AbhJHSug (ORCPT ); Fri, 8 Oct 2021 14:50:36 -0400 X-IronPort-AV: E=McAfee;i="6200,9189,10131"; a="287450127" X-IronPort-AV: E=Sophos;i="5.85,358,1624345200"; d="scan'208";a="287450127" Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by orsmga104.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 08 Oct 2021 11:48:40 -0700 X-IronPort-AV: E=Sophos;i="5.85,358,1624345200"; d="scan'208";a="569122739" Received: from ksanitha-mobl1.amr.corp.intel.com (HELO istotlan-desk.intel.com) ([10.212.147.176]) by fmsmga002-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 08 Oct 2021 11:48:40 -0700 From: Inga Stotland To: linux-bluetooth@vger.kernel.org Cc: brian.gix@intel.com, Inga Stotland Subject: [PATCH BlueZ] tools/mesh-cfg-client: Fix NULL pointer dereferencing Date: Fri, 8 Oct 2021 11:48:30 -0700 Message-Id: <20211008184830.24276-1-inga.stotland@intel.com> X-Mailer: git-send-email 2.31.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-bluetooth@vger.kernel.org This patch fixes a number of potential NULL pointer dereferencing cases. --- tools/mesh/cfgcli.c | 2 -- tools/mesh/mesh-db.c | 3 ++- tools/mesh/remote.c | 6 ++++++ 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/tools/mesh/cfgcli.c b/tools/mesh/cfgcli.c index 2bf1a1503..f815c513c 100644 --- a/tools/mesh/cfgcli.c +++ b/tools/mesh/cfgcli.c @@ -668,8 +668,6 @@ static bool msg_recvd(uint16_t src, uint16_t idx, uint8_t *data, break; } - bt_shell_printf("Period\t\t%d ms\n", pub.period); - pub.rtx_cnt = data[9] & 0x7; pub.rtx_interval = ((data[9] >> 3) + 1) * 50; bt_shell_printf("Rexmit count\t%d\n", pub.rtx_cnt); diff --git a/tools/mesh/mesh-db.c b/tools/mesh/mesh-db.c index 12055c1a9..1a1ba380b 100644 --- a/tools/mesh/mesh-db.c +++ b/tools/mesh/mesh-db.c @@ -2508,7 +2508,8 @@ void *mesh_db_prepare_export(void) jarray = json_object_new_array(); json_object_object_add(export, "scenes", jarray); - write_bool(export, "partial", false); + if (!write_bool(export, "partial", false)) + l_warn("Failed to write\"partial\" property"); return export; } diff --git a/tools/mesh/remote.c b/tools/mesh/remote.c index 054da5300..6ec220a6f 100644 --- a/tools/mesh/remote.c +++ b/tools/mesh/remote.c @@ -281,6 +281,9 @@ bool remote_update_net_key(uint16_t addr, uint16_t net_idx, bool update, key = l_queue_find(rmt->net_keys, match_key, L_UINT_TO_PTR(net_idx)); + if (!key) + return false; + key->updated = update; if (save) @@ -343,6 +346,9 @@ bool remote_update_app_key(uint16_t addr, uint16_t app_idx, bool update, key = l_queue_find(rmt->app_keys, match_key, L_UINT_TO_PTR(app_idx)); + if (!key) + return false; + key->updated = update; if (save) -- 2.31.1