From owner-svn-src-all@FreeBSD.ORG  Mon Apr 20 09:59:08 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 A454A106566B;
	Mon, 20 Apr 2009 09:59:08 +0000 (UTC)
	(envelope-from roberto@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 92F538FC13;
	Mon, 20 Apr 2009 09:59:08 +0000 (UTC)
	(envelope-from roberto@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 n3K9x8gI042604;
	Mon, 20 Apr 2009 09:59:08 GMT (envelope-from roberto@svn.freebsd.org)
Received: (from roberto@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n3K9x8ln042603;
	Mon, 20 Apr 2009 09:59:08 GMT (envelope-from roberto@svn.freebsd.org)
Message-Id: <200904200959.n3K9x8ln042603@svn.freebsd.org>
From: Ollivier Robert <roberto@FreeBSD.org>
Date: Mon, 20 Apr 2009 09:59:08 +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: r191302 - in head/contrib/ntp: . ntpq
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: Mon, 20 Apr 2009 09:59:09 -0000

Author: roberto
Date: Mon Apr 20 09:59:08 2009
New Revision: 191302
URL: http://svn.freebsd.org/changeset/base/191302

Log:
  Merge r191298 into HEAD.
  
  Prevent a buffer overflow in ntpq.  Patch taken from the PR database
  after being committed to the official ntp tree and present in 4.2.4p7-rc2.
  
  It will be MFH to the upcoming 7.2 pending re approval.
  
  Obtained from:  https://support.ntp.org/bugs/show_bug.cgi?id=1144
  MFC after:      3 days
  Security:       http://www.securityfocus.com/bid/34481
                  CVE-2009-0159

Modified:
  head/contrib/ntp/   (props changed)
  head/contrib/ntp/ntpq/ntpq.c

Modified: head/contrib/ntp/ntpq/ntpq.c
==============================================================================
--- head/contrib/ntp/ntpq/ntpq.c	Mon Apr 20 07:13:04 2009	(r191301)
+++ head/contrib/ntp/ntpq/ntpq.c	Mon Apr 20 09:59:08 2009	(r191302)
@@ -3185,9 +3185,9 @@ cookedprint(
 				if (!decodeuint(value, &uval))
 				    output_raw = '?';
 				else {
-					char b[10];
+					char b[12];
 
-					(void) sprintf(b, "%03lo", uval);
+					(void) snprintf(b, sizeof(b), "%03lo", uval);
 					output(fp, name, b);
 				}
 				break;