From patchwork Fri Jul 5 07:57: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: 810485 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 199EB144D23 for ; Fri, 5 Jul 2024 07:58:21 +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=1720166309; cv=none; b=MP6uCsMRADAoV1WeRxfKttD7OIUDgelBp0kkuUPT41oNIUe8fgAj2qLKry9e1yFT9n+C7lwO5iFNU+M72cFjm+TWxO0UlwDES7oSFF1U4Wc0c94IhhWjC9GmDCCNTAzMhiKyn3R+9ulH7vQoInK5NnXWcrX4r3ulP5PgxSv8T2w= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1720166309; c=relaxed/simple; bh=LzRbPu8K8HIKwD8TXFkDExufstzLFgvReiHkczJ8wYg=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=Sl1wJkVpC/gEaPJyvnYzCH+uE/zNzRJmXriP6kj/xFANeBYm8HIsl5LDIOZAzbTa756YpMpmuGuTvAxEYhlVUKkCWVnzexAgEvszZJMgt7Tk42YmFam1kI4Mrq2Ea8+J1mHwJfHSfZX4LF3kF23/ySNqXEw7AePInZDCgnxWOto= 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 (217.23.187.157) 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; Fri, 5 Jul 2024 10:58:03 +0300 From: Roman Smirnov To: CC: Roman Smirnov Subject: [PATCH BlueZ v2 1/5] obexd: add NULL checks to file_stat_line() Date: Fri, 5 Jul 2024 10:57:03 +0300 Message-ID: <20240705075709.26809-2-r.smirnov@omp.ru> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240705075709.26809-1-r.smirnov@omp.ru> References: <20240705075709.26809-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/05/2024 07:27:52 X-KSE-AntiSpam-Status: KAS_STATUS_NOT_DETECTED X-KSE-AntiSpam-Method: none X-KSE-AntiSpam-Rate: 59 X-KSE-AntiSpam-Info: Lua profiles 186342 [Jul 05 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: 21 0.3.21 ebee5449fc125b2da45f1a6a6bc2c5c0c3ad0e05 X-KSE-AntiSpam-Info: {rep_avail} X-KSE-AntiSpam-Info: {Tracking_from_domain_doesnt_match_to} X-KSE-AntiSpam-Info: {relay has no DNS name} X-KSE-AntiSpam-Info: {SMTP from is not routable} X-KSE-AntiSpam-Info: {Found in DNSBL: 217.23.187.157 in (user) b.barracudacentral.org} X-KSE-AntiSpam-Info: 217.23.187.157:7.1.2; d41d8cd98f00b204e9800998ecf8427e.com:7.1.1; omp.ru:7.1.1; 127.0.0.199:7.1.2 X-KSE-AntiSpam-Info: ApMailHostAddress: 217.23.187.157 X-KSE-AntiSpam-Info: {DNS response errors} X-KSE-AntiSpam-Info: Rate: 59 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/05/2024 07:32:00 X-KSE-Antivirus-Interceptor-Info: scan successful X-KSE-Antivirus-Info: Clean, bases: 7/5/2024 4:11:00 AM X-KSE-Attachment-Filter-Triggered-Rules: Clean X-KSE-Attachment-Filter-Triggered-Filters: Clean X-KSE-BulkMessagesFiltering-Scan-Result: InTheLimit gmtime() may return NULL. It is necessary to prevent dereferencing of a NULL pointer. Found with the SVACE static analysis tool. --- obexd/plugins/filesystem.c | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/obexd/plugins/filesystem.c b/obexd/plugins/filesystem.c index 4887a0b8a..a57b25a83 100644 --- a/obexd/plugins/filesystem.c +++ b/obexd/plugins/filesystem.c @@ -113,6 +113,7 @@ static char *file_stat_line(char *filename, struct stat *fstat, { char perm[51], atime[18], ctime[18], mtime[18]; char *escaped, *ret = NULL; + struct tm a_gmtime, c_gmtime, m_gmtime; snprintf(perm, 50, "user-perm=\"%s%s%s\" group-perm=\"%s%s%s\" " "other-perm=\"%s%s%s\"", @@ -126,9 +127,16 @@ static char *file_stat_line(char *filename, struct stat *fstat, (fstat->st_mode & 0002 ? "W" : ""), (dstat->st_mode & 0002 ? "D" : "")); - strftime(atime, 17, "%Y%m%dT%H%M%SZ", gmtime(&fstat->st_atime)); - strftime(ctime, 17, "%Y%m%dT%H%M%SZ", gmtime(&fstat->st_ctime)); - strftime(mtime, 17, "%Y%m%dT%H%M%SZ", gmtime(&fstat->st_mtime)); + if (!gmtime_r(&fstat->st_atime, &a_gmtime) || + !gmtime_r(&fstat->st_ctime, &c_gmtime) || + !gmtime_r(&fstat->st_mtime, &m_gmtime)) { + error("gmtime_r() returned NULL"); + return ret; + } + + strftime(atime, 17, "%Y%m%dT%H%M%SZ", &a_gmtime); + strftime(ctime, 17, "%Y%m%dT%H%M%SZ", &c_gmtime); + strftime(mtime, 17, "%Y%m%dT%H%M%SZ", &m_gmtime); escaped = g_markup_escape_text(filename, -1); From patchwork Fri Jul 5 07:57:04 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Roman Smirnov X-Patchwork-Id: 811241 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 A854D1442F0 for ; Fri, 5 Jul 2024 07:58: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=1720166314; cv=none; b=eEWJPoVHi5PKZoX2CWLRbLovpQMUz6Xjx7FyePonkCduH3v4h+Dz1fE3kV9zuxN16pUjrpcYV5opWuuY9YV9vryM/gjdvnFnQAGWtbDjdcn84pvBz8Y5LwxZrocbDUVBR6mz5YMC17WgGtk5UIjCV87wC0Hz1S+4dJ5qdhI5K4c= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1720166314; c=relaxed/simple; bh=ila5heOn1nNe1FbYPUb3D6YcQZuWoLdAQY1sSjxAKYE=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=tapPwQCKBDYTo/V/ikp4WRKvLdjqVfketnsNlPPkz+uZ/DBiQV6cfvR/SsHkfVz/DzodkFEqugZRI6Y9p2lQ4j0bmKW3pWMbAj+FJxERI359udACVnYXnSV17wc8rs4l/+WeQLCPNU+Nqo+sH7pIU+uW4LSGxVmLh0wi1DIEX2E= 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 (217.23.187.157) 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; Fri, 5 Jul 2024 10:58:06 +0300 From: Roman Smirnov To: CC: Roman Smirnov Subject: [PATCH BlueZ v2 2/5] shared/shell: prevent integer overflow in bt_shell_init() Date: Fri, 5 Jul 2024 10:57:04 +0300 Message-ID: <20240705075709.26809-3-r.smirnov@omp.ru> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240705075709.26809-1-r.smirnov@omp.ru> References: <20240705075709.26809-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/05/2024 07:27:52 X-KSE-AntiSpam-Status: KAS_STATUS_NOT_DETECTED X-KSE-AntiSpam-Method: none X-KSE-AntiSpam-Rate: 0 X-KSE-AntiSpam-Info: Lua profiles 186342 [Jul 05 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: 21 0.3.21 ebee5449fc125b2da45f1a6a6bc2c5c0c3ad0e05 X-KSE-AntiSpam-Info: {rep_avail} X-KSE-AntiSpam-Info: {Tracking_from_domain_doesnt_match_to} X-KSE-AntiSpam-Info: 217.23.187.157:7.1.2; d41d8cd98f00b204e9800998ecf8427e.com:7.1.1; omp.ru:7.1.1; 127.0.0.199:7.1.2 X-KSE-AntiSpam-Info: ApMailHostAddress: 217.23.187.157 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/05/2024 07:32:00 X-KSE-Antivirus-Interceptor-Info: scan successful X-KSE-Antivirus-Info: Clean, bases: 7/5/2024 4:11:00 AM X-KSE-Attachment-Filter-Triggered-Rules: Clean X-KSE-Attachment-Filter-Triggered-Filters: Clean X-KSE-BulkMessagesFiltering-Scan-Result: InTheLimit An integer overflow will occur if index < offest. It is necessary to prevent this case. Found with the SVACE static analysis tool. --- V1 -> V2: added check index >= 0, casting index to size_t src/shared/shell.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/shared/shell.c b/src/shared/shell.c index add4fa131..48de8ab1b 100644 --- a/src/shared/shell.c +++ b/src/shared/shell.c @@ -1333,7 +1333,7 @@ void bt_shell_init(int argc, char **argv, const struct bt_shell_opt *opt) } } - if (opt) { + if (opt && index >= 0 && (size_t)index >= offset) { if (c != opt->options[index - offset].val) { usage(argc, argv, opt); exit(EXIT_SUCCESS); From patchwork Fri Jul 5 07:57:05 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Roman Smirnov X-Patchwork-Id: 810484 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 0C5E7143C57 for ; Fri, 5 Jul 2024 07:58:35 +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=1720166318; cv=none; b=j+FTKr2i4WfJlS/BjQGcHM7jWGP9UYCDIQBru0cnaUTsyUofwigWzyZnwjFwmwvSP0cyDVqce4grSqqwhw4SpxN2SDVkvKpgj8w/Ga4GFKRdPQUhWlGK5fRJ43sUufQSbJyKlxzvF/ilDpQokYEjttXmTTxQXu/igi77YPaeTDs= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1720166318; c=relaxed/simple; bh=0TAJMpQeM0xQELdH3B90hapkcPHfW814JY+LzehEyAg=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=FEhW+BPQ8dXn96QD9xBWzijhD9pPaCWFyx2DAtqIZe3KuwQbLJKqBYEVu24TF7kRjm9WMaH6YJOZTVxJvh2HSaLZ+hyxHKeQ+f4JEdsL6X5RUfIJ/w0dZuZLaCl5AefdhfKGL6v7TKVQiBcih0dX/86t9GwivIfi4OEm0/NevPo= 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 (217.23.187.157) 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; Fri, 5 Jul 2024 10:58:06 +0300 From: Roman Smirnov To: CC: Roman Smirnov Subject: [PATCH BlueZ v2 3/5] tools/isotest: limit the maximum possible data_size Date: Fri, 5 Jul 2024 10:57:05 +0300 Message-ID: <20240705075709.26809-4-r.smirnov@omp.ru> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240705075709.26809-1-r.smirnov@omp.ru> References: <20240705075709.26809-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/05/2024 07:27:52 X-KSE-AntiSpam-Status: KAS_STATUS_NOT_DETECTED X-KSE-AntiSpam-Method: none X-KSE-AntiSpam-Rate: 0 X-KSE-AntiSpam-Info: Lua profiles 186342 [Jul 05 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: 21 0.3.21 ebee5449fc125b2da45f1a6a6bc2c5c0c3ad0e05 X-KSE-AntiSpam-Info: {rep_avail} X-KSE-AntiSpam-Info: {Tracking_from_domain_doesnt_match_to} X-KSE-AntiSpam-Info: 217.23.187.157:7.1.2; d41d8cd98f00b204e9800998ecf8427e.com:7.1.1; omp.ru:7.1.1; 127.0.0.199:7.1.2 X-KSE-AntiSpam-Info: ApMailHostAddress: 217.23.187.157 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/05/2024 07:32:00 X-KSE-Antivirus-Interceptor-Info: scan successful X-KSE-Antivirus-Info: Clean, bases: 7/5/2024 4:11: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 the possibility of allocating a large amount of memory. Found with the SVACE static analysis tool. --- tools/isotest.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/tools/isotest.c b/tools/isotest.c index c1bb6abd2..2cac0e49c 100644 --- a/tools/isotest.c +++ b/tools/isotest.c @@ -51,6 +51,8 @@ #define DEFAULT_BIG_ID 0x01 #define DEFAULT_BIS_ID 0x01 +#define MAX_DATA_SIZE 0x40000000 + /* Test modes */ enum { SEND, @@ -1253,7 +1255,7 @@ int main(int argc, char *argv[]) break; case 'b': - if (optarg) + if (optarg && atoi(optarg) < MAX_DATA_SIZE) data_size = atoi(optarg); break; From patchwork Fri Jul 5 07:57:06 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Roman Smirnov X-Patchwork-Id: 811240 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 B8880144D10 for ; Fri, 5 Jul 2024 07:58:38 +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=1720166321; cv=none; b=Xo0lnKN1BwfmyZbQZmIe6y/W0KI6tEM0DUhJX1tdk3/2LlYQzTn2QOA3pnDUnfqs3WFjmhYHfjM0H02QJr8ChAUTizqZcfaPNovIQLrhIbxN7Zqyhh7+pmUL3NQPrjTtK9f712D7C7EpCjOMuecKm3EAeraAmDYzSaIHDaASsmQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1720166321; c=relaxed/simple; bh=igZrh4u9vdQ4zqYiM4MmlT4dMcCok9XZiK/MgRjMLZE=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=sca9r6mvMbKJcUoEfC5ZYw1yExS+/WkRKb7xrP692FblKzegFjRST07kh8VM0dyrytJqCIyBmCJ0GniinMEzMrXCUKM2uOywiC9uYnqFXMOM4Pj7DcPvRd+MH/nYrHf9kZwXEDYdu7ZZxFCklHmqjLodvE+6oZ3py1N9DVWuMKM= 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 (217.23.187.157) 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; Fri, 5 Jul 2024 10:58:07 +0300 From: Roman Smirnov To: CC: Roman Smirnov Subject: [PATCH BlueZ v2 4/5] tools/rctest: limit the maximum possible data_size Date: Fri, 5 Jul 2024 10:57:06 +0300 Message-ID: <20240705075709.26809-5-r.smirnov@omp.ru> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240705075709.26809-1-r.smirnov@omp.ru> References: <20240705075709.26809-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/05/2024 07:27:52 X-KSE-AntiSpam-Status: KAS_STATUS_NOT_DETECTED X-KSE-AntiSpam-Method: none X-KSE-AntiSpam-Rate: 0 X-KSE-AntiSpam-Info: Lua profiles 186342 [Jul 05 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: 21 0.3.21 ebee5449fc125b2da45f1a6a6bc2c5c0c3ad0e05 X-KSE-AntiSpam-Info: {rep_avail} X-KSE-AntiSpam-Info: {Tracking_from_domain_doesnt_match_to} X-KSE-AntiSpam-Info: 217.23.187.157:7.1.2; d41d8cd98f00b204e9800998ecf8427e.com:7.1.1; omp.ru:7.1.1; 127.0.0.199:7.1.2 X-KSE-AntiSpam-Info: ApMailHostAddress: 217.23.187.157 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/05/2024 07:32:00 X-KSE-Antivirus-Interceptor-Info: scan successful X-KSE-Antivirus-Info: Clean, bases: 7/5/2024 4:11: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 the possibility of allocating a large amount of memory. Found with the SVACE static analysis tool. --- tools/rctest.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/tools/rctest.c b/tools/rctest.c index e39d313eb..b72be917c 100644 --- a/tools/rctest.c +++ b/tools/rctest.c @@ -41,6 +41,8 @@ #define SIOCGSTAMP_OLD SIOCGSTAMP #endif +#define MAX_DATA_SIZE 0x40000000 + /* Test modes */ enum { SEND, @@ -749,7 +751,8 @@ int main(int argc, char *argv[]) break; case 'b': - data_size = atoi(optarg); + if (optarg && atoi(optarg) < MAX_DATA_SIZE) + data_size = atoi(optarg); break; case 'i': From patchwork Fri Jul 5 07:57:07 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Roman Smirnov X-Patchwork-Id: 810483 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 6EFEE1459F3 for ; Fri, 5 Jul 2024 07:58:41 +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=1720166323; cv=none; b=qM0Ur47zwk1IwE0+E9UgD54Sk3gsmkYtPunmyvsmeDNH5U4MU146CLgzWLemBK8F1FPMJNAkJaJC5ZsJPzgId/FIYpf0U16nfYbWrPE/aS8snZl+Dzb9+D9A8ReE6hWGQigpOcxCVd0J2GeQZwgwYB8NXrX6/r/5p3NtVD3MSQ8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1720166323; c=relaxed/simple; bh=3hgKPuZroGIk/19JjsZQZp88S/OU/j51aTYzL9tF2RI=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=lopw6FP8Olza9caKBNGI6GciGVyZnGda1tECM6wZknhWJoO5yETupdu98YAVHxmip4I7JH8jaUFpTrA0f21ifVJOXgppuc2PWiOqiei+PBPLjKJ/HDFb5fIq0kng9jX6JRwsbmgPiOh1vaIYWC+bTLmBtSOlFzEuoCeNRno0W8I= 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 (217.23.187.157) 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; Fri, 5 Jul 2024 10:58:07 +0300 From: Roman Smirnov To: CC: Roman Smirnov Subject: [PATCH BlueZ v2 5/5] settings: add NULL checks to gatt_db_load() Date: Fri, 5 Jul 2024 10:57:07 +0300 Message-ID: <20240705075709.26809-6-r.smirnov@omp.ru> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240705075709.26809-1-r.smirnov@omp.ru> References: <20240705075709.26809-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/05/2024 07:27:52 X-KSE-AntiSpam-Status: KAS_STATUS_NOT_DETECTED X-KSE-AntiSpam-Method: none X-KSE-AntiSpam-Rate: 0 X-KSE-AntiSpam-Info: Lua profiles 186342 [Jul 05 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: 21 0.3.21 ebee5449fc125b2da45f1a6a6bc2c5c0c3ad0e05 X-KSE-AntiSpam-Info: {rep_avail} X-KSE-AntiSpam-Info: {Tracking_from_domain_doesnt_match_to} X-KSE-AntiSpam-Info: 217.23.187.157:7.1.2; d41d8cd98f00b204e9800998ecf8427e.com:7.1.1; omp.ru:7.1.1; 127.0.0.199:7.1.2 X-KSE-AntiSpam-Info: ApMailHostAddress: 217.23.187.157 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/05/2024 07:32:00 X-KSE-Antivirus-Interceptor-Info: scan successful X-KSE-Antivirus-Info: Clean, bases: 7/5/2024 4:11: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. --- src/settings.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/settings.c b/src/settings.c index 996eaacd3..b61e694f1 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 (sscanf(value, "%[^:]:", type) != 1) { + if (!value || sscanf(value, "%[^:]:", 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 (sscanf(value, "%[^:]:", type) != 1) { + if (!value || sscanf(value, "%[^:]:", type) != 1) { g_free(value); return -EIO; }