From patchwork Wed Jul 10 11:31:49 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Roman Smirnov X-Patchwork-Id: 13729222 Received: from mx01.omp.ru (mx01.omp.ru [90.154.21.10]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 85E59190063 for ; Wed, 10 Jul 2024 11:32:52 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=90.154.21.10 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1720611176; cv=none; b=k2P8xf9K1rUdW2wqqn5+XU8sgx8ZF7S5eYdHS1pSR4QY/PJ+W5vM8UYR81Ayt2zEgIrAMV0oCYHN5uBQV4U9xgCrhMTGIEo0hTv73Scm9FylZ8Pehg3SKfktJEJ3qVocemCrsYSfcYXmOlUa/B2QFNUMOp1CMs9K5SgxzNO+M+c= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1720611176; c=relaxed/simple; bh=0A8n2EfQhuir56WvjBAaaMXw5Y4gU0mc57ejp+DI+vA=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=Ymp8i3PmO0U3VKcyOBUm+u7oLXveeb9EoUwzVwRWrF12Cwb0eYSVhw+TyNLH0QOnbyY+/t18QcqEVodUKJ2m2/tgNLC7Y6PF56bC7VUUXD7j0DDveomYNbXDmHrFDO3XZ2I9/YP15VwhAtnMzkum5QTwt53J3FRSc/K4JZpVCJE= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=omp.ru; spf=pass smtp.mailfrom=omp.ru; arc=none smtp.client-ip=90.154.21.10 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=omp.ru Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=omp.ru Received: from localhost.localdomain (178.205.55.202) by msexch01.omp.ru (10.188.4.12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.2.1258.12; Wed, 10 Jul 2024 14:32:22 +0300 From: Roman Smirnov To: CC: Roman Smirnov Subject: [PATCH BlueZ v2 resend 6/6] shared/gatt-client: add NULL check to discover_secondary_cb() Date: Wed, 10 Jul 2024 14:31:49 +0300 Message-ID: <20240710113151.49296-7-r.smirnov@omp.ru> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240710113151.49296-1-r.smirnov@omp.ru> References: <20240710113151.49296-1-r.smirnov@omp.ru> Precedence: bulk X-Mailing-List: linux-bluetooth@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-ClientProxiedBy: msexch01.omp.ru (10.188.4.12) To msexch01.omp.ru (10.188.4.12) X-KSE-ServerInfo: msexch01.omp.ru, 9 X-KSE-AntiSpam-Interceptor-Info: scan successful X-KSE-AntiSpam-Version: 6.1.0, Database issued on: 07/10/2024 11:06:53 X-KSE-AntiSpam-Status: KAS_STATUS_NOT_DETECTED X-KSE-AntiSpam-Method: none X-KSE-AntiSpam-Rate: 0 X-KSE-AntiSpam-Info: Lua profiles 186423 [Jul 10 2024] X-KSE-AntiSpam-Info: Version: 6.1.0.4 X-KSE-AntiSpam-Info: Envelope from: r.smirnov@omp.ru X-KSE-AntiSpam-Info: LuaCore: 24 0.3.24 186c4d603b899ccfd4883d230c53f273b80e467f X-KSE-AntiSpam-Info: {rep_avail} X-KSE-AntiSpam-Info: {Tracking_from_domain_doesnt_match_to} X-KSE-AntiSpam-Info: d41d8cd98f00b204e9800998ecf8427e.com:7.1.1;127.0.0.199:7.1.2;omp.ru:7.1.1 X-KSE-AntiSpam-Info: ApMailHostAddress: 178.205.55.202 X-KSE-AntiSpam-Info: Rate: 0 X-KSE-AntiSpam-Info: Status: not_detected X-KSE-AntiSpam-Info: Method: none X-KSE-AntiSpam-Info: Auth:dmarc=temperror header.from=omp.ru;spf=temperror smtp.mailfrom=omp.ru;dkim=none X-KSE-Antiphishing-Info: Clean X-KSE-Antiphishing-ScanningType: Heuristic X-KSE-Antiphishing-Method: None X-KSE-Antiphishing-Bases: 07/10/2024 11:10:00 X-KSE-Antivirus-Interceptor-Info: scan successful X-KSE-Antivirus-Info: Clean, bases: 7/10/2024 9:01:00 AM X-KSE-Attachment-Filter-Triggered-Rules: Clean X-KSE-Attachment-Filter-Triggered-Filters: Clean X-KSE-BulkMessagesFiltering-Scan-Result: InTheLimit It is necessary to prevent dereferencing of a NULL pointer. Found with the SVACE static analysis tool. --- src/shared/gatt-client.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/shared/gatt-client.c b/src/shared/gatt-client.c index b48d739fc..9db3f5211 100644 --- a/src/shared/gatt-client.c +++ b/src/shared/gatt-client.c @@ -1276,7 +1276,9 @@ next: range = queue_peek_head(op->discov_ranges); - client->discovery_req = bt_gatt_discover_included_services(client->att, + if (range) + client->discovery_req = bt_gatt_discover_included_services( + client->att, range->start, range->end, discover_incl_cb,