From owner-svn-soc-all@FreeBSD.ORG Thu Jun 26 19:02:21 2014 Return-Path: Delivered-To: svn-soc-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 ESMTPS id 5E7F893C for ; Thu, 26 Jun 2014 19:02:21 +0000 (UTC) Received: from socsvn.freebsd.org (socsvn.freebsd.org [IPv6:2001:1900:2254:206a::50:2]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4AA8F2CAD for ; Thu, 26 Jun 2014 19:02:21 +0000 (UTC) Received: from socsvn.freebsd.org ([127.0.1.124]) by socsvn.freebsd.org (8.14.8/8.14.8) with ESMTP id s5QJ2Ll7036247 for ; Thu, 26 Jun 2014 19:02:21 GMT (envelope-from def@FreeBSD.org) Received: (from www@localhost) by socsvn.freebsd.org (8.14.8/8.14.8/Submit) id s5QJ2KJE036111 for svn-soc-all@FreeBSD.org; Thu, 26 Jun 2014 19:02:20 GMT (envelope-from def@FreeBSD.org) Date: Thu, 26 Jun 2014 19:02:20 GMT Message-Id: <201406261902.s5QJ2KJE036111@socsvn.freebsd.org> X-Authentication-Warning: socsvn.freebsd.org: www set sender to def@FreeBSD.org using -f From: def@FreeBSD.org To: svn-soc-all@FreeBSD.org Subject: socsvn commit: r270091 - in soc2013/def/crashdump-head/sys: kern sys MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-soc-all@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: SVN commit messages for the entire Summer of Code repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 26 Jun 2014 19:02:21 -0000 Author: def Date: Thu Jun 26 19:02:20 2014 New Revision: 270091 URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=270091 Log: Don't assume that dump_write is always called with PAGE_SIZE long chunks. Modified: soc2013/def/crashdump-head/sys/kern/kern_shutdown.c soc2013/def/crashdump-head/sys/sys/kerneldump.h Modified: soc2013/def/crashdump-head/sys/kern/kern_shutdown.c ============================================================================== --- soc2013/def/crashdump-head/sys/kern/kern_shutdown.c Thu Jun 26 17:59:23 2014 (r270090) +++ soc2013/def/crashdump-head/sys/kern/kern_shutdown.c Thu Jun 26 19:02:20 2014 (r270091) @@ -889,8 +889,9 @@ length)); } - while (length > 0) { - memcpy(kdb->buf, virtual, KERNELDUMP_BUFFER_SIZE); + while (kdb->used + length >= KERNELDUMP_BUFFER_SIZE) { + memcpy(kdb->buf + kdb->used, virtual, KERNELDUMP_BUFFER_SIZE - + kdb->used); error = rijndael_blockEncrypt(&kdk->ci, &kdk->ki, kdb->buf, KERNELDUMP_BUFFER_SIZE * 8, kdb->buf); @@ -906,10 +907,15 @@ if (error) return (error); + kdb->used = 0; virtual = (void *)((char *)virtual + KERNELDUMP_BUFFER_SIZE); length -= KERNELDUMP_BUFFER_SIZE; offset += KERNELDUMP_BUFFER_SIZE; } + if (length > 0) { + memcpy(kdb->buf + kdb->used, virtual, length); + kdb->used += length; + } return (0); } Modified: soc2013/def/crashdump-head/sys/sys/kerneldump.h ============================================================================== --- soc2013/def/crashdump-head/sys/sys/kerneldump.h Thu Jun 26 17:59:23 2014 (r270090) +++ soc2013/def/crashdump-head/sys/sys/kerneldump.h Thu Jun 26 19:02:20 2014 (r270091) @@ -115,6 +115,7 @@ #ifdef _KERNEL struct kerneldumpbuffer { uint8_t buf[KERNELDUMP_BUFFER_SIZE]; /* Raw data buffer. */ + size_t used; /* Number of bytes used in buf. */ off_t kdhoffset; /* Offset value of the first kdh. */ };