From owner-svn-src-all@FreeBSD.ORG Wed May 9 17:26:53 2012 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 3ACF11065670; Wed, 9 May 2012 17:26:53 +0000 (UTC) (envelope-from eadler@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 0B6888FC17; Wed, 9 May 2012 17:26:53 +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 q49HQqQH094768; Wed, 9 May 2012 17:26:52 GMT (envelope-from eadler@svn.freebsd.org) Received: (from eadler@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q49HQqe2094765; Wed, 9 May 2012 17:26:52 GMT (envelope-from eadler@svn.freebsd.org) Message-Id: <201205091726.q49HQqe2094765@svn.freebsd.org> From: Eitan Adler Date: Wed, 9 May 2012 17:26:52 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r235201 - in head: sbin/geom/class/eli sys/geom/eli X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 09 May 2012 17:26:53 -0000 Author: eadler Date: Wed May 9 17:26:52 2012 New Revision: 235201 URL: http://svn.freebsd.org/changeset/base/235201 Log: Clarify error that geli generates when it finds corrupt data. PR: kern/165695 Submitted by: Robert Simmons Reviewed by: pjd Approved by: cperciva MFC after: 1 week Modified: head/sbin/geom/class/eli/geli.8 head/sys/geom/eli/g_eli_integrity.c Modified: head/sbin/geom/class/eli/geli.8 ============================================================================== --- head/sbin/geom/class/eli/geli.8 Wed May 9 16:57:09 2012 (r235200) +++ head/sbin/geom/class/eli/geli.8 Wed May 9 17:26:52 2012 (r235201) @@ -924,6 +924,9 @@ will not protect your data against repla It is recommended to write to the whole provider before first use, in order to make sure that all sectors and their corresponding checksums are properly initialized into a consistent state. +One can safely ignore data authentication errors that occur immediately +after the first time a provider is attached and before it is +initialized in this way. .Sh SEE ALSO .Xr crypto 4 , .Xr gbde 4 , Modified: head/sys/geom/eli/g_eli_integrity.c ============================================================================== --- head/sys/geom/eli/g_eli_integrity.c Wed May 9 16:57:09 2012 (r235200) +++ head/sys/geom/eli/g_eli_integrity.c Wed May 9 17:26:52 2012 (r235201) @@ -205,8 +205,8 @@ g_eli_auth_read_done(struct cryptop *crp * Report previous corruption if there was one. */ if (coroff != -1) { - G_ELI_DEBUG(0, "%s: %jd bytes " - "corrupted at offset %jd.", + G_ELI_DEBUG(0, "%s: Failed to authenticate %jd " + "bytes of data at offset %jd", sc->sc_name, (intmax_t)corsize, (intmax_t)coroff); coroff = -1; @@ -221,7 +221,8 @@ g_eli_auth_read_done(struct cryptop *crp } /* Report previous corruption if there was one. */ if (coroff != -1) { - G_ELI_DEBUG(0, "%s: %jd bytes corrupted at offset %jd.", + G_ELI_DEBUG(0, "%s: Failed to authenticate %jd " + "bytes of data at offset %jd", sc->sc_name, (intmax_t)corsize, (intmax_t)coroff); } }