From nobody Fri Jul 7 18:52:20 2023 X-Original-To: dev-commits-src-branches@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 4QyMvm5d2Pz4lMC6; Fri, 7 Jul 2023 18:52:20 +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 4QyMvm5BSJz3P5D; Fri, 7 Jul 2023 18:52:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688755940; 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=k2nmsUgTiLXQiaofeGPTYo37MlhYo0DuLDUr5GmPdsY=; b=htnxhY88HTs6BsRz+8xrLwPsLAm8N6zQ2qHyqGg/vT/wHahL2kGPTmkXNutDcraoel+E9x 7i1inPE9bgY4ZkVyQHKu9u2zg8hTGJenYiPE5AkrUke2VXQ+qeLTJARjLDtFiVwmcowg4o bJCiZdaRcvKhpzAHaePNxS426CgH9IhWYvlZUuqAkR6zRNcy+lXypSZU2IsDco/4AtQGzg fNgjmkdrv/V3RXRr5efJLpQq3eA+Mv2K5qa5yJbkPiNflGuMMBHmf15e32yn/qVm241ccw kO4ug9ji0hJsJ/SGW7O0maUYrvzdKlxO8uIAnWnuGzjrst3hTKktJMnjEDcZyQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688755940; 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=k2nmsUgTiLXQiaofeGPTYo37MlhYo0DuLDUr5GmPdsY=; b=b7c+QvW1Ty+wPFyySG8nS0UKN4W+RWwrdGTjtHeuen7gNzI+uHtreLjWBw0tXUEr5Gu/ij RbKN+kVsu49XTCDfst6MVT6iXcwT9jMlPcxeTdyPJo0a+HxECY0xlIV/uHp26nP9NI+n+/ 5hDx3Mnz+bRj6dVbEBfyjvfvArPmQiqrXmCtvrsMg3aaPxRp7vruJkZtr6T+M+r+22fKtI lh0KLlJgKOgZ9ppZbGG5pzHalhBuyI2uQF0zIr/O6pzl+t6w4YS7VwBHkHRyzmPImzo0sR Whvj2C+JiQMxvtbWDt9uAT4DCtgrKjG0pk3uDiSPSHiK1EtVfj16I+qdv8JddQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1688755940; a=rsa-sha256; cv=none; b=g3GtGknlO6pM3yAaBWq3qVztWm788TNHDDWaKgzxS3NVDHoqZFFZhjoBMbFri2eDnxgWpv ReGDiWJ9IDnIqHDSmKWHkOg6+r106jH5/x/O8hoZSj1Ld7zhh6o+XttHxaisuUnxZ2566w vZmc4bIVPzxDQ0gmaRoKVKDnqSmKj9zYez5GmdMbaProKGyJHr6ZyDToX8WDDzKX4SXvNh X78MoLIxOcJ+F+DSIG8UWMQoHy8WQEDOGxnY5l/6eoeea5f1yY9tu35ov394u/VoZ7HejH i7zU2YPpz/WMWR3tajoSt6ke57R4ZX5VEDSyjSJnGItCRq9BPF5FIEgi+4ksZg== 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 4QyMvm4GrBzqRf; Fri, 7 Jul 2023 18:52:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 367IqKQ4009059; Fri, 7 Jul 2023 18:52:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 367IqKMn009058; Fri, 7 Jul 2023 18:52:20 GMT (envelope-from git) Date: Fri, 7 Jul 2023 18:52:20 GMT Message-Id: <202307071852.367IqKMn009058@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: e27e9b3ac329 - stable/13 - pseudofs: Fix a potential out-of-bounds access in pfs_lookup() List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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: e27e9b3ac329b8d01c0800de32c735b2363c8862 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=e27e9b3ac329b8d01c0800de32c735b2363c8862 commit e27e9b3ac329b8d01c0800de32c735b2363c8862 Author: Mark Johnston AuthorDate: 2023-06-23 13:54:39 +0000 Commit: Mark Johnston CommitDate: 2023-07-07 18:46:08 +0000 pseudofs: Fix a potential out-of-bounds access in pfs_lookup() pseudofs nodes store their name in a flexible array member, so the node allocation is sized using the length of the name, including a nul terminator. pfs_lookup() scans a directory of nodes, comparing names to find a match. The comparison was incorrect and assumed that all node names were at least as long as the name being looked up, which of course isn't true. I believe the bug is mostly harmless since it cannot result in false positive or negative matches from the lookup, but it triggers a KASAN check. Reported by: pho Reviewed by: kib, Olivier Certner MFC after: 2 weeks Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D40692 (cherry picked from commit fc915f1be145a52c53f6f1c37525043216e32bb8) --- sys/fs/pseudofs/pseudofs_vnops.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/fs/pseudofs/pseudofs_vnops.c b/sys/fs/pseudofs/pseudofs_vnops.c index e0c795ed2a25..5eccc7ac4b43 100644 --- a/sys/fs/pseudofs/pseudofs_vnops.c +++ b/sys/fs/pseudofs/pseudofs_vnops.c @@ -537,8 +537,8 @@ pfs_lookup(struct vop_cachedlookup_args *va) for (pn = pd->pn_nodes; pn != NULL; pn = pn->pn_next) if (pn->pn_type == pfstype_procdir) pdn = pn; - else if (pn->pn_name[namelen] == '\0' && - bcmp(pname, pn->pn_name, namelen) == 0) { + else if (strncmp(pname, pn->pn_name, namelen) == 0 && + pn->pn_name[namelen] == '\0') { pfs_unlock(pd); goto got_pnode; }