From owner-svn-src-stable-8@FreeBSD.ORG  Wed Jun  1 05:03:18 2011
Return-Path: <owner-svn-src-stable-8@FreeBSD.ORG>
Delivered-To: svn-src-stable-8@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 409031066462;
	Wed,  1 Jun 2011 05:03:18 +0000 (UTC) (envelope-from ae@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 30AF68FC17;
	Wed,  1 Jun 2011 05:03:18 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p5153IVL054690;
	Wed, 1 Jun 2011 05:03:18 GMT (envelope-from ae@svn.freebsd.org)
Received: (from ae@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id p5153IZ3054687;
	Wed, 1 Jun 2011 05:03:18 GMT (envelope-from ae@svn.freebsd.org)
Message-Id: <201106010503.p5153IZ3054687@svn.freebsd.org>
From: "Andrey V. Elsukov" <ae@FreeBSD.org>
Date: Wed, 1 Jun 2011 05:03:18 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org
X-SVN-Group: stable-8
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r222554 - stable/8/sys/geom/vinum
X-BeenThere: svn-src-stable-8@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for only the 8-stable src tree
	<svn-src-stable-8.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-8>, 
	<mailto:svn-src-stable-8-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-8>
List-Post: <mailto:svn-src-stable-8@freebsd.org>
List-Help: <mailto:svn-src-stable-8-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-8>, 
	<mailto:svn-src-stable-8-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 01 Jun 2011 05:03:18 -0000

Author: ae
Date: Wed Jun  1 05:03:17 2011
New Revision: 222554
URL: http://svn.freebsd.org/changeset/base/222554

Log:
  MFC r222283:
    Prevent non-aligned reading from provider while tasting. Reject
    providers with unsupported sectorsize.

Modified:
  stable/8/sys/geom/vinum/geom_vinum_drive.c
  stable/8/sys/geom/vinum/geom_vinum_events.c
Directory Properties:
  stable/8/sys/   (props changed)
  stable/8/sys/amd64/include/xen/   (props changed)
  stable/8/sys/cddl/contrib/opensolaris/   (props changed)
  stable/8/sys/contrib/dev/acpica/   (props changed)
  stable/8/sys/contrib/pf/   (props changed)

Modified: stable/8/sys/geom/vinum/geom_vinum_drive.c
==============================================================================
--- stable/8/sys/geom/vinum/geom_vinum_drive.c	Wed Jun  1 01:35:09 2011	(r222553)
+++ stable/8/sys/geom/vinum/geom_vinum_drive.c	Wed Jun  1 05:03:17 2011	(r222554)
@@ -126,6 +126,10 @@ gv_read_header(struct g_consumer *cp, st
 	pp = cp->provider;
 	KASSERT(pp != NULL, ("gv_read_header: null pp"));
 
+	if ((GV_HDR_OFFSET % pp->sectorsize) != 0 ||
+	    (GV_HDR_LEN % pp->sectorsize) != 0)
+		return (ENODEV);
+
 	d_hdr = g_read_data(cp, GV_HDR_OFFSET, pp->sectorsize, NULL);
 	if (d_hdr == NULL)
 		return (-1);

Modified: stable/8/sys/geom/vinum/geom_vinum_events.c
==============================================================================
--- stable/8/sys/geom/vinum/geom_vinum_events.c	Wed Jun  1 01:35:09 2011	(r222553)
+++ stable/8/sys/geom/vinum/geom_vinum_events.c	Wed Jun  1 05:03:17 2011	(r222554)
@@ -109,6 +109,12 @@ gv_drive_tasted(struct gv_softc *sc, str
 	buf = NULL;
 
 	G_VINUM_DEBUG(2, "tasted drive on '%s'", pp->name);
+	if ((GV_CFG_OFFSET % pp->sectorsize) != 0 ||
+	    (GV_CFG_LEN % pp->sectorsize) != 0) {
+		G_VINUM_DEBUG(0, "provider %s has unsupported sectorsize.",
+		    pp->name);
+		return;
+	}
 
 	gp = sc->geom;
 	g_topology_lock();