Module Name: src
Committed By: christos
Date: Wed Jan 25 17:55:47 UTC 2017
Modified Files:
src/sys/kern: core_elf32.c sys_ptrace_common.c
Log Message:
PR/51916: Kamil Rytarowski: Don't multiply es_arglen with ptrsz since it is
already in bytes and contains the maximum possible size:
ELF_AUX_ENTRIES * sizeof(auxv) + MAXPATHLEN + ALIGN
To generate a diff of this commit:
cvs rdiff -u -r1.50 -r1.51 src/sys/kern/core_elf32.c
cvs rdiff -u -r1.10 -r1.11 src/sys/kern/sys_ptrace_common.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/kern/core_elf32.c
diff -u src/sys/kern/core_elf32.c:1.50 src/sys/kern/core_elf32.c:1.51
--- src/sys/kern/core_elf32.c:1.50 Fri Jan 6 17:53:17 2017
+++ src/sys/kern/core_elf32.c Wed Jan 25 12:55:47 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: core_elf32.c,v 1.50 2017/01/06 22:53:17 kamil Exp $ */
+/* $NetBSD: core_elf32.c,v 1.51 2017/01/25 17:55:47 christos Exp $ */
/*
* Copyright (c) 2001 Wasabi Systems, Inc.
@@ -40,7 +40,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(1, "$NetBSD: core_elf32.c,v 1.50 2017/01/06 22:53:17 kamil Exp $");
+__KERNEL_RCSID(1, "$NetBSD: core_elf32.c,v 1.51 2017/01/25 17:55:47 christos Exp $");
#ifdef _KERNEL_OPT
#include "opt_coredump.h"
@@ -416,7 +416,7 @@ coredump_note_auxv(struct lwp *l, struct
size_t ptrsz = PROC_PTRSZ(p);
uauxv = (void *)((char *)pss.ps_envstr + (pss.ps_nenvstr + 1) * ptrsz);
- size_t len = p->p_execsw->es_arglen * ptrsz;
+ size_t len = p->p_execsw->es_arglen;
kauxv = kmem_alloc(len, KM_SLEEP);
error = copyin_proc(p, uauxv, kauxv, len);
Index: src/sys/kern/sys_ptrace_common.c
diff -u src/sys/kern/sys_ptrace_common.c:1.10 src/sys/kern/sys_ptrace_common.c:1.11
--- src/sys/kern/sys_ptrace_common.c:1.10 Sat Jan 14 01:36:52 2017
+++ src/sys/kern/sys_ptrace_common.c Wed Jan 25 12:55:47 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: sys_ptrace_common.c,v 1.10 2017/01/14 06:36:52 kamil Exp $ */
+/* $NetBSD: sys_ptrace_common.c,v 1.11 2017/01/25 17:55:47 christos Exp $ */
/*-
* Copyright (c) 2008, 2009 The NetBSD Foundation, Inc.
@@ -118,7 +118,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sys_ptrace_common.c,v 1.10 2017/01/14 06:36:52 kamil Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sys_ptrace_common.c,v 1.11 2017/01/25 17:55:47 christos Exp $");
#ifdef _KERNEL_OPT
#include "opt_ptrace.h"
@@ -619,7 +619,7 @@ do_ptrace(struct ptrace_methods *ptm, st
case PIOD_READ_AUXV:
req = PT_READ_D;
uio.uio_rw = UIO_READ;
- tmp = t->p_execsw->es_arglen * PROC_PTRSZ(t);
+ tmp = t->p_execsw->es_arglen;
if (uio.uio_offset > tmp)
return EIO;
if (uio.uio_resid > tmp - uio.uio_offset)
