From owner-svn-src-stable-6@FreeBSD.ORG  Fri Jan 27 18:21:40 2012
Return-Path: <owner-svn-src-stable-6@FreeBSD.ORG>
Delivered-To: svn-src-stable-6@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id BFB541065673;
	Fri, 27 Jan 2012 18:21:40 +0000 (UTC)
	(envelope-from emaste@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id A8B5A8FC0A;
	Fri, 27 Jan 2012 18:21:40 +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 q0RILe31051280;
	Fri, 27 Jan 2012 18:21:40 GMT (envelope-from emaste@svn.freebsd.org)
Received: (from emaste@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q0RILe7G051277;
	Fri, 27 Jan 2012 18:21:40 GMT (envelope-from emaste@svn.freebsd.org)
Message-Id: <201201271821.q0RILe7G051277@svn.freebsd.org>
From: Ed Maste <emaste@FreeBSD.org>
Date: Fri, 27 Jan 2012 18:21:40 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-6@freebsd.org
X-SVN-Group: stable-6
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r230621 - in stable/6: contrib/telnet/libtelnet
	crypto/heimdal/appl/telnet/libtelnet
X-BeenThere: svn-src-stable-6@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for only the 6-stable src tree
	<svn-src-stable-6.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-6>, 
	<mailto:svn-src-stable-6-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-6>
List-Post: <mailto:svn-src-stable-6@freebsd.org>
List-Help: <mailto:svn-src-stable-6-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-6>, 
	<mailto:svn-src-stable-6-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 27 Jan 2012 18:21:40 -0000

Author: emaste
Date: Fri Jan 27 18:21:40 2012
New Revision: 230621
URL: http://svn.freebsd.org/changeset/base/230621

Log:
  MFC r228843:
  
    Fix a buffer overflow in telnetd. [11:08]

Modified:
  stable/6/contrib/telnet/libtelnet/encrypt.c
  stable/6/crypto/heimdal/appl/telnet/libtelnet/encrypt.c
Directory Properties:
  stable/6/contrib/telnet/   (props changed)
  stable/6/crypto/heimdal/   (props changed)

Modified: stable/6/contrib/telnet/libtelnet/encrypt.c
==============================================================================
--- stable/6/contrib/telnet/libtelnet/encrypt.c	Fri Jan 27 17:39:02 2012	(r230620)
+++ stable/6/contrib/telnet/libtelnet/encrypt.c	Fri Jan 27 18:21:40 2012	(r230621)
@@ -721,6 +721,9 @@ encrypt_keyid(struct key_info *kp, unsig
 	int dir = kp->dir;
 	int ret = 0;
 
+	if (len > MAXKEYLEN)
+		len = MAXKEYLEN;
+
 	if (!(ep = (*kp->getcrypt)(*kp->modep))) {
 		if (len == 0)
 			return;

Modified: stable/6/crypto/heimdal/appl/telnet/libtelnet/encrypt.c
==============================================================================
--- stable/6/crypto/heimdal/appl/telnet/libtelnet/encrypt.c	Fri Jan 27 17:39:02 2012	(r230620)
+++ stable/6/crypto/heimdal/appl/telnet/libtelnet/encrypt.c	Fri Jan 27 18:21:40 2012	(r230621)
@@ -736,6 +736,9 @@ encrypt_keyid(struct key_info *kp, unsig
     int dir = kp->dir;
     int ret = 0;
 
+    if (len > MAXKEYLEN)
+        len = MAXKEYLEN;
+
     if (!(ep = (*kp->getcrypt)(*kp->modep))) {
 	if (len == 0)
 	    return;