From nobody Fri Aug 4 23:43:06 2023 X-Original-To: dev-commits-src-main@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 4RHj2L6Vgnz4mFmR; Fri, 4 Aug 2023 23:43:06 +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 4RHj2L62s6z3LcD; Fri, 4 Aug 2023 23:43:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691192586; 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=/m/w5dM5LwH1QwwY0aQWOSOGtb1kka2gO+ljux6CKSo=; b=ITrasczvZ6wk1RaWZVrs2MMw6sWEECn1eJ1OUm7c4ZVKsSAhaHxwk7ynvCfp99MgwxXJtH V4/yyhWsn9b8QlaqBKr3W7zL6boSaCILtIpLigIBvnL8U6m9UKTshXHvLPQrzNKimeimPL obIKLV1ELFUxuPCGQklTmscfErRThkIbSkNxLK7S8YMbYO41O/IslMYBRQRUjRSogCeePR 1Y7e5LEK7Dl4X/cOK5/gSlnPSZ6LH/Nm0X+3H7QIhahoMenEdDdmVS4yASwHI/YQO8Fupi eoPV9B06rFs7PQ8aXFJxIHtQJnmtjvRYq1PkUk+ZFUBVz1vQW05IKxP9f1GKRg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691192586; 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=/m/w5dM5LwH1QwwY0aQWOSOGtb1kka2gO+ljux6CKSo=; b=jiGtzINq5w/HmYrN9VSj3HpQC1balYZEYr3BPzJ6ivlRS8m6AGiUR21zyiTgSIWKWZN2cF 6IWlLCg9rMuQnfpckMA0KMZ+HbPB0wPvVBr/uBmXO9jIxNajI6nI8JI+YTqwigLX0ucGxN ZICBEXCOyE/nN99ITfkBSO3RQC50KJ+Hh43bjk8nqLsrggzWB37mJqvzj4IP37vQ3yQrs2 K3RZY6T0anC3j6uVVOjW2gihVaajnmwX6o+/Yklb0xiQL3qbWG8beJ/ccPCiaroAUySHOY senXB19i+rWNLrpRZSPdSxkq4+AUWSIDOg/fhw3sVKKzW2K66qge86jokoB2EQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691192586; a=rsa-sha256; cv=none; b=Ew/iKeF2Lufsg+Q2ziSKzaSHCaL+Zi1hli+/ZurxX312t58yCTg4qZnbQfZgGQl/QDioHd qeMdwvuLxJoIcVNBI3GnvJu35RcB7jAzDtF+2csx+pbNH6psdDv2fWo9NjIG7AeUOWQvnW FBXJXQMDC+KtD7q1gNjo4Loe5c77lJmLZ7iRYywo9JQpPXz3SwbscyXcxLK584Jpa9K1bQ V37iD8gQ360Y8keW1oDdbv0bLGbpT+7d+GFCz2HLnSLTq4hBz987yxchxTCyjpKUBTgDSZ kem4/GEYvYtPlVrZukDlfRh8RkrUS0vViuXyembcMlHyhXDRKhlJjC3zgLTgdg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4RHj2L55c9z1Lr6; Fri, 4 Aug 2023 23:43:06 +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 374Nh6sa059163; Fri, 4 Aug 2023 23:43:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 374Nh69b059162; Fri, 4 Aug 2023 23:43:06 GMT (envelope-from git) Date: Fri, 4 Aug 2023 23:43:06 GMT Message-Id: <202308042343.374Nh69b059162@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: c70e615051b0 - main - udf: Reject read requests with an invalid length List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c70e615051b00671d54651d99af5cdec4b091d92 Auto-Submitted: auto-generated The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=c70e615051b00671d54651d99af5cdec4b091d92 commit c70e615051b00671d54651d99af5cdec4b091d92 Author: John Baldwin AuthorDate: 2023-08-04 23:40:19 +0000 Commit: John Baldwin CommitDate: 2023-08-04 23:40:19 +0000 udf: Reject read requests with an invalid length - If the size is negative or if rounding it up to a multiple of the block size overflows, fail the read request with ERANGE. - While here, add a sanity check that the ICB length for the root directory is at least as long as a minimum-sized file entry. PR: 257768 Reported by: Robert Morris MFC after: 1 week Sponsored by: FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D41220 --- sys/fs/udf/udf.h | 4 +++- sys/fs/udf/udf_vfsops.c | 5 +++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/sys/fs/udf/udf.h b/sys/fs/udf/udf.h index b210427a63d7..8500088ec9b7 100644 --- a/sys/fs/udf/udf.h +++ b/sys/fs/udf/udf.h @@ -97,8 +97,10 @@ struct ifid { MALLOC_DECLARE(M_UDFFENTRY); static __inline int -udf_readdevblks(struct udf_mnt *udfmp, int sector, int size, struct buf **bp) +udf_readdevblks(struct udf_mnt *udfmp, daddr_t sector, int size, struct buf **bp) { + if (size < 0 || size + udfmp->bmask < size) + return (ERANGE); return (RDSECTOR(udfmp->im_devvp, sector, (size + udfmp->bmask) & ~udfmp->bmask, bp)); } diff --git a/sys/fs/udf/udf_vfsops.c b/sys/fs/udf/udf_vfsops.c index a8aa811a0d6c..b0a221df6391 100644 --- a/sys/fs/udf/udf_vfsops.c +++ b/sys/fs/udf/udf_vfsops.c @@ -482,6 +482,11 @@ udf_mountfs(struct vnode *devvp, struct mount *mp) */ sector = le32toh(udfmp->root_icb.loc.lb_num) + udfmp->part_start; size = le32toh(udfmp->root_icb.len); + if (size < UDF_FENTRY_SIZE) { + printf("Invalid root directory file entry length %u\n", + size); + goto bail; + } if ((error = udf_readdevblks(udfmp, sector, size, &bp)) != 0) { printf("Cannot read sector %d\n", sector); goto bail;