From c0dafc483ccc7d0200adeec1a2b187644feed74a Mon Sep 17 00:00:00 2001 From: Andriy Skulysh Date: Mon, 31 Aug 2015 11:31:02 +0300 Subject: [PATCH] LU-7061 osd-ldiskfs: NULL pointer dereference in osd_scrub_refresh_mapping id can be NULL for DTO_INDEX_DELETE operation. Change-Id: I0ead24b8d9112d65b48b8d96d93181fa17d04c49 Xyratex-bug-id: MRP-2431 Signed-off-by: Andriy Skulysh Reviewed-on: http://review.whamcloud.com/16138 Tested-by: Jenkins Tested-by: Maloo Reviewed-by: Fan Yong Reviewed-by: Alex Zhuravlev Reviewed-by: Oleg Drokin --- lustre/osd-ldiskfs/osd_scrub.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lustre/osd-ldiskfs/osd_scrub.c b/lustre/osd-ldiskfs/osd_scrub.c index 7713c4f..567560c 100644 --- a/lustre/osd-ldiskfs/osd_scrub.c +++ b/lustre/osd-ldiskfs/osd_scrub.c @@ -181,7 +181,8 @@ static int osd_scrub_refresh_mapping(struct osd_thread_info *info, if (rc < 0) CDEBUG(D_LFSCK, "%s: fail to refresh OI map for scrub op %d " DFID" => %u/%u: rc = %d\n", osd_name(dev), ops, - PFID(fid), id->oii_ino, id->oii_gen, rc); + PFID(fid), id ? id->oii_ino : -1, id ? id->oii_gen : -1, + rc); RETURN(rc); } -- 1.8.3.1