From owner-svn-src-stable@FreeBSD.ORG  Thu Sep 12 00:46:33 2013
Return-Path: <owner-svn-src-stable@FreeBSD.ORG>
Delivered-To: svn-src-stable@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTP id F33AF71E;
 Thu, 12 Sep 2013 00:46:32 +0000 (UTC)
 (envelope-from delphij@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id E08D023BD;
 Thu, 12 Sep 2013 00:46:32 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r8C0kWRR076978;
 Thu, 12 Sep 2013 00:46:32 GMT (envelope-from delphij@svn.freebsd.org)
Received: (from delphij@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r8C0kWDe076977;
 Thu, 12 Sep 2013 00:46:32 GMT (envelope-from delphij@svn.freebsd.org)
Message-Id: <201309120046.r8C0kWDe076977@svn.freebsd.org>
From: Xin LI <delphij@FreeBSD.org>
Date: Thu, 12 Sep 2013 00:46:32 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org
Subject: svn commit: r255485 - stable/9/sys/kern
X-SVN-Group: stable-9
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
 <svn-src-stable.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-stable>,
 <mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
 <mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 12 Sep 2013 00:46:33 -0000

Author: delphij
Date: Thu Sep 12 00:46:32 2013
New Revision: 255485
URL: http://svnweb.freebsd.org/changeset/base/255485

Log:
  MFC r255412:
  
  In r243868, the error message buffer errmsg have been changed from
  an on-stack array to a pointer and therefore sizeof(errmsg) would
  become 4 or 8 bytes depending on the architecture.
  
  Fix this by using ERRMSGL in place of sizeof().
  
  Submitted by:	J David <j.david.lists@gmail.com>

Modified:
  stable/9/sys/kern/vfs_mountroot.c
Directory Properties:
  stable/9/sys/   (props changed)

Modified: stable/9/sys/kern/vfs_mountroot.c
==============================================================================
--- stable/9/sys/kern/vfs_mountroot.c	Thu Sep 12 00:23:09 2013	(r255484)
+++ stable/9/sys/kern/vfs_mountroot.c	Thu Sep 12 00:46:32 2013	(r255485)
@@ -710,7 +710,7 @@ parse_mount(char **conf)
 	errmsg = malloc(ERRMSGL, M_TEMP, M_WAITOK | M_ZERO);
 
 	if (vfs_byname(fs) == NULL) {
-		strlcpy(errmsg, "unknown file system", sizeof(errmsg));
+		strlcpy(errmsg, "unknown file system", ERRMSGL);
 		error = ENOENT;
 		goto out;
 	}