From patchwork Thu Jul 4 18:07:46 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Roman Smirnov X-Patchwork-Id: 811247 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 7929D6F065 for ; Thu, 4 Jul 2024 18:08:26 +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=1720116511; cv=none; b=pb2UEziUHoPAdQZTHua3toUEbNUxsby6NAgIH+EjX4sb4mIVlzH5GO2nV5RBr1hCrbk+EzVi6dl+RHhWqITfyYPg26LD79fNy9PoqzzR8TcqUuyAdG5Zl6b/wTqbL83SpSpOhxy9wk0Z1dycm9b8xPkopp6PvFZplGI4j+PGGNQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1720116511; c=relaxed/simple; bh=LzRbPu8K8HIKwD8TXFkDExufstzLFgvReiHkczJ8wYg=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=ZWV5hgWSAjsxmwYiboe2XfzG3bll9qhenqfkye251a4kh0TcX+JkuR+fuSmuboUFf4vPuxi9da9ugVX/u09iy5CsRZrjAMnkIKmiQpZkayA05nTa94Hl5S20bPuKfMSHHxuQ2tqih2FayR9/WPbbPcFLuai60LKeP+NG5fmpgU8= 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; Thu, 4 Jul 2024 21:08:15 +0300 From: Roman Smirnov To: CC: Roman Smirnov Subject: [PATCH BlueZ v1 1/5] obexd: add NULL checks to file_stat_line() Date: Thu, 4 Jul 2024 21:07:46 +0300 Message-ID: <20240704180752.94264-2-r.smirnov@omp.ru> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240704180752.94264-1-r.smirnov@omp.ru> References: <20240704180752.94264-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/04/2024 17:50:15 X-KSE-AntiSpam-Status: KAS_STATUS_NOT_DETECTED X-KSE-AntiSpam-Method: none X-KSE-AntiSpam-Rate: 59 X-KSE-AntiSpam-Info: Lua profiles 186337 [Jul 04 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: {Found in DNSBL: 217.23.187.157 in (user) dbl.spamhaus.org} X-KSE-AntiSpam-Info: d41d8cd98f00b204e9800998ecf8427e.com:7.1.1; omp.ru:7.1.1; 127.0.0.199:7.1.2; 217.23.187.157:7.1.2 X-KSE-AntiSpam-Info: FromAlignment: s X-KSE-AntiSpam-Info: {rdns complete} X-KSE-AntiSpam-Info: {fromrtbl complete} 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=none header.from=omp.ru;spf=none 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/04/2024 17:54:00 X-KSE-Antivirus-Interceptor-Info: scan successful X-KSE-Antivirus-Info: Clean, bases: 7/4/2024 4:47:00 PM 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 Thu Jul 4 18:07:47 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Roman Smirnov X-Patchwork-Id: 810053 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 3F77F73448 for ; Thu, 4 Jul 2024 18:08:31 +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=1720116515; cv=none; b=OzrMNWfl5Byifn9qPnG1hQyzdtQiMrRhcSmptM+mYh5jgz76e20acQdFPsvNIm9N9RI9Lay4Agqw51/sFI16yQIaGam/WHTX7sJRXUbz27dQfytoqMlCQDynuSiS0dYvupnMSd+FUM+3IQusVTVRiaTcHa+Z5Qq6bZNzZ5/njLw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1720116515; c=relaxed/simple; bh=tBz7Ds0SyxKnX/qhw6VEF1QKDodh3lUm8vVZ7ZUeiho=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=fytXXl31SBVDkOgLHMtSR9P7FNDSjZiifobLDxOPvc0lsSWlOU1k684CTZfJG+jVK1XmX2+qdO0jBQ2y1xrCr7TTH8VjjkpH3bDQM0UAJ6xesOze2LE3xg420vw2uy4z66fljefmktlZzqvBxK5uNsDfouzJuN1siioAiLGVx4k= 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; Thu, 4 Jul 2024 21:08:18 +0300 From: Roman Smirnov To: CC: Roman Smirnov Subject: [PATCH BlueZ v1 2/5] shared/shell: prevent integer overflow in bt_shell_init() Date: Thu, 4 Jul 2024 21:07:47 +0300 Message-ID: <20240704180752.94264-3-r.smirnov@omp.ru> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240704180752.94264-1-r.smirnov@omp.ru> References: <20240704180752.94264-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/04/2024 17:50:15 X-KSE-AntiSpam-Status: KAS_STATUS_NOT_DETECTED X-KSE-AntiSpam-Method: none X-KSE-AntiSpam-Rate: 59 X-KSE-AntiSpam-Info: Lua profiles 186337 [Jul 04 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: {Found in DNSBL: 217.23.187.157 in (user) dbl.spamhaus.org} X-KSE-AntiSpam-Info: d41d8cd98f00b204e9800998ecf8427e.com:7.1.1; omp.ru:7.1.1; 127.0.0.199:7.1.2; 217.23.187.157: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/04/2024 17:54:00 X-KSE-Antivirus-Interceptor-Info: scan successful X-KSE-Antivirus-Info: Clean, bases: 7/4/2024 4:47:00 PM 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. --- 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..ea0985815 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 >= offset) { if (c != opt->options[index - offset].val) { usage(argc, argv, opt); exit(EXIT_SUCCESS); From patchwork Thu Jul 4 18:07:48 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Roman Smirnov X-Patchwork-Id: 811246 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 812E75339E for ; Thu, 4 Jul 2024 18:08: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=1720116518; cv=none; b=Th8tc/JJJJbjuk1L7FTpD544wOEjYW1Lvce2xxoRUPf3MeXt6Yh6BOqs8xmHjN9FaXeoJo2Pbqg9WiCTRA2BDhTkVz6um8KrsW+Cx4hr4usrtDgezThOkhzyIUIWUmYrmJGA71DuUrqvEzorjDBcUjE8XnGASl8P5HE7dlPSRss= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1720116518; c=relaxed/simple; bh=0TAJMpQeM0xQELdH3B90hapkcPHfW814JY+LzehEyAg=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=gnBYQtiDFq63nvYgizCc5LDp/863nMEWAzx6Sc0w7RTmegHtfezr5AbKa0rZkigv8Ts18gjuUAXdo5MLFvzc/kiJVjEb41+N8GKRufCAqINfy4pVw7ZxxIxsOCztC2BHGpo1GHeLpJNFKeu//2IzQjdTD67hvQ7muynweef0aBE= 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; Thu, 4 Jul 2024 21:08:23 +0300 From: Roman Smirnov To: CC: Roman Smirnov Subject: [PATCH BlueZ v1 3/5] tools/isotest: limit the maximum possible data_size Date: Thu, 4 Jul 2024 21:07:48 +0300 Message-ID: <20240704180752.94264-4-r.smirnov@omp.ru> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240704180752.94264-1-r.smirnov@omp.ru> References: <20240704180752.94264-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/04/2024 17:50:15 X-KSE-AntiSpam-Status: KAS_STATUS_NOT_DETECTED X-KSE-AntiSpam-Method: none X-KSE-AntiSpam-Rate: 59 X-KSE-AntiSpam-Info: Lua profiles 186337 [Jul 04 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: {Found in DNSBL: 217.23.187.157 in (user) dbl.spamhaus.org} X-KSE-AntiSpam-Info: d41d8cd98f00b204e9800998ecf8427e.com:7.1.1; omp.ru:7.1.1; 127.0.0.199:7.1.2; 217.23.187.157:7.1.2 X-KSE-AntiSpam-Info: FromAlignment: s X-KSE-AntiSpam-Info: {rdns complete} X-KSE-AntiSpam-Info: {fromrtbl complete} 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=none header.from=omp.ru;spf=none 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/04/2024 17:54:00 X-KSE-Antivirus-Interceptor-Info: scan successful X-KSE-Antivirus-Info: Clean, bases: 7/4/2024 4:47:00 PM 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 Thu Jul 4 18:07: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: 810052 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 80AE07344C for ; Thu, 4 Jul 2024 18:08: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=1720116523; cv=none; b=H3/UPM1M2X18gTzbMHEK4EvbVwRFX4cXrm9vuYLJ/NOSixyhlOl5O3O6Ua/gcizLoiYCtZTCAxfq4wqM1blKgjApAIiuTcn5aNlUa27r0sQefhaDoZ1NkDIoHudkPe+LMw2c2uxd2mPBqYatZsQhVO9YCwbz645XbV76lh4A0n0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1720116523; c=relaxed/simple; bh=igZrh4u9vdQ4zqYiM4MmlT4dMcCok9XZiK/MgRjMLZE=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=KvOa+Hqtp9dyconC/uEg/gBGpmR2IHaSsoZuSxtDWO5ifXDwoPegpMG6T2+NlVNcYfJ21Lgj6SYgJqWOxFoLoDQphOfRjehTP8R9tfUwq6OE4siw1mmFKwk7dK4mA5gnFHRQ+AewFCuZYZ0n65w5GBKEk5sthPB8z3sRNpi86qg= 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; Thu, 4 Jul 2024 21:08:27 +0300 From: Roman Smirnov To: CC: Roman Smirnov Subject: [PATCH BlueZ v1 4/5] tools/rctest: limit the maximum possible data_size Date: Thu, 4 Jul 2024 21:07:49 +0300 Message-ID: <20240704180752.94264-5-r.smirnov@omp.ru> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240704180752.94264-1-r.smirnov@omp.ru> References: <20240704180752.94264-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/04/2024 17:50:15 X-KSE-AntiSpam-Status: KAS_STATUS_NOT_DETECTED X-KSE-AntiSpam-Method: none X-KSE-AntiSpam-Rate: 59 X-KSE-AntiSpam-Info: Lua profiles 186337 [Jul 04 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: {Found in DNSBL: 217.23.187.157 in (user) dbl.spamhaus.org} X-KSE-AntiSpam-Info: d41d8cd98f00b204e9800998ecf8427e.com:7.1.1; omp.ru:7.1.1; 127.0.0.199:7.1.2; 217.23.187.157: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/04/2024 17:54:00 X-KSE-Antivirus-Interceptor-Info: scan successful X-KSE-Antivirus-Info: Clean, bases: 7/4/2024 4:47:00 PM 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 Thu Jul 4 18:07:50 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Roman Smirnov X-Patchwork-Id: 811245 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 65BCC6F09C for ; Thu, 4 Jul 2024 18:08:43 +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=1720116525; cv=none; b=AP2wXkvSs3qapVE+0d8OSKSP8c75vp5JepsHtH64s5x1ApN3sbjcJTZABVzidzOyXIcPb/V0kSamVa47W/QotcLmzEDF0Bu9kj+7MV8K86jYZpvuBn0UKOqAC1DQkR4CNAIsI/Cou/c8K1um+lHdcE1gSBOgpq9AwSXxs4zJ4ow= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1720116525; c=relaxed/simple; bh=Qt1rKSi5zRfF1ij9eSFKDM0KzLa1PCRtWGjLGuQ+g2Y=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=T9yNvPwGr/J22oQEswEoXwOsOz/znBA6mVh1Zmd2B/u99t5u+mh0FwoggsiV9AeMeaEtWsGJq4MNmj/YgnEtoyFmCxZln5d14eMGbnqgMj1Ud5M+j1D3B+syKe2sEBqbCqrvwq0OdtiH9BkDM109+KoPcoTcbn7rO+6rs+P5WBs= 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; Thu, 4 Jul 2024 21:08:33 +0300 From: Roman Smirnov To: CC: Roman Smirnov Subject: [PATCH BlueZ v1 5/5] settings: add NULL checks to gatt_db_load() Date: Thu, 4 Jul 2024 21:07:50 +0300 Message-ID: <20240704180752.94264-6-r.smirnov@omp.ru> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240704180752.94264-1-r.smirnov@omp.ru> References: <20240704180752.94264-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/04/2024 17:50:15 X-KSE-AntiSpam-Status: KAS_STATUS_NOT_DETECTED X-KSE-AntiSpam-Method: none X-KSE-AntiSpam-Rate: 59 X-KSE-AntiSpam-Info: Lua profiles 186337 [Jul 04 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: {Found in DNSBL: 217.23.187.157 in (user) dbl.spamhaus.org} X-KSE-AntiSpam-Info: d41d8cd98f00b204e9800998ecf8427e.com:7.1.1; omp.ru:7.1.1; 127.0.0.199:7.1.2; 217.23.187.157:7.1.2 X-KSE-AntiSpam-Info: FromAlignment: s X-KSE-AntiSpam-Info: {rdns complete} X-KSE-AntiSpam-Info: {fromrtbl complete} 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=none header.from=omp.ru;spf=none 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/04/2024 17:54:00 X-KSE-Antivirus-Interceptor-Info: scan successful X-KSE-Antivirus-Info: Clean, bases: 7/4/2024 4:47:00 PM 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; }