From nobody Fri Aug 4 22:49:44 2023 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 4RHgrm6NcSz4mBTB; Fri, 4 Aug 2023 22:49:44 +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 4RHgrm5t63z3G1G; Fri, 4 Aug 2023 22:49:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691189384; 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=annsLJQc/4dGEjIZt6xR+HF/rbhMsh2VF4forxkvhAM=; b=ZRiWLmLas7QKlu5mzMD+Rss+vyJYs5y9LZfoucOoaHEj9IWw72zHJ7hPdKaaWzLALDCufb Dzg/4eW4bfNbWrgdE9F3Q9ZGLaBXuOWm4mc5PCrh/LRtrYkWABFWy+a2chYxCSXW6vr5l7 iQZa07LfbJTZ+l6MuPXw5w+wRkZgiNbLzHq0tmMjAgOetW5cP9+YcvO9wfldXOASl7G1N7 x8Kr22LFV5S7n+4+SXqc9wwmSbjhO1mC5mN48i11L+n89Z3gVzOQbHyCo7WTeLpR4DtZIG ORny3KpX1R6/UtoRw71ZmUHsxYJIAaSclafiW5+Bwc20Epr9t2ZlOn0Sl+VMuw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691189384; 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=annsLJQc/4dGEjIZt6xR+HF/rbhMsh2VF4forxkvhAM=; b=FpOcbcc/ARMoORWnYo7vC16i9/433Qpt6Gc598rW/W1XGKKtof1qwstyP6ktcLBYx69LLU UYp/oN4AHKNRWHlhWEosBnaZ6J+HOEKCLLdxSBduA1eRzcJQ4bDPmxSuPCkRODocxKKaMM PZvS4mkKLP6jKFKm1PCFDZJV71IiwSi4cvjx/rmsw3iIHUy4nFOhA+E9893P3EW4vWCbuY FbJk5TLwyQ+pUsbYDHWY83ci9gQwmAr8mfj050b1KteZdICynf4zUQxCRQKkW3zVOZZOqW PPYXEfLZPNtpgXnfG7wr7L0FAA0EEauXu3jUG2fTC/awqnd3Zspai+E9o0nvPw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691189384; a=rsa-sha256; cv=none; b=EQoroBaOa0OcvCpvHFSK73n6CcjnA6Ia4+yQtUIn2g7ALJMbtdbO6r9n1a6U7T9utrtyQL VMP1xxxjV57w0qQ0afrdENTWyXdDiEXPVbQNEvwNMWCdFO+dUA7BFYOlGHKtXCKEaq9aI5 9ACw4/bRZMDsyrXK0/xy3a9ggYTcrULUPXySNYsdUg7iLKtYFqwHRQuFaAoPJ2j9CzOoYQ sOkUOwSaYKdGKqXHtdFhJWSSB+AuVzzhPmnEesLuLgxHWrLYMgvflo9hbUhH+4nFvcc7mC YVM/smShFMpeuvJocLqGvgfHKergnYWJ/yi4DaAaxXwYI4x//LDVLQQe+fgt2w== 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 4RHgrm4ppWz1K7r; Fri, 4 Aug 2023 22:49:44 +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 374MnitT060237; Fri, 4 Aug 2023 22:49:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 374Mnieb060236; Fri, 4 Aug 2023 22:49:44 GMT (envelope-from git) Date: Fri, 4 Aug 2023 22:49:44 GMT Message-Id: <202308042249.374Mnieb060236@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: 9e6941a2c7a3 - main - udf: reject invalid block sizes from lvd 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: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 9e6941a2c7a393aefe6a123952c6eacbc23098a6 Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=9e6941a2c7a393aefe6a123952c6eacbc23098a6 commit 9e6941a2c7a393aefe6a123952c6eacbc23098a6 Author: Konstantin Belousov AuthorDate: 2023-08-04 22:47:09 +0000 Commit: Konstantin Belousov CommitDate: 2023-08-04 22:49:36 +0000 udf: reject invalid block sizes from lvd PR: 272893 Reported by: Robert Morris Sponsored by: The FreeBSD Foundation MFC after: 1 week --- sys/fs/udf/udf_vfsops.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/sys/fs/udf/udf_vfsops.c b/sys/fs/udf/udf_vfsops.c index 0b028718085a..a8aa811a0d6c 100644 --- a/sys/fs/udf/udf_vfsops.c +++ b/sys/fs/udf/udf_vfsops.c @@ -413,6 +413,11 @@ udf_mountfs(struct vnode *devvp, struct mount *mp) lvd = (struct logvol_desc *)bp->b_data; if (!udf_checktag(&lvd->tag, TAGID_LOGVOL)) { udfmp->bsize = le32toh(lvd->lb_size); + if (udfmp->bsize < 0 || udfmp->bsize > maxbcachebuf) { + printf("lvd block size %d\n", udfmp->bsize); + error = EINVAL; + goto bail; + } udfmp->bmask = udfmp->bsize - 1; udfmp->bshift = ffs(udfmp->bsize) - 1; fsd_part = le16toh(lvd->_lvd_use.fsd_loc.loc.part_num);