From 049252c375a2ceee41f255ab445334af2868519e Mon Sep 17 00:00:00 2001 From: Fan Yong Date: Sun, 13 Sep 2015 17:41:13 +0800 Subject: [PATCH] LU-7354 osd: avoid NULL pointer in osd_obj_update_entry In osd_obj_update_entry(), the variable @oi_fid may be NULL. We need to check such case before further using it to avoid accessing invalid RAM. Signed-off-by: Fan Yong Change-Id: Ibf47e949d69f0b9e5657a6dce2007fe4f6f1a9f6 Reviewed-on: http://review.whamcloud.com/17010 Tested-by: Jenkins Tested-by: Maloo Reviewed-by: Niu Yawei Reviewed-by: Oleg Drokin --- lustre/osd-ldiskfs/osd_compat.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lustre/osd-ldiskfs/osd_compat.c b/lustre/osd-ldiskfs/osd_compat.c index 5291dcd..ec004e4 100644 --- a/lustre/osd-ldiskfs/osd_compat.c +++ b/lustre/osd-ldiskfs/osd_compat.c @@ -586,7 +586,7 @@ static int osd_obj_update_entry(struct osd_thread_info *info, GOTO(out, rc = -EEXIST); } - if (fid_is_idif(fid) && fid_is_idif(oi_fid)) { + if (fid_is_idif(fid) && oi_fid != NULL && fid_is_idif(oi_fid)) { __u32 idx1 = fid_idif_ost_idx(fid); __u32 idx2 = fid_idif_ost_idx(oi_fid); struct ost_id *ostid = &info->oti_ostid; -- 1.8.3.1