> We want to concatonate join string one, a '/' character, string two and > then a NUL terminator. The destination buffer holds ori_gf->gf_pathlen > characters. The strlen() function returns the number of characters not > counting the NUL terminator. So we should be adding two extra spaces, > one for the foward slash and one for the NUL. > > Signed-off-by: Dan Carpenter <dan.carpenter@xxxxxxxxxx> > --- > Not tested. Please review this one carefully. This is a real bug which is impacting users. The bug is being tracked at https://jira.hpdd.intel.com/browse/LU-9863. It passed our test suite and its being reviewed. > diff --git a/drivers/staging/lustre/lustre/lmv/lmv_obd.c b/drivers/staging/lustre/lustre/lmv/lmv_obd.c > index 64fcaef0bacd..70c58291814d 100644 > --- a/drivers/staging/lustre/lustre/lmv/lmv_obd.c > +++ b/drivers/staging/lustre/lustre/lmv/lmv_obd.c > @@ -657,8 +657,8 @@ static int lmv_fid2path(struct obd_export *exp, int len, void *karg, > char *ptr; > > ori_gf = karg; > - if (strlen(ori_gf->gf_path) + > - strlen(gf->gf_path) > ori_gf->gf_pathlen) { > + if (strlen(ori_gf->gf_path) + 1 + > + strlen(gf->gf_path) + 1 > ori_gf->gf_pathlen) { > rc = -EOVERFLOW; > goto out_fid2path; > } > -- To unsubscribe from this list: send the line "unsubscribe kernel-janitors" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
