Skip to contentSkip to conversation

portid.c: Preserve routepath string in str2drpath

PATCH Applied Hal Rosenstock 2 participants 2 messages Apr 29, 2015 – Jul 15, 2015 1 message not in the archive InfiniBand

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 portid.c: Preserve routepath string in str2drpath

From: Vladimir Koushnir <vladimirk-VPRAkNaXOzVWk0Htik3J/[email protected]>
Date: Tue, 28 Apr 2015 18:35:28 +0300

In str2drpath, preserve routepath string rather than modifying it.

---
 src/portid.c |   11 ++++++++++-
 1 files changed, 10 insertions(+), 1 deletions(-)
src/portid.c +10 -1
index ceb685e..40754fe 100644
@@ -82,11 +82,18 @@ char *portid2str(ib_portid_t * portid)
 
 int str2drpath(ib_dr_path_t * path, char *routepath, int drslid, int drdlid)
 {
-	char *s, *str = routepath;
+	char *s, *str;
+	char *tmp;
 
 	path->cnt = -1;
 
+	if (!routepath || !(tmp = strdup(routepath)))
+		goto Exit;
+
 	DEBUG("DR str: %s", routepath);
+
+	str = tmp;
+
 	while (str && *str) {
 		if ((s = strchr(str, ',')))
 			*s = 0;
@@ -95,7 +102,9 @@ int str2drpath(ib_dr_path_t * path, char *routepath, int drslid, int drdlid)
 			break;
 		str = s + 1;
 	}
+	free(tmp);
 
+Exit:
 	path->drdlid = drdlid ? drdlid : 0xffff;
 	path->drslid = drslid ? drslid : 0xffff;
 
Signature · 6 lines
1.7.8.2

--
To unsubscribe from this list: send the line "unsubscribe linux-rdma" in
the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

A message that is not in the archive (sent off-list or not yet received): 5540BC87.3020903-LDSdmyG8hGV8YrgS2mwiifqBs+8SCbDb@public.gmane.org

Applied
#2 lore raw
Quoted 8 lines · Hal Rosenstock

From: Vladimir Koushnir <vladimirk-VPRAkNaXOzVWk0Htik3J/[email protected]>
Date: Tue, 28 Apr 2015 18:35:28 +0300

In str2drpath, preserve routepath string rather than modifying it.

Thanks applied,
Ira

Quoted 45 lines
---
 src/portid.c |   11 ++++++++++-
 1 files changed, 10 insertions(+), 1 deletions(-)
src/portid.c +10 -1
index ceb685e..40754fe 100644
@@ -82,11 +82,18 @@ char *portid2str(ib_portid_t * portid)
 
 int str2drpath(ib_dr_path_t * path, char *routepath, int drslid, int drdlid)
 {
-	char *s, *str = routepath;
+	char *s, *str;
+	char *tmp;
 
 	path->cnt = -1;
 
+	if (!routepath || !(tmp = strdup(routepath)))
+		goto Exit;
+
 	DEBUG("DR str: %s", routepath);
+
+	str = tmp;
+
 	while (str && *str) {
 		if ((s = strchr(str, ',')))
 			*s = 0;
@@ -95,7 +102,9 @@ int str2drpath(ib_dr_path_t * path, char *routepath, int drslid, int drdlid)
 			break;
 		str = s + 1;
 	}
+	free(tmp);
 
+Exit:
 	path->drdlid = drdlid ? drdlid : 0xffff;
 	path->drslid = drslid ? drslid : 0xffff;
 
Signature · 6 lines
1.7.8.2

--
To unsubscribe from this list: send the line "unsubscribe linux-rdma" in
the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

--
To unsubscribe from this list: send the line "unsubscribe linux-rdma" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html