Received-SPF: pass (google.com: domain of linux-bluetooth-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
From:   Nitin Jadhav <nitin.jadhav@nxp.com>
To:     linux-bluetooth@vger.kernel.org
Cc:     devyani.godbole@nxp.com, pav@iki.fi, luiz.dentz@gmail.com,
        sathish.narasimman@intel.com, nitin.jadhav@nxp.com
Subject: [PATCH BlueZ v4 2/3] shared/vcp: Fix issues of audio location and descriptor
Date:   Tue, 25 Jul 2023 16:47:41 +0300
Message-Id: <20230725134742.51651-3-nitin.jadhav@nxp.com>
In-Reply-To: <20230725134742.51651-1-nitin.jadhav@nxp.com>
References: <20230725134742.51651-1-nitin.jadhav@nxp.com>
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?VW0avO5IPglbChi8KxnZKAmK5cH4cMupA483fqdWW2pXHYxIlsJFchQ1d7Nd?=
 =?us-ascii?Q?iha2ped0sllX7N/M/Ar/i68DcPy7XaZorP5L1xXl347d2R0u1XRKSxWEl+qj?=
 =?us-ascii?Q?Qt0SvDOoacqp/rdBcxpMwpFa8Ei/jsTev1J5duwQ+8izj4SxyQp6dsTJVLqI?=
 =?us-ascii?Q?zYoJtQcq8oUpl18snsDNDh02F2uW8BHin/BZrjqr62XxbXP3pjZiqC/jlwjo?=
 =?us-ascii?Q?qQLnDpqiN51PPTwhQW6kptJOdQ8uw6TKEQULpMmncaD1bNUw+1peJPFHkMPh?=
 =?us-ascii?Q?sOechY/X3FvNHhVVqX/I6Q38SZ3LnGO7AmhFa8jUiQ+4EdvDaY40eejbket4?=
 =?us-ascii?Q?+QhZwLltDmqU5NkWC5LQMQ2I6PfvpBCNK3EfvZhXv/G8iA0r9l2j20sZJe10?=
 =?us-ascii?Q?9rqODf69E3UvmdtZDmxJXxecOEuvSy8f5cuvCL3thWRsZGUInjmzVUDIFJ5Z?=
 =?us-ascii?Q?IQ96g4rqKkbzSaRG79DXAEvFzhlhmEzehk/eaS7GAKYxL+iYMAK415yz8Dj/?=
 =?us-ascii?Q?f4Pz7GXwQkZql7QcUpdeujOUZR09Y8RhH77BdN7MMrUmUYJtHK13hEsAKYv1?=
 =?us-ascii?Q?y4mLWIxZQSn/cQ4+Lf6jn0GeuDPorcIbQlP+r292uQatJxxZR+4/7I7YA45s?=
 =?us-ascii?Q?jM3qggGo5n2vhSak7os8TA0SYZNPUfsBvSrVT1kcEysoUbTHTGs45NslY41D?=
 =?us-ascii?Q?AE/TR+Rm05cMB0BlKZjLODY165suplgrnS76CXRVMk2yi6yF2ZPbAQxfjgeS?=
 =?us-ascii?Q?Wh5KQIhjxUR+LYlmL5zIgKGbMqkT8PaPtJP0JjKki+RUIWciAKD7T61DrAqU?=
 =?us-ascii?Q?Cawec4YsMEEYM1JsOWnTadpmOpotm+ejXJ2MZptYhWh8vTocYgz3mB/6EdeQ?=
 =?us-ascii?Q?3KzXV4wvZ5bimehX9QuT7yafRqtWLFuJoz5JPXlB/E3jNZ3XAVtBa/hlUI+O?=
 =?us-ascii?Q?cd7TEuGyrfObI9lBIkpKNTv3LZsJRlyPFLTiZIpApDFUPRfixy7orEObAzHV?=
 =?us-ascii?Q?gUmgw0UeE6RS/MrS/vayn415niBZWTEX1n95fMTsoKcqo5OkDkmX0B8aYV+C?=
 =?us-ascii?Q?UOu9SFdd64RSehhukBnC8n30IuqW/6p2tPcaHjIuGF6yVTiXopDRikJZ6+Sc?=
 =?us-ascii?Q?HwHxryhIHHt3QSn+DDK6tFUa8gw8oiCogLV5v1SkmNcVukP+nS7N9nEgorqE?=
 =?us-ascii?Q?F9dnnhpvDo5OlQrHW7KEYTwCOFsDCrVGFnX/Vob+jq9aQ34hDfaTq4Vhn2GU?=
 =?us-ascii?Q?57j6n7vdAIeO+zjV8fQoXmwxQdyYbNRYWvDH7f8AHcwy/aLhlbkfimUhwsqq?=
 =?us-ascii?Q?Zx/9nkpH7Iolo31IltTbIiPcDeYcoCtZuTpGgCdZu4oBDQmvF/wCdmEAYgva?=
 =?us-ascii?Q?ZS+fRt1wvrtUqFAJDsoBZg81Z9BWEylA+ox9bEet98IZFTOGDwmdsAXEn89O?=
 =?us-ascii?Q?lMy5RFeDnQI3bx02xNXWwx1pCjuIZlKmFrFo6IIQNbwlQ0OhDuf9FmsroF5N?=
 =?us-ascii?Q?o++jFLeT1FJC2N95RFIE5r/PyMWus0iF88dVv2w6vFnIp+LTbChFOTjymJfk?=
 =?us-ascii?Q?2xT/4Zi57wrw1wXU9c2b8P524CCp5KHei6l12W/A?=
X-OriginatorOrg: nxp.com
X-MS-Exchange-CrossTenant-Network-Message-Id: e28c3f0a-9f80-4b84-db35-08db8d15c7ae
X-MS-Exchange-CrossTenant-AuthSource: AS8PR04MB9126.eurprd04.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 Jul 2023 13:48:08.7874
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: qhMPz0D+kN5oNEaKQEwbdJEatsEMwGLX8+TES9SzKxZ3/FlLKd3RBfbljxbx3lPYlsWtB6VBBmvOsd0lCQPlCw==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: PAXPR04MB9593
X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED,
        DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE,
        RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,SPF_PASS,T_SCC_BODY_TEXT_LINE,
        URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on
        lindbergh.monkeyblade.net
Precedence: bulk
List-ID: <linux-bluetooth.vger.kernel.org>
X-Mailing-List: linux-bluetooth@vger.kernel.org

Issues
- Audio output descriptor & location read functions requires code
correction.
- During reading audio location descriptor value was checked
instead of the pointer. DBG statement wrongly accessed value
to print the log that caused the crash.

Fix
- Corrected audio output descriptor read variable
- Corrected the audio location debug printing function
- Allocated the memory as a char pointer to the audio descriptor variable.
- Corrected the audio descriptor pointer checking condition
---
 src/shared/vcp.c | 41 ++++++++++++++++++++++-------------------
 1 file changed, 22 insertions(+), 19 deletions(-)

diff --git a/src/shared/vcp.c b/src/shared/vcp.c
index 314618664..0408531b2 100644
--- a/src/shared/vcp.c
+++ b/src/shared/vcp.c
@@ -973,7 +973,7 @@ static void vocs_voaodec_read(struct gatt_db_attribute *attrib,
 	struct bt_vocs *vocs = user_data;
 	struct iovec iov;
 
-	iov.iov_base = &vocs->vocs_ao_dec;
+	iov.iov_base = vocs->vocs_ao_dec;
 	iov.iov_len = strlen(vocs->vocs_ao_dec);
 
 	gatt_db_attribute_read_result(attrib, id, 0, iov.iov_base,
@@ -1385,11 +1385,12 @@ static void read_vocs_audio_location(struct bt_vcp *vcp, bool success,
 				     const uint8_t *value, uint16_t length,
 				     void *user_data)
 {
-	uint32_t *vocs_audio_loc;
-	struct iovec iov = {
-		.iov_base = (void *) value,
-		.iov_len = length,
-	};
+	uint32_t vocs_audio_loc;
+
+	if (!value) {
+		DBG(vcp, "Unable to get VOCS Audio Location");
+		return;
+	}
 
 	if (!success) {
 		DBG(vcp, "Unable to read VOCS Audio Location: error 0x%02x",
@@ -1397,13 +1398,9 @@ static void read_vocs_audio_location(struct bt_vcp *vcp, bool success,
 		return;
 	}
 
-	vocs_audio_loc = iov_pull_mem(&iov, sizeof(uint32_t));
-	if (!*vocs_audio_loc) {
-		DBG(vcp, "Unable to get VOCS Audio Location");
-		return;
-	}
+	memcpy(&vocs_audio_loc, value, length);
 
-	DBG(vcp, "VOCS Audio Loc:%x", *vocs_audio_loc);
+	DBG(vcp, "VOCS Audio Loc: %x", vocs_audio_loc);
 }
 
 
@@ -1413,10 +1410,11 @@ static void read_vocs_audio_descriptor(struct bt_vcp *vcp, bool success,
 				       void *user_data)
 {
 	char *vocs_ao_dec_r;
-	struct iovec iov = {
-		.iov_base = (void *) value,
-		.iov_len = length,
-	};
+
+	if (!value) {
+		DBG(vcp, "Unable to get VOCS Audio Location");
+		return;
+	}
 
 	if (!success) {
 		DBG(vcp, "Unable to read VOCS Audio Descriptor: error 0x%02x",
@@ -1424,13 +1422,18 @@ static void read_vocs_audio_descriptor(struct bt_vcp *vcp, bool success,
 		return;
 	}
 
-	vocs_ao_dec_r = iov_pull_mem(&iov, length);
-	if (!*vocs_ao_dec_r) {
+	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;
 	}
 
-	DBG(vcp, "VOCS Audio Descriptor:%s", *vocs_ao_dec_r);
+	DBG(vcp, "VOCS Audio Descriptor: %s", vocs_ao_dec_r);
+	free(vocs_ao_dec_r);
+	vocs_ao_dec_r = NULL;
 }
 
 static void vcp_pending_destroy(void *data)
-- 
2.34.1