upstream/opnsense-src
1
0
Fork 0
mirror of https://github.com/opnsense/src.git synced 2026-05-28 04:12:45 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Revert r184136. Instead, push the check for crashdumpmap overflow into the

Browse source 
MD i386 and amd64 dump code.

Requested by:	jhb
Retested by:	pho
MFC after:	3 days (+ 176304 + 184136)
This commit is contained in:
Konstantin Belousov 2008-10-31 10:11:35 +00:00
parent 7a9c4d2409
commit f5dfdb519f
4 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
sys/amd64/amd64/dump_machdep.c
View file

@ -165,7 +165,7 @@ cb_dumpdata(struct md_pa *mdp, int seqnr, void *arg)
va = 0;
pgs = mdp->md_size / PAGE_SIZE;
pa = mdp->md_start;
maxdumppgs = di->maxiosize / PAGE_SIZE;
maxdumppgs = min(di->maxiosize / PAGE_SIZE, MAXDUMPPGS);
if (maxdumppgs == 0) /* seatbelt */
maxdumppgs = 1;

2
sys/amd64/amd64/minidump_machdep.c
View file

@ -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;

2
sys/geom/geom_disk.c
View file

@ -179,7 +179,7 @@ g_disk_kerneldump(struct bio *bp, struct disk *dp)
di.dumper = dp->d_dump;
di.priv = dp;
di.blocksize = dp->d_sectorsize;
di.maxiosize = min(dp->d_maxsize, MAXDUMPPGS * PAGE_SIZE);
di.maxiosize = dp->d_maxsize;
di.mediaoffset = gkd->offset;
if ((gkd->offset + gkd->length) > dp->d_mediasize)
gkd->length = dp->d_mediasize - gkd->offset;

2
sys/i386/i386/dump_machdep.c
View file

@ -165,7 +165,7 @@ cb_dumpdata(struct md_pa *mdp, int seqnr, void *arg)
va = 0;
pgs = mdp->md_size / PAGE_SIZE;
pa = mdp->md_start;
maxdumppgs = di->maxiosize / PAGE_SIZE;
maxdumppgs = min(di->maxiosize / PAGE_SIZE, MAXDUMPPGS);
if (maxdumppgs == 0) /* seatbelt */
maxdumppgs = 1;