From nobody Tue Aug 09 13:33:43 2022 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4M2DYM352yz4Z3fJ; Tue, 9 Aug 2022 13:33:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (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 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4M2DYM2Yjcz3ylK; Tue, 9 Aug 2022 13:33:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1660052023; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9EmkZKQRsL/obF+eyyF/cNgDzVzKXzdejxodqKpx1GY=; b=s92W69+3S/61cn2/23SM8F5pM8OU7gZk/jZuC3FcONXDRgIKc9jvDxqD7oLiKIcuyCf3YB 89pHd/C4BP5ecqx2VaWUukSKBj4R+eZzVYPwLhs1BuZJXf0SPzy1E8L4d0Jtu8ytr8I+GU 9nomglw7514LUxsujAc8ES++LG2BgoDZMNky7cflhq5d2e9n5tmavyI2UOLTElaH+dFFpe xWvmifaqh+wNBxl9ml1DAvKxf/ew3oiJj3DlLmQqeWTJ5xSQrspsTbhP9KLJM5wW4MRgz/ pMwkmY1k/3cUmAf+ndbIqWEshlCZJ68c6doNe6ooXwNH0h5hAUI9NHIzz6vPPw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4M2DYM1cPXzYpk; Tue, 9 Aug 2022 13:33:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 279DXhFE003602; Tue, 9 Aug 2022 13:33:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 279DXhPA003601; Tue, 9 Aug 2022 13:33:43 GMT (envelope-from git) Date: Tue, 9 Aug 2022 13:33:43 GMT Message-Id: <202208091333.279DXhPA003601@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: c536045c51da - stable/13 - lib9p: Remove potential buffer overwrite in l9p_puqids() List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: c536045c51da78a85138e963d3b7e13a547713c9 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1660052023; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9EmkZKQRsL/obF+eyyF/cNgDzVzKXzdejxodqKpx1GY=; b=PAF2gClOuLnevOSLbLukx9KvqPwjt0XbvJpO7oI2jPkAvmGxZKockFJPIwmG6j4av5QZb+ 5Z75+UylY7G1Xr9Z0c09m/DkApNGO8VYkmaPXaEFEZ6YlHxLcQR2s0cp0eFT1vB6uKcD3o jvmj1HfP4k+36/nCHYr5iEVEZ4Td8hcB25oW1hNXODAaag3VW2WY3hNHIp9i6VHLZrv+ua akU7VLyfkYq73/ZpqGw5UYcc3qkhcTs6wLlNTdFXGZr7ElHDxlOYo5k6rerzGuAVVuQGnI XtUSJWRO9xc64GcX/yFO0wo49t0OR5Y5Oy5Sc81JvPxhGF4CnJOVkeEs/wp5tg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1660052023; a=rsa-sha256; cv=none; b=lQIoJrpZdrvwLnuVSjeIHbfGVjeGAbAyBIhuX7eh70aoyvUcsr8pAYTYEqfgOlIUFmtND7 bliKiQg/yxkmA9ZzSvBIujuZgJfY/41qSlESMlpcJMd/TABcp7yS5Ll8LV41Sc/smU3o6h vA21Lw2T75hYjoHA/MhKwvMtA7gjSx2XeoN21zFBWA7qPaZybB28s1kVCENy/gMQlvUU20 59JYfY532t2PS3n/K9KojbUdg7OYwMSqk6LD7r84DPOGu0kEV4fssH4dyg+Li1tsHOuB3y TXzm2XQr0aPJfhWOcrIwFvV7lkJSe5fpZcKeR+zJmApP8yhDhddpWGEO9A77zQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=c536045c51da78a85138e963d3b7e13a547713c9 commit c536045c51da78a85138e963d3b7e13a547713c9 Author: Konrad Sewiłło-Jopek AuthorDate: 2022-08-08 16:25:48 +0000 Commit: Mark Johnston CommitDate: 2022-08-09 13:33:14 +0000 lib9p: Remove potential buffer overwrite in l9p_puqids() Structure l9p_f_wralk reserves at most L9P_MAX_WELEM entries and that number actually set the maximum we can safely use. PR: 265385 Reviewed by: markj (cherry picked from commit 2dd83b3f0507fc7bc64b908fb88f285a3b9663c8) --- contrib/lib9p/pack.c | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/contrib/lib9p/pack.c b/contrib/lib9p/pack.c index 88f0ccb4ad73..cf0ae9111b76 100644 --- a/contrib/lib9p/pack.c +++ b/contrib/lib9p/pack.c @@ -343,13 +343,17 @@ l9p_puqids(struct l9p_message *msg, uint16_t *num, struct l9p_qid *qids) ssize_t ret, r; r = l9p_pu16(msg, num); - if (r > 0) { - for (i = 0, lim = *num; i < lim; i++) { - ret = l9p_puqid(msg, &qids[i]); - if (ret < 0) - return (-1); - r += ret; - } + if (r <= 0) + return (r); + + if (*num > L9P_MAX_WELEM) + return (-1); + + for (i = 0, lim = *num; i < lim; i++) { + ret = l9p_puqid(msg, &qids[i]); + if (ret < 0) + return (-1); + r += ret; } return (r); }