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

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