From: Li Xi Date: Tue, 11 Jun 2019 12:28:30 +0000 (+0800) Subject: LU-12420 utils: llog_reader handles uninitialized mountdata X-Git-Tag: 2.12.56~78 X-Git-Url: https://git.whamcloud.com/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F78%2F35178%2F2;p=fs%2Flustre-release.git LU-12420 utils: llog_reader handles uninitialized mountdata When reading an mountdata that has never been used, "llog_reader CONFIGS/mountdata" command crashes with following output: Header size : 500170753 Time : Wed Sep 4 00:57:37 6869 Number of records: 65534 Target uuid : ----------------------- Segmentation fault After apply this patch, llog_reader will print following message and quit under this circumstance: Header size : 500170753 Time : Wed Sep 4 00:57:37 6869 Number of records: 65534 Target uuid : ----------------------- uninitialized llog record at index 0 Change-Id: I25147f7fd09c6d59ff0049bdb20ac1979cf43ee4 Signed-off-by: Li Xi Reviewed-on: https://review.whamcloud.com/35178 Tested-by: Jenkins Tested-by: Maloo Reviewed-by: Andreas Dilger Reviewed-by: Wang Shilong Reviewed-by: Li Dongyang Reviewed-by: Oleg Drokin --- diff --git a/lustre/utils/llog_reader.c b/lustre/utils/llog_reader.c index e99dc35..6c776e2 100644 --- a/lustre/utils/llog_reader.c +++ b/lustre/utils/llog_reader.c @@ -278,7 +278,7 @@ int llog_pack_buffer(int fd, struct llog_log_hdr **llog, /* the llog header not countable here.*/ recs_num = count - 1; - recs_buf = malloc(recs_num * sizeof(**recs_pr)); + recs_buf = calloc(recs_num, sizeof(**recs_pr)); if (recs_buf == NULL) { rc = -ENOMEM; llapi_error(LLAPI_MSG_ERROR, rc, @@ -779,6 +779,12 @@ static void print_records(struct llog_rec_hdr **recs, int i, skip = 0; for (i = 0; i < rec_number; i++) { + if (recs[i] == NULL) { + llapi_printf(LLAPI_MSG_NORMAL, + "uninitialized llog record at index %d\n", + i); + break; + } printf("#%.2d (%.3d)", __le32_to_cpu(recs[i]->lrh_index), __le32_to_cpu(recs[i]->lrh_len));