From owner-svn-src-all@FreeBSD.ORG  Fri Dec 14 08:52:09 2012
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id 1B8C9FD;
 Fri, 14 Dec 2012 08:52:09 +0000 (UTC)
 (envelope-from bapt@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id F28148FC0A;
 Fri, 14 Dec 2012 08:52:08 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qBE8q8xn026818;
 Fri, 14 Dec 2012 08:52:08 GMT (envelope-from bapt@svn.freebsd.org)
Received: (from bapt@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qBE8q837026817;
 Fri, 14 Dec 2012 08:52:08 GMT (envelope-from bapt@svn.freebsd.org)
Message-Id: <201212140852.qBE8q837026817@svn.freebsd.org>
From: Baptiste Daroussin <bapt@FreeBSD.org>
Date: Fri, 14 Dec 2012 08:52:08 +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: r244204 - 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-all@freebsd.org
X-Mailman-Version: 2.1.14
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/options/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: Fri, 14 Dec 2012 08:52:09 -0000

Author: bapt
Date: Fri Dec 14 08:52:08 2012
New Revision: 244204
URL: http://svnweb.freebsd.org/changeset/base/244204

Log:
  MFC r243021:
  return ERANGE if the buffer is too small to contain the login as documented in
  the manpage
  
  Reviewed by:	cognet, kib

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

Modified: stable/9/sys/kern/kern_prot.c
==============================================================================
--- stable/9/sys/kern/kern_prot.c	Fri Dec 14 08:07:37 2012	(r244203)
+++ stable/9/sys/kern/kern_prot.c	Fri Dec 14 08:52:08 2012	(r244204)
@@ -2084,6 +2084,8 @@ sys_getlogin(struct thread *td, struct g
 	bcopy(p->p_session->s_login, login, uap->namelen);
 	SESS_UNLOCK(p->p_session);
 	PROC_UNLOCK(p);
+	if (strlen(login) + 1 > uap->namelen)
+		return (ERANGE);
 	error = copyout(login, uap->namebuf, uap->namelen);
 	return (error);
 }