From owner-svn-src-all@FreeBSD.ORG  Wed Oct  9 13:45:08 2013
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:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTP id 38151A0B;
 Wed,  9 Oct 2013 13:45:08 +0000 (UTC)
 (envelope-from trasz@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 1F24327AD;
 Wed,  9 Oct 2013 13:45:08 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r99Dj7RM095704;
 Wed, 9 Oct 2013 13:45:07 GMT (envelope-from trasz@svn.freebsd.org)
Received: (from trasz@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r99Dj7Mj095703;
 Wed, 9 Oct 2013 13:45:07 GMT (envelope-from trasz@svn.freebsd.org)
Message-Id: <201310091345.r99Dj7Mj095703@svn.freebsd.org>
From: Edward Tomasz Napierala <trasz@FreeBSD.org>
Date: Wed, 9 Oct 2013 13:45:07 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r256193 - head/usr.sbin/iscsid
X-SVN-Group: head
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: Wed, 09 Oct 2013 13:45:08 -0000

Author: trasz
Date: Wed Oct  9 13:45:07 2013
New Revision: 256193
URL: http://svnweb.freebsd.org/changeset/base/256193

Log:
  Fix memory overrun.
  
  Coverity CID:	1092478
  Approved by:	re (gjb)
  Sponsored by:	FreeBSD Foundation

Modified:
  head/usr.sbin/iscsid/discovery.c

Modified: head/usr.sbin/iscsid/discovery.c
==============================================================================
--- head/usr.sbin/iscsid/discovery.c	Wed Oct  9 13:28:45 2013	(r256192)
+++ head/usr.sbin/iscsid/discovery.c	Wed Oct  9 13:45:07 2013	(r256193)
@@ -146,7 +146,7 @@ kernel_add(const struct connection *conn
 	int error;
 
 	memset(&isa, 0, sizeof(isa));
-	memcpy(&isa.isa_conf, &conn->conn_conf, sizeof(isa));
+	memcpy(&isa.isa_conf, &conn->conn_conf, sizeof(isa.isa_conf));
 	strlcpy(isa.isa_conf.isc_target, target,
 	    sizeof(isa.isa_conf.isc_target));
 	isa.isa_conf.isc_discovery = 0;