From patchwork Tue Jul 9 12:00:31 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Roman Smirnov X-Patchwork-Id: 811578 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 CF794156F45 for ; Tue, 9 Jul 2024 12:01:29 +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=1720526492; cv=none; b=rGaX8hYigy+LAJR2U6s9RlgSNX1EmOVuMJQ9Z35sssmanPUY+Hw/7vKglWe+TwQ27wOt6tu7EFveUf6KpG4SgjBlwuWwHKFy/TMMHennbVqyTUCu8pGPbIqNtlVZYgtMe8985shPlK1SDdNBMt4l5qtKNuZswZw4p3Uw0sb3mKk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1720526492; c=relaxed/simple; bh=jj0sCFH9IV8V2a3JAg79nc0POFH0ZjPwlbhUxzAuvr0=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=k29uNwP81+QVizxQpUUcv6ZQJ9Aa7ZoVrKilBNKizMkd6ok8QiPTDS1vb98mbFQWI6sC5QpWHqFjNlJZfrsIDfUlZkcVybrUMVbuUYgpbea5t7jxsvF7hsYhGJaaTd3KUgJxSbTsmEzkWkCnLAD6s1BZAXogp5Ryy+Sx6hoszS8= 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 15:01:05 +0300 From: Roman Smirnov To: CC: Roman Smirnov Subject: [PATCH BlueZ v1 4/4] settings: limit the number of chars to be read in gatt_db_load() Date: Tue, 9 Jul 2024 15:00:31 +0300 Message-ID: <20240709120031.105038-5-r.smirnov@omp.ru> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240709120031.105038-1-r.smirnov@omp.ru> References: <20240709120031.105038-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 11:45:20 X-KSE-AntiSpam-Status: KAS_STATUS_NOT_DETECTED X-KSE-AntiSpam-Method: none X-KSE-AntiSpam-Rate: 19 X-KSE-AntiSpam-Info: Lua profiles 186390 [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: 23 0.3.23 8881c50ebb08f9085352475be251cf18bb0fcfdd X-KSE-AntiSpam-Info: {rep_avail} X-KSE-AntiSpam-Info: {Tracking_from_domain_doesnt_match_to} X-KSE-AntiSpam-Info: {SMTP from is not routable} X-KSE-AntiSpam-Info: {Found in DNSBL: 81.22.207.138 in (user) b.barracudacentral.org} X-KSE-AntiSpam-Info: 81.22.207.138:7.1.2; inp1wst083.omp.ru:7.1.1; 127.0.0.199:7.1.2; omp.ru:7.1.1; d41d8cd98f00b204e9800998ecf8427e.com:7.1.1 X-KSE-AntiSpam-Info: ApMailHostAddress: 81.22.207.138 X-KSE-AntiSpam-Info: {DNS response errors} X-KSE-AntiSpam-Info: Rate: 19 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 11:49: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 limit the string length to prevent buffer overflow. Find the string length, write it to the pattern and use it for limiting. Found with the SVACE static analysis tool. --- src/settings.c | 39 +++++++++++++++++++++++++++++++++++++-- 1 file changed, 37 insertions(+), 2 deletions(-) diff --git a/src/settings.c b/src/settings.c index 4eccf0b4e..dcfbc5601 100644 --- a/src/settings.c +++ b/src/settings.c @@ -243,13 +243,32 @@ static int gatt_db_load(struct gatt_db *db, GKeyFile *key_file, char **keys) struct gatt_db_attribute *current_service; char **handle, *value, type[MAX_LEN_UUID_STR]; int ret; + char pattern[6]; + char *colon_pos; + size_t len; /* first load service definitions */ for (handle = keys; *handle; handle++) { value = g_key_file_get_string(key_file, "Attributes", *handle, NULL); + if (!value) + return -EIO; + + colon_pos = memchr(value, ':', MAX_LEN_UUID_STR); + if (!colon_pos) { + g_free(value); + return -EIO; + } + + len = colon_pos - value; + if (!len) { + g_free(value); + return -EIO; + } - if (!value || sscanf(value, "%[^:]:", type) != 1) { + snprintf(pattern, sizeof(pattern), "%%%lds:", len); + + if (sscanf(value, pattern, type) != 1) { g_free(value); return -EIO; } @@ -271,8 +290,24 @@ static int gatt_db_load(struct gatt_db *db, GKeyFile *key_file, char **keys) for (handle = keys; *handle; handle++) { value = g_key_file_get_string(key_file, "Attributes", *handle, NULL); + if (!value) + return -EIO; + + colon_pos = memchr(value, ':', MAX_LEN_UUID_STR); + if (!colon_pos) { + g_free(value); + return -EIO; + } + + len = colon_pos - value; + if (!len) { + g_free(value); + return -EIO; + } + + snprintf(pattern, sizeof(pattern), "%%%lds:", len); - if (!value || sscanf(value, "%[^:]:", type) != 1) { + if (sscanf(value, pattern, type) != 1) { g_free(value); return -EIO; }