mirror of
https://github.com/xen-project/xen.git
synced 2026-10-28 10:11:27 +01:00
xenconsole: Fix pty handling
I printed the terminal attributes after openpty() and they were garbage on the first console, valid on the second etc. openpty() gets garbage in (uninitialized attributes MODIFIED by cfmakeraw()). It sets the slave to the attributes requested. Using uninitialized data for cfmakeraw->openpty results in pty attributes that may even have the receiver disabled. Closing the slave just hides the bug as these attributes disappear and hope the slave will be reopened and initialized. From: Juergen Hannken-Illjes <hannken@netbsd.org> Signed-off-by: Christoph Egger <Christoph.Egger@amd.com>
This commit is contained in:
1 parent
fecfa97c11
commit
8bb2359cd7
1 file changed
+17
-11
+17
-11
@@ -402,9 +402,7 @@ static int domain_create_tty(struct domain *dom)
|
||||
assert(dom->slave_fd == -1);
|
||||
assert(dom->master_fd == -1);
|
||||
|
||||
cfmakeraw(&term);
|
||||
|
||||
if (openpty(&dom->master_fd, &dom->slave_fd, NULL, &term, NULL) < 0) {
|
||||
if (openpty(&dom->master_fd, &dom->slave_fd, NULL, NULL, NULL) < 0) {
|
||||
err = errno;
|
||||
dolog(LOG_ERR, "Failed to create tty for domain-%d "
|
||||
"(errno = %i, %s)",
|
||||
@@ -412,6 +410,22 @@ static int domain_create_tty(struct domain *dom)
|
||||
return 0;
|
||||
}
|
||||
|
||||
if (tcgetattr(dom->slave_fd, &term) < 0) {
|
||||
err = errno;
|
||||
dolog(LOG_ERR, "Failed to get tty attributes for domain-%d "
|
||||
"(errno = %i, %s)",
|
||||
dom->domid, err, strerror(err));
|
||||
goto out;
|
||||
}
|
||||
cfmakeraw(&term);
|
||||
if (tcsetattr(dom->slave_fd, TCSANOW, &term) < 0) {
|
||||
err = errno;
|
||||
dolog(LOG_ERR, "Failed to set tty attributes for domain-%d "
|
||||
"(errno = %i, %s)",
|
||||
dom->domid, err, strerror(err));
|
||||
goto out;
|
||||
}
|
||||
|
||||
if ((slave = ptsname(dom->master_fd)) == NULL) {
|
||||
err = errno;
|
||||
dolog(LOG_ERR, "Failed to get slave name for domain-%d "
|
||||
@@ -420,14 +434,6 @@ static int domain_create_tty(struct domain *dom)
|
||||
goto out;
|
||||
}
|
||||
|
||||
/* Close the slave fd or the guest console output disappears,
|
||||
* otherwise.
|
||||
*/
|
||||
if (dom->slave_fd != -1) {
|
||||
close(dom->slave_fd);
|
||||
dom->slave_fd = -1;
|
||||
}
|
||||
|
||||
if (dom->use_consolepath) {
|
||||
success = asprintf(&path, "%s/limit", dom->conspath) !=
|
||||
-1;
|
||||
|
||||