File openssh-4.6p1-untrusted-cookie-CVE-2007-4752.diff of Package openssh

Overview Repositories Revisions Requests Users Attributes Meta

File openssh-4.6p1-untrusted-cookie-CVE-2007-4752.diff of Package openssh (Revision fc31447a4e55c7fc245f4cdac819cb8c)

Currently displaying revision fc31447a4e55c7fc245f4cdac819cb8c , Show latest

--- clientloop.c
+++ clientloop.c
@@ -290,19 +290,29 @@
 					generated = 1;
 			}
 		}
-		snprintf(cmd, sizeof(cmd),
-		    "%s %s%s list %s 2>" _PATH_DEVNULL,
-		    xauth_path,
-		    generated ? "-f " : "" ,
-		    generated ? xauthfile : "",
-		    display);
-		debug2("x11_get_proto: %s", cmd);
-		f = popen(cmd, "r");
-		if (f && fgets(line, sizeof(line), f) &&
-		    sscanf(line, "%*s %511s %511s", proto, data) == 2)
-			got_data = 1;
-		if (f)
-			pclose(f);
+
+		/*
+		 * When in untrusted mode, we read the cookie only if it was
+		 * successfully generated as an untrusted one in the step
+		 * above.
+		 */
+		if (trusted || generated) {
+			snprintf(cmd, sizeof(cmd),
+			    "%s %s%s list %s 2>" _PATH_DEVNULL,
+			    xauth_path,
+			    generated ? "-f " : "" ,
+			    generated ? xauthfile : "",
+			    display);
+			debug2("x11_get_proto: %s", cmd);
+			f = popen(cmd, "r");
+			if (f && fgets(line, sizeof(line), f) &&
+			    sscanf(line, "%*s %511s %511s", proto, data) == 2)
+				got_data = 1;
+			if (f)
+				pclose(f);
+		} else
+			error("Warning: untrusted X11 forwarding setup failed: "
+			    "xauth key data not generated");
 	}
 
 	if (do_unlink) {

Places

File openssh-4.6p1-untrusted-cookie-CVE-2007-4752.diff of Package openssh (Revision fc31447a4e55c7fc245f4cdac819cb8c)

Places