From owner-svn-src-all@FreeBSD.ORG  Thu Jan  1 00:19:51 2009
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
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 9C9BB1065679;
	Thu,  1 Jan 2009 00:19:51 +0000 (UTC) (envelope-from ed@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 8A3C68FC14;
	Thu,  1 Jan 2009 00:19:51 +0000 (UTC) (envelope-from ed@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n010Jpib039018;
	Thu, 1 Jan 2009 00:19:51 GMT (envelope-from ed@svn.freebsd.org)
Received: (from ed@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n010JpBu039017;
	Thu, 1 Jan 2009 00:19:51 GMT (envelope-from ed@svn.freebsd.org)
Message-Id: <200901010019.n010JpBu039017@svn.freebsd.org>
From: Ed Schouten <ed@FreeBSD.org>
Date: Thu, 1 Jan 2009 00:19:51 +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: r186664 - head/sys/kern
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 &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 01 Jan 2009 00:19:52 -0000

Author: ed
Date: Thu Jan  1 00:19:51 2009
New Revision: 186664
URL: http://svn.freebsd.org/changeset/base/186664

Log:
  Don't clobber sysctl_root()'s error number.
  
  When sysctl() is being called with a buffer that is too small, it will
  return ENOMEM. Unfortunately the changes I made the other day sets the
  error number to 0, because it just returns the error number of the
  copyout(). Revert this part of the change.

Modified:
  head/sys/kern/kern_sysctl.c

Modified: head/sys/kern/kern_sysctl.c
==============================================================================
--- head/sys/kern/kern_sysctl.c	Wed Dec 31 23:44:34 2008	(r186663)
+++ head/sys/kern/kern_sysctl.c	Thu Jan  1 00:19:51 2009	(r186664)
@@ -1371,8 +1371,11 @@ __sysctl(struct thread *td, struct sysct
 		uap->new, uap->newlen, &j, 0);
 	if (error && error != ENOMEM)
 		return (error);
-	if (uap->oldlenp)
-		error = copyout(&j, uap->oldlenp, sizeof(j));
+	if (uap->oldlenp) {
+		int i = copyout(&j, uap->oldlenp, sizeof(j));
+		if (i)
+			return (i);
+	}
 	return (error);
 }