Received: by 2002:a05:7412:8521:b0:e2:908c:2ebd with SMTP id t33csp672904rdf; Fri, 3 Nov 2023 11:22:07 -0700 (PDT) X-Google-Smtp-Source: AGHT+IE9vUbDknSMgNZbVszp+tBR4Jnv+x4TCSSrRyEyLg/UTyzYZpYj1bPL0BMXcer+B/mDKKju X-Received: by 2002:a17:902:d4cf:b0:1c0:b84d:3f73 with SMTP id o15-20020a170902d4cf00b001c0b84d3f73mr23223894plg.53.1699035727214; Fri, 03 Nov 2023 11:22:07 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1699035727; cv=none; d=google.com; s=arc-20160816; b=UWMlP3qLmjq8sGm4FvkRvZInd2I9DJZiA2a/9LRoRbXYnDK6q4pCnBnQiLb1iw+H9/ 6fLUOqj8uVfWk3+s6uNA0L5WNNO4rV8G3f/r6lGrtiVGKV8h8nYkqyw/Si8QlBTTYYdz Wtd3Z6igmOHdOE5m2bqZcf0ORilhkQZHkfVDYLahLQ3w3SAXnY0m9ucmnkoCdVLZZ02T NKBOs+sXexrcnBB5y9a6C13fiLFsKw5NCd3svH5namdgB/OXMSwRMtlO/FmNZ9OtZRWs EQdqXdHrtg9EkKdTrnyv+iDx6Rcgzp6whi7dSAUA45kZu8+DU43+IGbvlsJVjaS6rKVL RhPw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=1+hy4F2QJY5OAoFJw0fLmnoBVUonHl0KAwvPvfYnHzI=; fh=q933pV6NrxIrJEaTU4dblERPskhjd3MnawLueTVokpc=; b=JymNCV1YWcccMlqnZb4XnlM9GD96kBB6mudyzorGaQQU1dTHj8UZa/VjgRvCrXu0ph Wz8jwStwy0co6lUi5UhZHQP40B0kCmI+lRJwmfx+pp/LscAZJD9LbSSrkldQfaDKKc0F tRt54auNR9040sBunIcyF6tWhC/kVjSaNxuUsu1+bCiN9tWaFeeLVVpvB2NSlY1/Gt4/ bhxqtrD1g1M1LaGhg0aCyJGbgSv8PfIlxnmSDXSNG5j9oBJhXCNp5ILr33zmRm3/qGr8 r8lE7AhOXHbUQmdsWuMbIN5Z/u53Z43dZ9ACGsAMGy8njoVYis00sfL+ek/Q8FXMPJl1 eCtQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-bluetooth-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) smtp.mailfrom=linux-bluetooth-owner@vger.kernel.org Return-Path: Received: from snail.vger.email (snail.vger.email. [2620:137:e000::3:7]) by mx.google.com with ESMTPS id 6-20020a170902c10600b001ca24970584si1934516pli.572.2023.11.03.11.22.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 03 Nov 2023 11:22:07 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-bluetooth-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) client-ip=2620:137:e000::3:7; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-bluetooth-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) smtp.mailfrom=linux-bluetooth-owner@vger.kernel.org Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by snail.vger.email (Postfix) with ESMTP id F0AF380527E5; Fri, 3 Nov 2023 11:22:05 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at snail.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230197AbjKCSWG (ORCPT + 99 others); Fri, 3 Nov 2023 14:22:06 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57188 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233756AbjKCSWF (ORCPT ); Fri, 3 Nov 2023 14:22:05 -0400 Received: from mout-p-202.mailbox.org (mout-p-202.mailbox.org [80.241.56.172]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7D180CF for ; Fri, 3 Nov 2023 11:22:02 -0700 (PDT) Received: from smtp1.mailbox.org (smtp1.mailbox.org [10.196.197.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mout-p-202.mailbox.org (Postfix) with ESMTPS id 4SMTbq2vsdz9t1c; Fri, 3 Nov 2023 19:21:59 +0100 (CET) From: =?UTF-8?q?Jonas=20Dre=C3=9Fler?= To: linux-bluetooth@vger.kernel.org Cc: zbrown@gnome.org, =?UTF-8?q?Jonas=20Dre=C3=9Fler?= Subject: [PATCH BlueZ 2/4] lib/sdp: Don't assume uint8_t has size 1 Date: Fri, 3 Nov 2023 19:21:48 +0100 Message-ID: <20231103182150.60088-3-verdre@v0yd.nl> In-Reply-To: <20231103182150.60088-1-verdre@v0yd.nl> References: <20231103182150.60088-1-verdre@v0yd.nl> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_BLOCKED,SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE 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: X-Mailing-List: linux-bluetooth@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (snail.vger.email [0.0.0.0]); Fri, 03 Nov 2023 11:22:06 -0700 (PDT) Assuming the size of of uint8_t is bad practice, we use sizeof(uint8_t) everywhere else and the use of sizeof makes it clear we're accounting for the descriptor here rather than just randomly subtracting 1, so change that. Co-developed-by: Zander Brown --- lib/sdp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/sdp.c b/lib/sdp.c index 1565259a3..006ab057a 100644 --- a/lib/sdp.c +++ b/lib/sdp.c @@ -1505,7 +1505,7 @@ static void *sdp_data_value(sdp_data_t *data, uint32_t *len) case SDP_TEXT_STR32: val = data->val.str; if (len) - *len = data->unitSize - 1; + *len = data->unitSize - sizeof(uint8_t); break; case SDP_ALT8: case SDP_ALT16: -- 2.41.0