c/mirror_zfs
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_zfs.git synced 2025-01-27 10:24:22 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fix for recent zdb -h | -i crashes (seg fault)

Browse Source 
Allocating SPA_MAXBLOCKSIZE on the stack is a bad idea (even with the
old 128K size). Use malloc instead when allocating temporary block
buffer memory.

Signed-off-by: Don Brady <don.brady@intel.com>
Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
Closes #3522
This commit is contained in:
Don Brady 2015-06-24 12:17:36 -06:00 committed by Brian Behlendorf
parent 784652c1f0
commit 017da6f063
2 changed files with 20 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
cmd/zdb/zdb.c
View File

@ -1070,7 +1070,7 @@ static void
dump_history(spa_t *spa) dump_history(spa_t *spa)
{ {
nvlist_t **events = NULL; nvlist_t **events = NULL;
char buf[SPA_MAXBLOCKSIZE]; char *buf;
uint64_t resid, len, off = 0; uint64_t resid, len, off = 0;
uint_t num = 0; uint_t num = 0;
int error; int error;
@ -1080,12 +1080,19 @@ dump_history(spa_t *spa)
char internalstr[MAXPATHLEN]; char internalstr[MAXPATHLEN];
int i; int i;
if ((buf = malloc(SPA_OLD_MAXBLOCKSIZE)) == NULL) {
(void) fprintf(stderr, "%s: unable to allocate I/O buffer\n",
__func__);
return;
}
do { do {
len = sizeof (buf); len = SPA_OLD_MAXBLOCKSIZE;
if ((error = spa_history_get(spa, &off, &len, buf)) != 0) { if ((error = spa_history_get(spa, &off, &len, buf)) != 0) {
(void) fprintf(stderr, "Unable to read history: " (void) fprintf(stderr, "Unable to read history: "
"error %d\n", error); "error %d\n", error);
free(buf);
return; return;
} }
@ -1136,6 +1143,7 @@ next:
dump_nvlist(events[i], 2); dump_nvlist(events[i], 2);
} }
} }
free(buf);
} }
/*ARGSUSED*/ /*ARGSUSED*/

15
cmd/zdb/zdb_il.c
View File

@ -124,7 +124,7 @@ zil_prt_rec_write(zilog_t *zilog, int txtype, lr_write_t *lr)
char *data, *dlimit; char *data, *dlimit;
blkptr_t *bp = &lr->lr_blkptr; blkptr_t *bp = &lr->lr_blkptr;
zbookmark_phys_t zb; zbookmark_phys_t zb;
char buf[SPA_MAXBLOCKSIZE]; char *buf;
int verbose = MAX(dump_opt['d'], dump_opt['i']); int verbose = MAX(dump_opt['d'], dump_opt['i']);
int error; int error;
@ -135,6 +135,9 @@ zil_prt_rec_write(zilog_t *zilog, int txtype, lr_write_t *lr)
if (txtype == TX_WRITE2 || verbose < 5) if (txtype == TX_WRITE2 || verbose < 5)
return; return;
if ((buf = malloc(SPA_MAXBLOCKSIZE)) == NULL)
return;
if (lr->lr_common.lrc_reclen == sizeof (lr_write_t)) { if (lr->lr_common.lrc_reclen == sizeof (lr_write_t)) {
(void) printf("%shas blkptr, %s\n", prefix, (void) printf("%shas blkptr, %s\n", prefix,
!BP_IS_HOLE(bp) && !BP_IS_HOLE(bp) &&
@ -145,13 +148,13 @@ zil_prt_rec_write(zilog_t *zilog, int txtype, lr_write_t *lr)
if (BP_IS_HOLE(bp)) { if (BP_IS_HOLE(bp)) {
(void) printf("\t\t\tLSIZE 0x%llx\n", (void) printf("\t\t\tLSIZE 0x%llx\n",
(u_longlong_t)BP_GET_LSIZE(bp)); (u_longlong_t)BP_GET_LSIZE(bp));
bzero(buf, sizeof (buf)); bzero(buf, SPA_MAXBLOCKSIZE);
(void) printf("%s<hole>\n", prefix); (void) printf("%s<hole>\n", prefix);
return; goto exit;
} }
if (bp->blk_birth < zilog->zl_header->zh_claim_txg) { if (bp->blk_birth < zilog->zl_header->zh_claim_txg) {
(void) printf("%s<block already committed>\n", prefix); (void) printf("%s<block already committed>\n", prefix);
return; goto exit;
} }
SET_BOOKMARK(&zb, dmu_objset_id(zilog->zl_os), SET_BOOKMARK(&zb, dmu_objset_id(zilog->zl_os),
@ -162,7 +165,7 @@ zil_prt_rec_write(zilog_t *zilog, int txtype, lr_write_t *lr)
bp, buf, BP_GET_LSIZE(bp), NULL, NULL, bp, buf, BP_GET_LSIZE(bp), NULL, NULL,
ZIO_PRIORITY_SYNC_READ, ZIO_FLAG_CANFAIL, &zb)); ZIO_PRIORITY_SYNC_READ, ZIO_FLAG_CANFAIL, &zb));
if (error) if (error)
return; goto exit;
data = buf; data = buf;
} else { } else {
data = (char *)(lr + 1); data = (char *)(lr + 1);
@ -180,6 +183,8 @@ zil_prt_rec_write(zilog_t *zilog, int txtype, lr_write_t *lr)
data++; data++;
} }
(void) printf("\n"); (void) printf("\n");
exit:
free(buf);
} }
/* ARGSUSED */ /* ARGSUSED */