From patchwork Wed Jul 10 14:16:14 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Roman Smirnov X-Patchwork-Id: 811899 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 9AA9319149A for ; Wed, 10 Jul 2024 14:16:57 +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=1720621022; cv=none; b=CNVeKa6EIUDpEnOABOtohOJaaZdpYMwQWgOV/HX+b0VReQeuGbc80YXBX9z+5wBDdeYMryVzPTpOMdeaLr0UUAySoeJzqWUo9YQD4dpJPILu4d/X9kAC6h4ZX+mH9TVYo4yuOA5/Kss+NeC5Pj8sl4jtF3nXf3ngRj09FPvXk4E= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1720621022; c=relaxed/simple; bh=X2qylBZT9BN9u2EfJAE1ZxkzNPzM0HpM48nU9tgCGco=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=arfMH1tGrhROAHDqghxnD3SAZFaHpEM9bDi2ECm7tuYTvO408UI6bgTJI9OrCQTLqEZyoYP9vGCdT7i50x8acsDZctt8AVKorXsDQPRVE/LzAOhESK4zKsXcJ/zWwVYBzeKjrCdnuHRlI9qLP4CUFnyIoZmKiWJ1q8T9w+mtyRs= 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 17:16:36 +0300 From: Roman Smirnov To: CC: Roman Smirnov Subject: [PATCH BlueZ v3 resend 1/6] gatt: add a check to sock_io_send() Date: Wed, 10 Jul 2024 17:16:14 +0300 Message-ID: <20240710141621.64394-2-r.smirnov@omp.ru> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240710141621.64394-1-r.smirnov@omp.ru> References: <20240710141621.64394-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 13:54:49 X-KSE-AntiSpam-Status: KAS_STATUS_NOT_DETECTED X-KSE-AntiSpam-Method: none X-KSE-AntiSpam-Rate: 0 X-KSE-AntiSpam-Info: Lua profiles 186438 [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: omp.ru:7.1.1; d41d8cd98f00b204e9800998ecf8427e.com:7.1.1; 127.0.0.199:7.1.2 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 14:00:00 X-KSE-Antivirus-Interceptor-Info: scan successful X-KSE-Antivirus-Info: Clean, bases: 7/10/2024 12:34: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 add a return value check. Found with the SVACE static analysis tool. --- V1 -> V3: the patch name has been shortened src/gatt-database.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/gatt-database.c b/src/gatt-database.c index 8472aac59..6c84b085c 100644 --- a/src/gatt-database.c +++ b/src/gatt-database.c @@ -2630,6 +2630,7 @@ static int sock_io_send(struct io *io, const void *data, size_t len) { struct msghdr msg; struct iovec iov; + int fd; iov.iov_base = (void *) data; iov.iov_len = len; @@ -2638,7 +2639,13 @@ static int sock_io_send(struct io *io, const void *data, size_t len) msg.msg_iov = &iov; msg.msg_iovlen = 1; - return sendmsg(io_get_fd(io), &msg, MSG_NOSIGNAL); + fd = io_get_fd(io); + if (fd < 0) { + error("io_get_fd() returned %d\n", fd); + return fd; + } + + return sendmsg(fd, &msg, MSG_NOSIGNAL); } static void att_disconnect_cb(int err, void *user_data) From patchwork Wed Jul 10 14:16:15 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Roman Smirnov X-Patchwork-Id: 812489 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 CCC99193461 for ; Wed, 10 Jul 2024 14:17:02 +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=1720621032; cv=none; b=BROXLme/ufgxtXPwDerPPJ8V355tUPicNth9AofFhLUIiYpLEBIwnVdT8bnLkvvXkZsIM4dRwvlgyxVFouc/Q4swp5vmzKvCvfCo7hW6Ow2zqO+EC5+n63LaK4rBVyqfEfW5rzm7xEcT3i1ALjKnbiGRrYGNokAjjeDFxjQnrEM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1720621032; c=relaxed/simple; bh=xDhD6rhNbfYh49WZqioIipK1sKM6rRbpT3dbvss9wTc=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=a1kCGuEppKwmmNM96p/TAoSvSnPikAGKgQL3HBjIrIjS5D78bjDti7dmlu2d8Y0oLCwnJWmU4fCH/8bb9Ws/0u6OXO7gp1JzzFRKlZq+jGnflIMANij7wjN99INz7y0xrXPlhldVBwv0ThpFI7fjaaazNKtGeLSEdd5Qs7MDW0o= 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 17:16:37 +0300 From: Roman Smirnov To: CC: Roman Smirnov Subject: [PATCH BlueZ v3 resend 2/6] shared/vcp: add NULL checks to foreach_aics_service() Date: Wed, 10 Jul 2024 17:16:15 +0300 Message-ID: <20240710141621.64394-3-r.smirnov@omp.ru> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240710141621.64394-1-r.smirnov@omp.ru> References: <20240710141621.64394-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 13:54:49 X-KSE-AntiSpam-Status: KAS_STATUS_NOT_DETECTED X-KSE-AntiSpam-Method: none X-KSE-AntiSpam-Rate: 0 X-KSE-AntiSpam-Info: Lua profiles 186438 [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: omp.ru:7.1.1; d41d8cd98f00b204e9800998ecf8427e.com:7.1.1; 127.0.0.199:7.1.2 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 14:00:00 X-KSE-Antivirus-Interceptor-Info: scan successful X-KSE-Antivirus-Info: Clean, bases: 7/10/2024 12:34:00 PM X-KSE-Attachment-Filter-Triggered-Rules: Clean X-KSE-Attachment-Filter-Triggered-Filters: Clean X-KSE-BulkMessagesFiltering-Scan-Result: InTheLimit Make foreach_aics_service() safe for passing NULL pointers. Found with the SVACE static analysis tool. --- src/shared/vcp.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/shared/vcp.c b/src/shared/vcp.c index 602d46dc1..43ef1d186 100644 --- a/src/shared/vcp.c +++ b/src/shared/vcp.c @@ -2729,6 +2729,9 @@ static void foreach_aics_service(struct gatt_db_attribute *attr, struct bt_vcp *vcp = user_data; struct bt_aics *aics = vcp_get_aics(vcp); + if (!aics || !attr) + return; + aics->service = attr; gatt_db_service_set_claimed(attr, true); From patchwork Wed Jul 10 14:16:16 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Roman Smirnov X-Patchwork-Id: 811898 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 B42C8193447 for ; Wed, 10 Jul 2024 14:17:12 +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=1720621037; cv=none; b=rSt2Y/+YdwPPvA4xatHI3qiGE4Au74o0Zy5yyiUXkwWGjQPzL8GmS7ORKWVj+Vn0yw7Vf2ZRPcqL/fIf8Drrd9WryA7RRG01P8EthstUEknUWWjQSfShfxSPCmbcrdP7EUOY4e3AusL0VU3Rh5tCtXwT4d06GHrJdnHhLZkqhwg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1720621037; c=relaxed/simple; bh=4V8zzM1uHfw+qm4QGRcGo2DbbLVhNLdCl+fuGevsxj4=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=cNPqzy/4EbowB/hyaju6oGqqwMa1T3WbfRjyHRzIGfrc+IcYuRchhnp61Jj6fg6ter5YKVpmtWwE5zxfh8IbIWbfrU62zsdU7AbEks94e0gp6rxX4oJ0hAWctYsDn9tKev5MBLaRVvhplc3yCIjawmvER+DWbF2a96RDfZiYDiU= 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 17:16:38 +0300 From: Roman Smirnov To: CC: Roman Smirnov Subject: [PATCH BlueZ v3 resend 3/6] client/player: add error code handling to transport_recv() Date: Wed, 10 Jul 2024 17:16:16 +0300 Message-ID: <20240710141621.64394-4-r.smirnov@omp.ru> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240710141621.64394-1-r.smirnov@omp.ru> References: <20240710141621.64394-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 13:54:49 X-KSE-AntiSpam-Status: KAS_STATUS_NOT_DETECTED X-KSE-AntiSpam-Method: none X-KSE-AntiSpam-Rate: 0 X-KSE-AntiSpam-Info: Lua profiles 186438 [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: omp.ru:7.1.1; d41d8cd98f00b204e9800998ecf8427e.com:7.1.1; 127.0.0.199:7.1.2 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 14:00:00 X-KSE-Antivirus-Interceptor-Info: scan successful X-KSE-Antivirus-Info: Clean, bases: 7/10/2024 12:34: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 add return value check as in sock_send(). Found with the SVACE static analysis tool. --- V1 -> V2: the name of the patch has been shortened client/player.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/client/player.c b/client/player.c index 584fc5e81..de4491b53 100644 --- a/client/player.c +++ b/client/player.c @@ -4514,7 +4514,13 @@ static bool transport_recv(struct io *io, void *user_data) uint8_t buf[1024]; int ret, len; - ret = read(io_get_fd(io), buf, sizeof(buf)); + ret = io_get_fd(io); + if (ret < 0) { + bt_shell_printf("io_get_fd() returned %d\n", ret); + return true; + } + + ret = read(ret, buf, sizeof(buf)); if (ret < 0) { bt_shell_printf("Failed to read: %s (%d)\n", strerror(errno), -errno); From patchwork Wed Jul 10 14:16:17 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Roman Smirnov X-Patchwork-Id: 812488 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 86582193460 for ; Wed, 10 Jul 2024 14:17:17 +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=1720621039; cv=none; b=fleFdd2JDaxFa7BIPu7VsZnPnFmBwpgF8tGSQ90GQ6ateu3xSDLS1MeIUTR4BupPvzgcj0ptOQY3cLWReLEr8QNtVuJVxUArZfVVvkDFmrRgL0GoC5HGAFIL2geDQLpjSAl8X/2c6cXsktnRT8kbt4egHSpu0jOK/oDa8zU3VCU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1720621039; c=relaxed/simple; bh=mRAhK77PuVCNh72sBJ99exWKjo0VFA05LpQESKZy2JU=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=NP1kxBh5iD4s/N/pMJV4jx1k6ZCIJeo4zc0u+TLUZNgoYsxl1WCw24heHFRtxAUoUznRaA2Jw2uf+O9XctZ15g8gDsKMsISzKKZgteb65Wwta3ZzNlkWey7zPsiyKMyJTo1AuOAUKNJn9kWLhs1ms9CdgRPgwvhgxlv6+P6f560= 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 17:16:38 +0300 From: Roman Smirnov To: CC: Roman Smirnov Subject: [PATCH BlueZ v3 resend 4/6] shared/vcp: prevent dereferencing of NULL pointers Date: Wed, 10 Jul 2024 17:16:17 +0300 Message-ID: <20240710141621.64394-5-r.smirnov@omp.ru> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240710141621.64394-1-r.smirnov@omp.ru> References: <20240710141621.64394-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 13:54:49 X-KSE-AntiSpam-Status: KAS_STATUS_NOT_DETECTED X-KSE-AntiSpam-Method: none X-KSE-AntiSpam-Rate: 0 X-KSE-AntiSpam-Info: Lua profiles 186438 [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: omp.ru:7.1.1; d41d8cd98f00b204e9800998ecf8427e.com:7.1.1; 127.0.0.199:7.1.2 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 14:00:00 X-KSE-Antivirus-Interceptor-Info: scan successful X-KSE-Antivirus-Info: Clean, bases: 7/10/2024 12:34:00 PM X-KSE-Attachment-Filter-Triggered-Rules: Clean X-KSE-Attachment-Filter-Triggered-Filters: Clean X-KSE-BulkMessagesFiltering-Scan-Result: InTheLimit util_memdup() will terminate the program if memory allocation fails. Found with the SVACE static analysis tool. --- V1 -> V2: util_memdup() is used instead of checking for NULL src/shared/vcp.c | 20 ++++---------------- 1 file changed, 4 insertions(+), 16 deletions(-) diff --git a/src/shared/vcp.c b/src/shared/vcp.c index 43ef1d186..cfc426624 100644 --- a/src/shared/vcp.c +++ b/src/shared/vcp.c @@ -2139,14 +2139,8 @@ static void read_vocs_audio_descriptor(struct bt_vcp *vcp, bool success, return; } - vocs_ao_dec_r = malloc(length+1); - memset(vocs_ao_dec_r, 0, length+1); - memcpy(vocs_ao_dec_r, value, length); - - if (!vocs_ao_dec_r) { - DBG(vcp, "Unable to get VOCS Audio Descriptor"); - return; - } + vocs_ao_dec_r = util_memdup(value, length + 1); + memset(vocs_ao_dec_r + length, 0, 1); DBG(vcp, "VOCS Audio Descriptor: %s", vocs_ao_dec_r); free(vocs_ao_dec_r); @@ -2543,14 +2537,8 @@ static void read_aics_audio_ip_description(struct bt_vcp *vcp, bool success, return; } - ip_descrptn = malloc(length+1); - memset(ip_descrptn, 0, length+1); - memcpy(ip_descrptn, value, length); - - if (!ip_descrptn) { - DBG(vcp, "Unable to get Audio Input Description"); - return; - } + ip_descrptn = util_memdup(value, length + 1); + memset(ip_descrptn + length, 0, 1); DBG(vcp, "Audio Input Description: %s", ip_descrptn); free(ip_descrptn); From patchwork Wed Jul 10 14:16:18 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Roman Smirnov X-Patchwork-Id: 811897 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 7867D193464 for ; Wed, 10 Jul 2024 14:17:19 +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=1720621048; cv=none; b=szgDO65XBNZ5Kt/6izryVscHXyFFEPlb7dxeKi+y7wul36uPtqahpIyfDr11BHOhzji7DF2/mvoJtAjyNKxplzhsJ0d2+hKrMb5rhXhWfhqiA84TclXxEmBjmPo090Wife0Y3gBjiAjX6UULoNshTj8VCfwlos83au2oEK1ZiS8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1720621048; c=relaxed/simple; bh=lbw2WXsXRPsNT/bVt3lXhVCgOtg+RehsBWVnvkYM8Ns=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=X8Oueecvi1PxvGC9sIBH3yTqLkMfnkba5Grw3xO8Tw6zlp3QmEywMmP7QLGzSnmIuEYx3jpvihm6sAgTHQlg72TaVFDyxgHgz4LA0+7KzwN+5Ai81+dssPQPgpE6l9dT71G366ujbAk7aN46q5z5Zc6/oR1a/fkuKXKWnQG36oM= 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 17:16:39 +0300 From: Roman Smirnov To: CC: Roman Smirnov Subject: [PATCH BlueZ v3 resend 5/6] player: fix the order of args in cmd_register_endpoint() Date: Wed, 10 Jul 2024 17:16:18 +0300 Message-ID: <20240710141621.64394-6-r.smirnov@omp.ru> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240710141621.64394-1-r.smirnov@omp.ru> References: <20240710141621.64394-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 13:54:49 X-KSE-AntiSpam-Status: KAS_STATUS_NOT_DETECTED X-KSE-AntiSpam-Method: none X-KSE-AntiSpam-Rate: 0 X-KSE-AntiSpam-Info: Lua profiles 186438 [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: omp.ru:7.1.1; d41d8cd98f00b204e9800998ecf8427e.com:7.1.1; 127.0.0.199:7.1.2 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 14:00:00 X-KSE-Antivirus-Interceptor-Info: scan successful X-KSE-Antivirus-Info: Clean, bases: 7/10/2024 12:34:00 PM X-KSE-Attachment-Filter-Triggered-Rules: Clean X-KSE-Attachment-Filter-Triggered-Filters: Clean X-KSE-BulkMessagesFiltering-Scan-Result: InTheLimit Based on the function prototype, ep->cid and ep->vid should be swapped. Found with the SVACE static analysis tool. --- V1 -> V3: the patch name has been shortened client/player.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client/player.c b/client/player.c index de4491b53..2480ed64b 100644 --- a/client/player.c +++ b/client/player.c @@ -3388,7 +3388,7 @@ static void cmd_register_endpoint(int argc, char *argv[]) if (strrchr(argv[2], ':')) { ep->codec = 0xff; - parse_vendor_codec(argv[2], &ep->cid, &ep->vid); + parse_vendor_codec(argv[2], &ep->vid, &ep->cid); ep->preset = new0(struct preset, 1); ep->preset->custom.name = strdup("custom"); ep->preset->default_preset = &ep->preset->custom; From patchwork Wed Jul 10 14:16:19 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Roman Smirnov X-Patchwork-Id: 812487 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 4891F193447 for ; Wed, 10 Jul 2024 14:17:28 +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=1720621053; cv=none; b=j3l275094tTn5ebhYD+xSP1CzX4XnFqcyhUWfQV1Y47hRFCmi3Defh/jzcLFahRnM9KfZgPOXwSEidnI+bnj1/IvMmferDygDV0qR304tK4dOzdTtj2oZH5SGvJXo+Js1d0aTtpqkIbFptN2uTaR4rNGoa3rmVNGik5eXl2NtSQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1720621053; c=relaxed/simple; bh=mafEJKnDZ7DA5KRnp0IGO8xmOH14m+HVbGvj9DHXA3I=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=HYZDu+YcyZ8MhAymcuPkWTtpIV5ya3NzMW7qHrFMtuQy77+WuAPM02cDaGBDnz8+/CUn8tsH40g05Erx/XxgAKBLWokChalfKljQsB+uGS1NBI7ySgcn+Wn2INGsFu0/3etttbOHjckFhUR+qj5XVetMjii1ut7O9rm1BnqRBpI= 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 17:16:40 +0300 From: Roman Smirnov To: CC: Roman Smirnov Subject: [PATCH BlueZ v3 resend 6/6] gatt-client: add NULL check to discover_secondary_cb() Date: Wed, 10 Jul 2024 17:16:19 +0300 Message-ID: <20240710141621.64394-7-r.smirnov@omp.ru> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240710141621.64394-1-r.smirnov@omp.ru> References: <20240710141621.64394-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 13:54:49 X-KSE-AntiSpam-Status: KAS_STATUS_NOT_DETECTED X-KSE-AntiSpam-Method: none X-KSE-AntiSpam-Rate: 0 X-KSE-AntiSpam-Info: Lua profiles 186438 [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: omp.ru:7.1.1; d41d8cd98f00b204e9800998ecf8427e.com:7.1.1; 127.0.0.199:7.1.2 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 14:00:00 X-KSE-Antivirus-Interceptor-Info: scan successful X-KSE-Antivirus-Info: Clean, bases: 7/10/2024 12:34: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 a NULL pointer. Found with the SVACE static analysis tool. --- V1 -> V3: the patch name has been shortened 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,