Date: Mon, 18 Oct 2021 13:18:55 GMT From: Mark Johnston <markj@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Subject: git: 35f1d655819e - stable/12 - geom_label: Fix the stable/12 build Message-ID: <202110181318.19IDItLQ000182@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch stable/12 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=35f1d655819e5d4d11ea1a11061f80e48e35f173 commit 35f1d655819e5d4d11ea1a11061f80e48e35f173 Author: Mark Johnston <markj@FreeBSD.org> AuthorDate: 2021-10-18 13:16:47 +0000 Commit: Mark Johnston <markj@FreeBSD.org> CommitDate: 2021-10-18 13:16:47 +0000 geom_label: Fix the stable/12 build MAXPHYS is a constant here, use the right name. This is a direct commit to stable/12. Fixes: 116a988f99cd ("geom_label: Add more validation for NTFS volume tasting") Reported by: Jenkins --- sys/geom/label/g_label_ntfs.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/geom/label/g_label_ntfs.c b/sys/geom/label/g_label_ntfs.c index bcf6a3a72b36..dad55f601e16 100644 --- a/sys/geom/label/g_label_ntfs.c +++ b/sys/geom/label/g_label_ntfs.c @@ -120,7 +120,7 @@ g_label_ntfs_taste(struct g_consumer *cp, char *label, size_t size) mftrecsz = bf->bf_mftrecsz; recsize = (mftrecsz > 0) ? (mftrecsz * bf->bf_bps * bf->bf_spc) : (1 << -mftrecsz); - if (recsize <= 0 || recsize > maxphys || recsize % pp->sectorsize != 0) + if (recsize <= 0 || recsize > MAXPHYS || recsize % pp->sectorsize != 0) goto done; voloff = bf->bf_mftcn * bf->bf_spc * bf->bf_bps +
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202110181318.19IDItLQ000182>