Sun Jan 5 09:13:18 2014 UTC ()

Fix previous slightly differently.
No need to have an extra variable and to write to the list head.


(dsl)

diff -r1.43 -r1.44 src/sys/kern/core_elf32.c

--- src/sys/kern/core_elf32.c 2014/01/05 00:53:53	1.43
+++ src/sys/kern/core_elf32.c 2014/01/05 09:13:18	1.44

 @@ -1,14 +1,14 @@
-/*	$NetBSD: core_elf32.c,v 1.43 2014/01/05 00:53:53 mrg Exp $	*/
+/*	$NetBSD: core_elf32.c,v 1.44 2014/01/05 09:13:18 dsl Exp $	*/
 /*
  * Copyright (c) 2001 Wasabi Systems, Inc.
  * All rights reserved.
+ *
  * Written by Jason R. Thorpe for Wasabi Systems, Inc.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
 @@ -30,27 +30,27 @@
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 /*
  * core_elf32.c/core_elf64.c: Support for the Elf32/Elf64 core file format.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(1, "$NetBSD: core_elf32.c,v 1.43 2014/01/05 00:53:53 mrg Exp $");
+__KERNEL_RCSID(1, "$NetBSD: core_elf32.c,v 1.44 2014/01/05 09:13:18 dsl Exp $");
 #ifdef _KERNEL_OPT
 #include "opt_coredump.h"
 #endif
 #ifndef ELFSIZE
 #define	ELFSIZE		32
 #endif
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/proc.h>
 #include <sys/vnode.h>
 @@ -106,27 +106,26 @@ int
 ELFNAMEEND(coredump)(struct lwp *l, struct coredump_iostate *cookie)
+{
 	Elf_Ehdr ehdr;
 	Elf_Phdr *psections;
 	size_t psectionssize;
 	int npsections;
 	struct writesegs_state ws;
 	off_t notestart;
 	size_t notesize;
 	int error, i;
 	struct note_state ns;
 	struct note_buf *nb;
 	struct note_buf *nb_next;
 	psections = NULL;
 	/* Get all of the notes (mostly all the registers). */
 	ns.ns_first = kmem_alloc(sizeof *ns.ns_first, KM_SLEEP);
 	ns.ns_last = ns.ns_first;
 	ns.ns_count = 0;
 	ns.ns_offset = 0;
 	error = ELFNAMEEND(coredump_notes)(l, &ns);
 	ns.ns_last->nb_next = NULL;
 	if (error)
 		goto out;
 	notesize = ns.ns_count * sizeof nb->nb_data + ns.ns_offset;
 @@ -247,28 +246,28 @@ ELFNAMEEND(coredump)(struct lwp *l, stru
 			    (long long) psections[i].p_filesz);
 #endif
 		error = coredump_write(cookie, UIO_USERSPACE,
 		    (void *)(vaddr_t)psections[i].p_vaddr,
 		    psections[i].p_filesz);
 		if (error)
 			goto out;
+	}
   out:
 	if (psections)
 		kmem_free(psections, psectionssize);
-	for (; (nb = ns.ns_first) != NULL; ns.ns_first = nb_next) {
+	while ((nb = ns.ns_first) != NULL) {
-		nb_next = nb->nb_next;
+		ns.ns_first = nb->nb_next;
 		kmem_free(nb, sizeof *nb);
+	}
 	return (error);
+}
 static int
 ELFNAMEEND(coredump_getseghdrs)(struct uvm_coredump_state *us)
+{
 	struct writesegs_state *ws = us->cookie;
 	Elf_Phdr phdr;
 	vsize_t size, realsize;
 	vaddr_t end;
 	int error;