Blame SOURCES/nfs-utils-1.3.0-gssd-thread-safe.patch

64c563
diff --git a/utils/gssd/gssd_proc.c b/utils/gssd/gssd_proc.c
64c563
index 646d7e3..14cf7b8 100644
64c563
--- a/utils/gssd/gssd_proc.c
64c563
+++ b/utils/gssd/gssd_proc.c
64c563
@@ -728,10 +728,18 @@ handle_gssd_upcall(struct clnt_upcall_info *info)
64c563
 	char			*target = NULL;
64c563
 	char			*service = NULL;
64c563
 	char			*enctypes = NULL;
64c563
+	char			*upcall_str;
64c563
+	char			*pbuf = info->lbuf;
64c563
 
64c563
 	printerr(2, "\n%s: '%s' (%s)\n", __func__, info->lbuf, clp->relpath);
64c563
 
64c563
-	for (p = strtok(info->lbuf, " "); p; p = strtok(NULL, " ")) {
64c563
+	upcall_str = strdup(info->lbuf);
64c563
+	if (upcall_str == NULL) {
64c563
+		printerr(0, "ERROR: malloc failure\n");
64c563
+		goto out_nomem;
64c563
+	}
64c563
+
64c563
+	while ((p = strsep(&pbuf, " "))) {
64c563
 		if (!strncmp(p, "mech=", strlen("mech=")))
64c563
 			mech = p + strlen("mech=");
64c563
 		else if (!strncmp(p, "uid=", strlen("uid=")))
64c563
@@ -747,7 +755,7 @@ handle_gssd_upcall(struct clnt_upcall_info *info)
64c563
 	if (!mech || strlen(mech) < 1) {
64c563
 		printerr(0, "WARNING: handle_gssd_upcall: "
64c563
 			    "failed to find gss mechanism name "
64c563
-			    "in upcall string '%s'\n", info->lbuf);
64c563
+			    "in upcall string '%s'\n", upcall_str);
64c563
 		goto out;
64c563
 	}
64c563
 
64c563
@@ -760,7 +768,7 @@ handle_gssd_upcall(struct clnt_upcall_info *info)
64c563
 	if (!uidstr) {
64c563
 		printerr(0, "WARNING: handle_gssd_upcall: "
64c563
 			    "failed to find uid "
64c563
-			    "in upcall string '%s'\n", info->lbuf);
64c563
+			    "in upcall string '%s'\n", upcall_str);
64c563
 		goto out;
64c563
 	}
64c563
 
64c563
@@ -773,7 +781,7 @@ handle_gssd_upcall(struct clnt_upcall_info *info)
64c563
 	if (target && strlen(target) < 1) {
64c563
 		printerr(0, "WARNING: handle_gssd_upcall: "
64c563
 			 "failed to parse target name "
64c563
-			 "in upcall string '%s'\n", info->lbuf);
64c563
+			 "in upcall string '%s'\n", upcall_str);
64c563
 		goto out;
64c563
 	}
64c563
 
64c563
@@ -788,7 +796,7 @@ handle_gssd_upcall(struct clnt_upcall_info *info)
64c563
 	if (service && strlen(service) < 1) {
64c563
 		printerr(0, "WARNING: handle_gssd_upcall: "
64c563
 			 "failed to parse service type "
64c563
-			 "in upcall string '%s'\n", info->lbuf);
64c563
+			 "in upcall string '%s'\n", upcall_str);
64c563
 		goto out;
64c563
 	}
64c563
 
64c563
@@ -801,6 +809,8 @@ handle_gssd_upcall(struct clnt_upcall_info *info)
64c563
 		do_error_downcall(clp->gssd_fd, uid, -EACCES);
64c563
 	}
64c563
 out:
64c563
+	free(upcall_str);
64c563
+out_nomem:
64c563
 	free(info);
64c563
 	return;
64c563
 }