mirror of
https://github.com/xen-project/xen.git
synced 2026-10-28 02:01:24 +01:00
xl: 'xl vncviewer' accesses port 0 by any invalid domid
Currently, with command: xl vncviewer invalid_domid it always brings user to the domU using vncport 5900. The invalid domid could be an non-existing one or Dom0. It's better to report error in this case. Correct libxl_vncviewer_exec: In existing code, when vncport is NULL, it still continues and will show vncport 5900. So, with 'xl vncviewer 0' it also wrongly shows domU using vncport 5900. Correct it to report error if vncport is NULL. Signed-off-by: Chunyan Liu <cyliu@suse.com> Acked-by: Ian Campbell <ian.campbell@citrix.com>
This commit is contained in:
1 parent
1ae93d3db8
commit
2a8cc1a553
1 file changed
+6
-2
+6
-2
@@ -1719,8 +1719,12 @@ int libxl_vncviewer_exec(libxl_ctx *ctx, uint32_t domid, int autopass)
|
||||
vnc_port = libxl__xs_read(gc, XBT_NULL,
|
||||
libxl__sprintf(gc,
|
||||
"/local/domain/%d/console/vnc-port", domid));
|
||||
if ( vnc_port )
|
||||
port = atoi(vnc_port) - 5900;
|
||||
if (!vnc_port) {
|
||||
LOG(ERROR, "Cannot get vnc-port of domain %d", domid);
|
||||
goto x_fail;
|
||||
}
|
||||
|
||||
port = atoi(vnc_port) - 5900;
|
||||
|
||||
vnc_listen = libxl__xs_read(gc, XBT_NULL,
|
||||
libxl__sprintf(gc,
|
||||
|
||||