From: Yang Sheng <yang.sheng@intel.com>
Date: Wed, 22 Jul 2015 01:38:04 +0000 (-0700)
Subject: LU-6828 lod: fix memory leak in lod_connect_to_osd
X-Git-Tag: 2.7.58~59
X-Git-Url: https://git.whamcloud.com/?a=commitdiff_plain;h=bb813cfb78affdeafb6cd6e748e5df8c0330b600;p=fs%2Flustre-release.git

LU-6828 lod: fix memory leak in lod_connect_to_osd

We would replace '$fsname-mdtlov' to '$fsname-MDT0000-osd'
when upgrade from 1.x. But buffer alloced as former length.

Signed-off-by: Yang Sheng <yang.sheng@intel.com>
Change-Id: I8c92e3cb4472527fa5ad5da7f0e4cb498eaccb6c
Reviewed-on: http://review.whamcloud.com/15635
Tested-by: Jenkins
Reviewed-by: Bobi Jam <bobijam@hotmail.com>
Reviewed-by: Alex Zhuravlev <alexey.zhuravlev@intel.com>
Reviewed-by: Fan Yong <fan.yong@intel.com>
Tested-by: Maloo <hpdd-maloo@intel.com>
Reviewed-by: Oleg Drokin <oleg.drokin@intel.com>
---

diff --git a/lustre/lod/lod_dev.c b/lustre/lod/lod_dev.c
index ff75841..dc30788 100644
--- a/lustre/lod/lod_dev.c
+++ b/lustre/lod/lod_dev.c
@@ -1322,7 +1322,7 @@ static int lod_connect_to_osd(const struct lu_env *env, struct lod_device *lod,
 	 * we use "-MDT" to differentiate 2.x from 1.8 */
 
 	if ((p = lustre_cfg_string(cfg, 0)) && strstr(p, "-mdtlov")) {
-		len = strlen(p) + 1;
+		len = strlen(p) + 6;
 		OBD_ALLOC(nextdev, len);
 		if (nextdev == NULL)
 			GOTO(out, rc = -ENOMEM);