diff options
author | Konstantin Belousov <kib@FreeBSD.org> | 2008-10-31 10:11:35 +0000 |
---|---|---|
committer | Konstantin Belousov <kib@FreeBSD.org> | 2008-10-31 10:11:35 +0000 |
commit | f5dfdb519f6564983e560c945e495bd598b026e7 (patch) | |
tree | c6f97f1df44fb4cf969476de15ea2052082d49c6 /sys/amd64/amd64/minidump_machdep.c | |
parent | 7a9c4d24091f3e940f2dd4eb2804633adef1109d (diff) | |
download | src-f5dfdb519f6564983e560c945e495bd598b026e7.tar.gz src-f5dfdb519f6564983e560c945e495bd598b026e7.zip |
Revert r184136. Instead, push the check for crashdumpmap overflow into the
MD i386 and amd64 dump code.
Requested by: jhb
Retested by: pho
MFC after: 3 days (+ 176304 + 184136)
Notes
Notes:
svn path=/head/; revision=184499
Diffstat (limited to 'sys/amd64/amd64/minidump_machdep.c')
-rw-r--r-- | sys/amd64/amd64/minidump_machdep.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sys/amd64/amd64/minidump_machdep.c b/sys/amd64/amd64/minidump_machdep.c index ec6727c5c243..676d01332b0e 100644 --- a/sys/amd64/amd64/minidump_machdep.c +++ b/sys/amd64/amd64/minidump_machdep.c @@ -104,7 +104,7 @@ blk_write(struct dumperinfo *di, char *ptr, vm_paddr_t pa, size_t sz) int error, i, c; u_int maxdumpsz; - maxdumpsz = di->maxiosize; + maxdumpsz = min(di->maxiosize, MAXDUMPPGS * PAGE_SIZE); if (maxdumpsz == 0) /* seatbelt */ maxdumpsz = PAGE_SIZE; error = 0; |