From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: passt.top; dmarc=none (p=none dis=none) header.from=gibson.dropbear.id.au Authentication-Results: passt.top; dkim=pass (2048-bit key; secure) header.d=gibson.dropbear.id.au header.i=@gibson.dropbear.id.au header.a=rsa-sha256 header.s=202502 header.b=hILRyFrC; dkim-atps=neutral Received: from mail.ozlabs.org (mail.ozlabs.org [IPv6:2404:9400:2221:ea00::3]) by passt.top (Postfix) with ESMTPS id 265965A077D for ; Mon, 17 Mar 2025 11:02:26 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gibson.dropbear.id.au; s=202502; t=1742205731; bh=SDm6pib3b3AM3mVJpYUsRvzhROa1vdnN0lNBa/DZ3vk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=hILRyFrCcLmCYHuqIBiJ64yHFtELNDqyfQlno6R2L/Ky7+Hpo9JNTfT1PG0dAao7r 8MB4BFJtgyOBOMpvvNp19LbP9Zkbg5VYaewHM5GVsIpavo/SgxwRTbIUxk/huIXUMy uTD/QhW2Xxd1DXpdPAWn7pS619IeLyWdmX4zqKU8gVR9HPQyA3fZ26pGESvf0Mf3kY fsi7qbNIqk542Zrk0WmX99g16odI+0ENIQkUCsEz4JMEK8LybbSqA8BCyNCoe3kUC3 w9ZtdhLKYxFke+hhtGwJMKMmD8lVeaMef4UFeI8wRbUdxT+iZr6mOfTW/vIp64E+yW Jf0BP3bskoiJA== Received: by gandalf.ozlabs.org (Postfix, from userid 1007) id 4ZGVrM6JGtz4xCp; Mon, 17 Mar 2025 21:02:11 +1100 (AEDT) From: David Gibson To: passt-dev@passt.top, Stefano Brivio Subject: [PATCH v2 07/11] packet: Move checks against PACKET_MAX_LEN to packet_check_range() Date: Mon, 17 Mar 2025 20:24:20 +1100 Message-ID: <20250317092424.1461719-8-david@gibson.dropbear.id.au> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250317092424.1461719-1-david@gibson.dropbear.id.au> References: <20250317092424.1461719-1-david@gibson.dropbear.id.au> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Message-ID-Hash: JYWCIZE4JJOZM7MUZGMBLD2R57YBBHTU X-Message-ID-Hash: JYWCIZE4JJOZM7MUZGMBLD2R57YBBHTU X-MailFrom: dgibson@gandalf.ozlabs.org X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header CC: David Gibson X-Mailman-Version: 3.3.8 Precedence: list List-Id: Development discussion and patches for passt Archived-At: Archived-At: List-Archive: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: Both the callers of packet_check_range() separately verify that the given length does not exceed PACKET_MAX_LEN. Fold that check into packet_check_range() instead. Signed-off-by: David Gibson --- packet.c | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-) diff --git a/packet.c b/packet.c index fdc4be76..7cbe95da 100644 --- a/packet.c +++ b/packet.c @@ -35,6 +35,12 @@ static int packet_check_range(const struct pool *p, const char *ptr, size_t len, const char *func, int line) { + if (len > PACKET_MAX_LEN) { + trace("packet range length %zu (max %zu), %s:%i", + len, PACKET_MAX_LEN, func, line); + return -1; + } + if (p->buf_size == 0) { int ret; @@ -100,11 +106,6 @@ void packet_add_do(struct pool *p, size_t len, const char *start, if (packet_check_range(p, start, len, func, line)) return; - if (len > PACKET_MAX_LEN) { - trace("add packet length %zu, %s:%i", len, func, line); - return; - } - p->pkt[idx].iov_base = (void *)start; p->pkt[idx].iov_len = len; @@ -136,14 +137,6 @@ void *packet_get_do(const struct pool *p, size_t idx, size_t offset, return NULL; } - if (len > PACKET_MAX_LEN) { - if (func) { - trace("packet data length %zu, %s:%i", - len, func, line); - } - return NULL; - } - if (offset > p->pkt[idx].iov_len || len > (p->pkt[idx].iov_len - offset)) { if (func) { -- 2.48.1