aboutsummaryrefslogtreecommitdiff
path: root/net
diff options
context:
space:
mode:
authorAndrew Baumann <Andrew.Baumann@microsoft.com>2015-11-18 11:45:08 -0800
committerJason Wang <jasowang@redhat.com>2015-11-27 10:39:55 +0800
commitee0428e3acd237e4d555cc54134cea473cab5ee7 (patch)
tree32f3fbdba52121f3e8814a30f373a5fc4c43de6d /net
parent00837731d254908a841d69298a4f9f077babaf24 (diff)
downloadqemu-ee0428e3acd237e4d555cc54134cea473cab5ee7.zip
qemu-ee0428e3acd237e4d555cc54134cea473cab5ee7.tar.gz
qemu-ee0428e3acd237e4d555cc54134cea473cab5ee7.tar.bz2
tap-win32: skip unexpected nodes during registry enumeration
In order to find a named tap device, get_device_guid() enumerates children of HKLM\SYSTEM\CCS\Control\Network\{4D36E972-E325-11CE-BFC1-08002BE10318} (aka NETWORK_CONNECTIONS_KEY). For each child, it then looks for a "Connection" subkey, but if this key doesn't exist, it aborts the entire search. This was observed to fail on at least one Windows 10 machine, where there is an additional child of NETWORK_CONNECTIONS_KEY (named "Descriptions"). Since registry enumeration doesn't guarantee any particular sort order, we should continue to search for matching children rather than aborting the search. Signed-off-by: Andrew Baumann <Andrew.Baumann@microsoft.com> Reviewed-by: Stefan Weil <sw@weilnetz.de> Signed-off-by: Jason Wang <jasowang@redhat.com>
Diffstat (limited to 'net')
-rw-r--r--net/tap-win32.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/net/tap-win32.c b/net/tap-win32.c
index 4e2fa55..5e5d6db 100644
--- a/net/tap-win32.c
+++ b/net/tap-win32.c
@@ -356,7 +356,8 @@ static int get_device_guid(
&len);
if (status != ERROR_SUCCESS || name_type != REG_SZ) {
- return -1;
+ ++i;
+ continue;
}
else {
if (is_tap_win32_dev(enum_name)) {