From a5161cc005aeb383cb326a32976f8d43e7594bb3 Mon Sep 17 00:00:00 2001 From: Arshad Hussain Date: Sat, 12 May 2018 14:13:54 +0530 Subject: [PATCH] LU-7943 mdd: Move assignment after LASSERT() This patch moves 'sname->ln_namelen' assignment call after LASSERT() call. This avoids a case when 'sname' parameter is NULL and dereferencing the NULL pointer would fault before it reaches LASSERT() Change-Id: I68b07f7ca33fd21ee0599b7bb73d6e41546bd2d8 Test-Parameters: trivial Signed-off-by: Arshad Hussain Reviewed-on: https://review.whamcloud.com/32376 Tested-by: Jenkins Tested-by: Maloo Reviewed-by: Andreas Dilger Reviewed-by: James Simmons Reviewed-by: Dmitry Eremin --- lustre/mdd/mdd_dir.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/lustre/mdd/mdd_dir.c b/lustre/mdd/mdd_dir.c index acf1bd2..8c1b3b7 100644 --- a/lustre/mdd/mdd_dir.c +++ b/lustre/mdd/mdd_dir.c @@ -1014,12 +1014,14 @@ static void mdd_changelog_rec_ext_rename(struct changelog_rec *rec, const struct lu_name *sname) { struct changelog_ext_rename *rnm = changelog_rec_rename(rec); - size_t extsize = sname->ln_namelen + 1; + size_t extsize; LASSERT(sfid != NULL); LASSERT(spfid != NULL); LASSERT(sname != NULL); + extsize = sname->ln_namelen + 1; + rnm->cr_sfid = *sfid; rnm->cr_spfid = *spfid; -- 1.8.3.1