From nobody Sun Apr 20 19:30:58 2025 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 4Zgdry6y9Rz5tXWS; Sun, 20 Apr 2025 19:30:58 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Zgdry55D6z3Zqp; Sun, 20 Apr 2025 19:30:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1745177458; 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=2Y5EtuNGgFT0SkViVo4fbrQZDL7VKhNUS5CB6VjDLAU=; b=U+18oMvKNXnoJSAIBsgDFOCA6wC9eATlw/csT1PPV+C4omiCu2wLfAbLELOomUbrcTc3DN S63G1OYd3WlXunWpWocq2ucxAU/oOSNeCPFuSw1ooRKqWvFeh1q+8XnVg0TRkBB4quj1kq Rz4K29NcvBAStNb2+iWczcAg87ZEUm5mqeGLpEfxjbyxsWKxEZ9rtYqNowo/u6mWme11jx Gv5/UuEYtNtiUhQsYCnMPa5ZY1VkM4a7m3CmJjNk6oNoATn936mOKKDEYdjyLoSayKjY7/ ZGLZ5pf+5TLsRnPYZZ2m91EMYeCb/NnliYTF0migDQ2Mhk5VzvYcFXPhf4I6UA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1745177458; a=rsa-sha256; cv=none; b=ic92GOcXpvzS6ST8/lUnccYAjB/DocXr9aY0mf4+3MV54tmFekTJd6hnAEhjGme2XTcHjm fkvhAE0Q/YBdgAYbMj39zk0bPq54DGM5e2/ns2+aRwUsjFPHscvTjmcBUgvmp6kzZsqu8r hsd3okx/ELgl0oxFZ8zyZht15TdRZiwzC70VflRYMaPktBYa3CvKzL+1UQpghUAleABalQ 2cxH9k8uv8WWEnBI40c6Pgb1oI8O7nvZq/GWdew8XZxVKnlnciH/40Er5TtNodxqQOIB8N MsN4Dz5TwPbe+pRTvxrhOCJHmf3I8p+86vNY7bGrEvobTIxR+uqZniXb6IPnqA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1745177458; 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=2Y5EtuNGgFT0SkViVo4fbrQZDL7VKhNUS5CB6VjDLAU=; b=F6H+xhepIR2dECD5eEJl9AWEJjbf4Xq2MllPlWDEV9X0+2xQil2TJdhJjiUkbLKgfFHcFW BtADPwxT1jrQZHNciv2KIqnZYRPbAL8rKlEi7e9PaXHpA2+BztQHj2uvy235tVOnX3EV3A KT/BejydY7ADnDHYyErWki84WfkTFsAw3iE6bvpfbtvJDAZxbQRlhx9ejOo/yB0Tcuc7/7 EJOeBlAbewN6VHxTMC/+La4lvclV0fjYy8A1/95rvEkOvqBPBJa3kwRYvpbfpA8XrS+1nX 3XsaRYuRqeDiKrHq3sGMs2VpSzPQroWyi8n34x4hbwdkMzFyoWwANqymXqynRg== 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 4Zgdry4cn3z2t5; Sun, 20 Apr 2025 19:30:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 53KJUwcB034719; Sun, 20 Apr 2025 19:30:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 53KJUw5h034716; Sun, 20 Apr 2025 19:30:58 GMT (envelope-from git) Date: Sun, 20 Apr 2025 19:30:58 GMT Message-Id: <202504201930.53KJUw5h034716@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: ad1f936ab7e4 - main - Reject providers with too small a size for metadata 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: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ad1f936ab7e497926e46079de8df7407ab123213 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=ad1f936ab7e497926e46079de8df7407ab123213 commit ad1f936ab7e497926e46079de8df7407ab123213 Author: Rose AuthorDate: 2025-04-16 22:35:20 +0000 Commit: Warner Losh CommitDate: 2025-04-20 19:30:41 +0000 Reject providers with too small a size for metadata Otherwise, if a misbehaving device claims a sectorsize smaller than 256, the memcpy will overflow the allocated buffer, since sizeof(*meta) is 256. Signed-off-by: Rose Reviewed by: imp Pull Request: https://github.com/freebsd/freebsd-src/pull/1668 --- sys/geom/raid/md_sii.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/sys/geom/raid/md_sii.c b/sys/geom/raid/md_sii.c index a340e8e49846..7019d48f42b4 100644 --- a/sys/geom/raid/md_sii.c +++ b/sys/geom/raid/md_sii.c @@ -921,6 +921,13 @@ g_raid_md_taste_sii(struct g_raid_md_object *md, struct g_class *mp, mdi = (struct g_raid_md_sii_object *)md; pp = cp->provider; + /* Explicitly reject providers with too small sector size */ + if (pp->sectorsize < sizeof(struct sii_raid_conf)) { + G_RAID_DEBUG(1, "SiI sector size too small on %s: %u < %zu", + pp->name, pp->sectorsize, sizeof(struct sii_raid_conf)); + return (G_RAID_MD_TASTE_FAIL); + } + /* Read metadata from device. */ meta = NULL; g_topology_unlock();