From patchwork Tue Jul 9 14:35:00 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Roman Smirnov X-Patchwork-Id: 812500 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 3A88319D8A9 for ; Tue, 9 Jul 2024 14:35:34 +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=1720535741; cv=none; b=tUHOPyrlby2Me794Ht/YHQFqIYiq7SrPZ0SfpKRBumhjuNKOrocpl64eFTtbLy77a8wT7bU/rux8VHCCb04GCgoY5vaUF6YEIulzzYpCQ2zCmalHWFQSKrvm08lGKvc+QrfgDTnr7XhuA2B1VHBmXXh4m/Ds29gB9aklMSoDn4w= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1720535741; c=relaxed/simple; bh=vhrdcBVQZoZrccPSJiEm7syXScooPKEPuKqw+PcZYsQ=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=til+EKupZWNPwmRIp/6QlY3kmGAXw4AftHNDnuGrv+JCXks16dYSVocq1KCny1SDGQvjLpkwbtptXjrN887TLUBVPfMEk0IDZBPR6t9AOTA361MqUyq6yXThuXuhYYv5ABWOgCoPTHmXbWZjqw8NOCbve/BqM8dXrB545VgQ360= 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 inp1wst083.omp.ru (81.22.207.138) 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; Tue, 9 Jul 2024 17:35:22 +0300 From: Roman Smirnov To: CC: Roman Smirnov Subject: [PATCH BlueZ v2 1/4] health: mcap: add checks for NULL mcap_notify_error() Date: Tue, 9 Jul 2024 17:35:00 +0300 Message-ID: <20240709143503.12142-2-r.smirnov@omp.ru> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240709143503.12142-1-r.smirnov@omp.ru> References: <20240709143503.12142-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/09/2024 14:15:02 X-KSE-AntiSpam-Status: KAS_STATUS_NOT_DETECTED X-KSE-AntiSpam-Method: none X-KSE-AntiSpam-Rate: 0 X-KSE-AntiSpam-Info: Lua profiles 186394 [Jul 09 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: 127.0.0.199:7.1.2; inp1wst083.omp.ru:7.1.1; omp.ru:7.1.1; d41d8cd98f00b204e9800998ecf8427e.com:7.1.1; 81.22.207.138:7.1.2 X-KSE-AntiSpam-Info: ApMailHostAddress: 81.22.207.138 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/09/2024 14:19:00 X-KSE-Antivirus-Interceptor-Info: scan successful X-KSE-Antivirus-Info: Clean, bases: 7/9/2024 11:26: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 NULL pointers. Found with the SVACE static analysis tool. --- profiles/health/mcap.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/profiles/health/mcap.c b/profiles/health/mcap.c index 7eceaa88a..2e4214a69 100644 --- a/profiles/health/mcap.c +++ b/profiles/health/mcap.c @@ -336,6 +336,9 @@ static void mcap_notify_error(struct mcap_mcl *mcl, GError *err) case MCAP_MD_CREATE_MDL_REQ: st = MDL_WAITING; l = g_slist_find_custom(mcl->mdls, &st, cmp_mdl_state); + if (!l) + return; + mdl = l->data; mcl->mdls = g_slist_remove(mcl->mdls, mdl); mcap_mdl_unref(mdl); @@ -345,6 +348,9 @@ static void mcap_notify_error(struct mcap_mcl *mcl, GError *err) case MCAP_MD_ABORT_MDL_REQ: st = MDL_WAITING; l = g_slist_find_custom(mcl->mdls, &st, cmp_mdl_state); + if (!l) + return; + shutdown_mdl(l->data); update_mcl_state(mcl); con->cb.notify(err, con->user_data); @@ -362,6 +368,9 @@ static void mcap_notify_error(struct mcap_mcl *mcl, GError *err) case MCAP_MD_RECONNECT_MDL_REQ: st = MDL_WAITING; l = g_slist_find_custom(mcl->mdls, &st, cmp_mdl_state); + if (!l) + return; + shutdown_mdl(l->data); update_mcl_state(mcl); con->cb.op(NULL, err, con->user_data); From patchwork Tue Jul 9 14:35:01 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Roman Smirnov X-Patchwork-Id: 811573 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 1C51619D8B4 for ; Tue, 9 Jul 2024 14:35:42 +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=1720535749; cv=none; b=FI9LCWMPSdRz6nRUF0cre9kJsZ+1/rwEpgUyGZUVgfgt7IM8yPJ92jbXM1VlI0hMPh42EC14oSs6Opatj6FyW2FTS1c/ljlFbUUJTqh5/d9OVlAly26yLvsaURakF4BvIPj6+f6LmSmc7Psh0h6Z5T1FxlS/FS0/537cFEE0xVU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1720535749; c=relaxed/simple; bh=0ejBL7ZSc7gA/IcHRXJCCK5EfVVRFcFEnRVWsUP1gqk=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=Ll5j2QWftyXcqRITcXV/q9nG9oqdWDsVGiFoX0FhiZKvUG5BdIaoA8Ihf+8pesuh9bbMCKwfs9n0G0M797p5GRynBMaeDXdpjTq3XJSwJYmKm1C6PqCnRhKH8ZqSJA+VjOuRYKW61E4NEcsBguvbMSikppaZmD3RhEIsjrAzyfs= 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 inp1wst083.omp.ru (81.22.207.138) 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; Tue, 9 Jul 2024 17:35:23 +0300 From: Roman Smirnov To: CC: Roman Smirnov Subject: [PATCH BlueZ v2 2/4] shared: prevent dereferencing of NULL pointers Date: Tue, 9 Jul 2024 17:35:01 +0300 Message-ID: <20240709143503.12142-3-r.smirnov@omp.ru> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240709143503.12142-1-r.smirnov@omp.ru> References: <20240709143503.12142-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/09/2024 14:15:02 X-KSE-AntiSpam-Status: KAS_STATUS_NOT_DETECTED X-KSE-AntiSpam-Method: none X-KSE-AntiSpam-Rate: 0 X-KSE-AntiSpam-Info: Lua profiles 186394 [Jul 09 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: 127.0.0.199:7.1.2; inp1wst083.omp.ru:7.1.1; omp.ru:7.1.1; d41d8cd98f00b204e9800998ecf8427e.com:7.1.1; 81.22.207.138:7.1.2 X-KSE-AntiSpam-Info: ApMailHostAddress: 81.22.207.138 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/09/2024 14:19:00 X-KSE-Antivirus-Interceptor-Info: scan successful X-KSE-Antivirus-Info: Clean, bases: 7/9/2024 11:26: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 add checks for NULL before dereferencing pointers. Found with the SVACE static analysis tool. --- src/shared/micp.c | 4 ++++ src/shared/vcp.c | 12 ++++++++++++ 2 files changed, 16 insertions(+) diff --git a/src/shared/micp.c b/src/shared/micp.c index b82bd92de..1c34e9d00 100644 --- a/src/shared/micp.c +++ b/src/shared/micp.c @@ -398,6 +398,10 @@ static void mics_mute_write(struct gatt_db_attribute *attrib, } micp_op = iov_pull_mem(&iov, sizeof(*micp_op)); + if (!micp_op) { + DBG(micp, "iov_pull_mem() returned NULL"); + goto respond; + } if ((*micp_op == MICS_DISABLED) || (*micp_op != MICS_NOT_MUTED && *micp_op != MICS_MUTED)) { diff --git a/src/shared/vcp.c b/src/shared/vcp.c index 06264a241..602d46dc1 100644 --- a/src/shared/vcp.c +++ b/src/shared/vcp.c @@ -925,6 +925,10 @@ static void vcs_cp_write(struct gatt_db_attribute *attrib, } vcp_op = iov_pull_mem(&iov, sizeof(*vcp_op)); + if (!vcp_op) { + DBG(vcp, "iov_pull_mem() returned NULL"); + goto respond; + } for (handler = vcp_handlers; handler && handler->str; handler++) { if (handler->op != *vcp_op) @@ -985,6 +989,10 @@ static void vocs_cp_write(struct gatt_db_attribute *attrib, } vcp_op = iov_pull_mem(&iov, sizeof(*vcp_op)); + if (!vcp_op) { + DBG(vcp, "iov_pull_mem() returned NULL"); + goto respond; + } for (handler = vocp_handlers; handler && handler->str; handler++) { if (handler->op != *vcp_op) @@ -1517,6 +1525,10 @@ static void aics_ip_cp_write(struct gatt_db_attribute *attrib, } aics_op = iov_pull_mem(&iov, sizeof(*aics_op)); + if (!aics_op) { + DBG(vcp, "iov_pull_mem() returned NULL"); + goto respond; + } for (handler = aics_handlers; handler && handler->str; handler++) { if (handler->op != *aics_op) From patchwork Tue Jul 9 14:35:02 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Roman Smirnov X-Patchwork-Id: 812499 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 EB53019D89D for ; Tue, 9 Jul 2024 14:35:49 +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=1720535752; cv=none; b=g8dT2WmHVo20rxW4m6fuRV4k8xeL0hRIXyzjYqWLKBwGiAKcuC12ngVEQac+S1/v7UP8uMnkulX/trzMcJNk/Oa16uuNeaTs1GGA7rpI12aqmW+crqRufOXlRl8im66y0qtn6n/xfjIpZue0FeTePJj3ISadYPxVngcopx5NYsA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1720535752; c=relaxed/simple; bh=zbITHsIUUE0Ji1/YBq0mag53WJ4gNvYQz7iddUlO4lk=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=md8BCbvlqWpK0vJkfohik8l4A+xjxIFVAUWa+fDrbVSsFI+RATe7aP2Ktt1dBvRy7hdUl4294IXN9IUzrfAlDo6XYHBdmDHAM8uwZEHfiYj4EPakHJi/pFYP6zIFbIsmzE2N34kBLy04WhNOPMkHH3IdV2adu7Qh8LfG6z/75pQ= 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 inp1wst083.omp.ru (81.22.207.138) 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; Tue, 9 Jul 2024 17:35:23 +0300 From: Roman Smirnov To: CC: Roman Smirnov Subject: [PATCH BlueZ v2 3/4] settings: limit string size in load_service() Date: Tue, 9 Jul 2024 17:35:02 +0300 Message-ID: <20240709143503.12142-4-r.smirnov@omp.ru> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240709143503.12142-1-r.smirnov@omp.ru> References: <20240709143503.12142-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/09/2024 14:15:02 X-KSE-AntiSpam-Status: KAS_STATUS_NOT_DETECTED X-KSE-AntiSpam-Method: none X-KSE-AntiSpam-Rate: 0 X-KSE-AntiSpam-Info: Lua profiles 186394 [Jul 09 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: 127.0.0.199:7.1.2; inp1wst083.omp.ru:7.1.1; omp.ru:7.1.1; d41d8cd98f00b204e9800998ecf8427e.com:7.1.1; 81.22.207.138:7.1.2 X-KSE-AntiSpam-Info: ApMailHostAddress: 81.22.207.138 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/09/2024 14:19:00 X-KSE-Antivirus-Interceptor-Info: scan successful X-KSE-Antivirus-Info: Clean, bases: 7/9/2024 11:26: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 buffer overflow by limiting the maximum string length. Found with the SVACE static analysis tool. --- V1 -> V2: use "%36s[^:]" instead of calculating the string length src/settings.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/settings.c b/src/settings.c index b61e694f1..643a083db 100644 --- a/src/settings.c +++ b/src/settings.c @@ -193,7 +193,7 @@ static int load_service(struct gatt_db *db, char *handle, char *value) return -EIO; } - if (sscanf(value, "%[^:]:%04hx:%36s", type, &end, uuid_str) != 3) { + if (sscanf(value, "%36[^:]:%04hx:%36s", type, &end, uuid_str) != 3) { DBG("Failed to parse value: %s", value); return -EIO; } From patchwork Tue Jul 9 14:35:03 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Roman Smirnov X-Patchwork-Id: 811572 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 8CA7C19DF5C for ; Tue, 9 Jul 2024 14:35: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=1720535755; cv=none; b=KNMkdi8nMbIZyU+UsAzhipD5CeEIqnEmPEQRzctQoVBQa4ZprPxBQIe1iuowYa5W89aFwh5ica2m5xUOFczBk3W1Hbv1TxKWtmUeZ4eKA2wgZnp3gcoKP2n3hlHnRx/shW9kOqBDkJOXinCt+9pc7qiUof3FilOuDasBxqkuF/A= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1720535755; c=relaxed/simple; bh=iHjx/Ti8+JdvlZ0N7evE/PBGi25M3IbtfF+guY2ZDpE=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=sjsDIE3/rJxQ2z1vrROkTCZmc7xB3Xdy1QpYTLIVtVpnjjE5qJ//5rLDvfrE5hqygfNb+ViyQOBMscqTKaR/mdXTQg0TF9s+B+mSKB17uJuacATYBa+CQSrFh7xaMv+lLwtbdN4lT8gNDwq/3KiWX8jkCkw1eisoQ2DaCmvoKzs= 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 inp1wst083.omp.ru (81.22.207.138) 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; Tue, 9 Jul 2024 17:35:24 +0300 From: Roman Smirnov To: CC: Roman Smirnov Subject: [PATCH BlueZ v2 4/4] settings: limit string size in gatt_db_load() Date: Tue, 9 Jul 2024 17:35:03 +0300 Message-ID: <20240709143503.12142-5-r.smirnov@omp.ru> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240709143503.12142-1-r.smirnov@omp.ru> References: <20240709143503.12142-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/09/2024 14:15:02 X-KSE-AntiSpam-Status: KAS_STATUS_NOT_DETECTED X-KSE-AntiSpam-Method: none X-KSE-AntiSpam-Rate: 0 X-KSE-AntiSpam-Info: Lua profiles 186394 [Jul 09 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: 127.0.0.199:7.1.2; inp1wst083.omp.ru:7.1.1; omp.ru:7.1.1; d41d8cd98f00b204e9800998ecf8427e.com:7.1.1; 81.22.207.138:7.1.2 X-KSE-AntiSpam-Info: ApMailHostAddress: 81.22.207.138 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/09/2024 14:19:00 X-KSE-Antivirus-Interceptor-Info: scan successful X-KSE-Antivirus-Info: Clean, bases: 7/9/2024 11:26: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 buffer overflow by limiting the maximum string length. Found with the SVACE static analysis tool. --- V1 -> V2: use "%36s[^:]" instead of calculating the string length src/settings.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/settings.c b/src/settings.c index 643a083db..371649395 100644 --- a/src/settings.c +++ b/src/settings.c @@ -232,7 +232,7 @@ static int gatt_db_load(struct gatt_db *db, GKeyFile *key_file, char **keys) value = g_key_file_get_string(key_file, "Attributes", *handle, NULL); - if (!value || sscanf(value, "%[^:]:", type) != 1) { + if (!value || sscanf(value, "%36[^:]:", type) != 1) { g_free(value); return -EIO; } @@ -255,7 +255,7 @@ static int gatt_db_load(struct gatt_db *db, GKeyFile *key_file, char **keys) value = g_key_file_get_string(key_file, "Attributes", *handle, NULL); - if (!value || sscanf(value, "%[^:]:", type) != 1) { + if (!value || sscanf(value, "%36[^:]:", type) != 1) { g_free(value); return -EIO; }