search for: windows_systemroot

...git a/src/inspect-apps.c b/src/inspect-apps.c index e9f020a..f65c70a 100644 --- a/src/inspect-apps.c +++ b/src/inspect-apps.c @@ -418,12 +418,9 @@ list_applications_windows (guestfs_h *g, struct inspect_fs *fs) snprintf (software, len, "%s/system32/config/software", fs->windows_systemroot); - char *software_path = guestfs___case_sensitive_path_silently (g, software); - if (!software_path) { - /* Missing software hive is a problem. */ - error (g, "no HKLM\\SOFTWARE hive found in the guest"); + char *software_path = guestfs_case_sensitive_path (g, software); + if...

...ajor_version; + dst->minor_version = src->minor_version; + } + + if (dst->arch == NULL) { + dst->arch = src->arch; + src->arch = NULL; + } + + if (dst->hostname == NULL) { + dst->hostname = src->hostname; + src->hostname = NULL; + } + + if (dst->windows_systemroot == NULL) { + dst->windows_systemroot = src->windows_systemroot; + src->windows_systemroot = NULL; + } + + if (dst->windows_current_control_set == NULL) { + dst->windows_current_control_set = src->windows_current_control_set; + src->windows_current_control_set = NU...

This change refactors guestfs___has_windows_systemroot to guestfs___get_windows_systemroot. The new function returns a dynamically allocated char * which must be freed. The new function is no less efficient than before, as it returns the result of guestfs___case_sensitive_path_silently, which is required anyway. The new code is slightly more efficient...

...ajor_version; + dst->minor_version = src->minor_version; + } + + if (dst->arch == NULL) { + dst->arch = src->arch; + src->arch = NULL; + } + + if (dst->hostname == NULL) { + dst->hostname = src->hostname; + src->hostname = NULL; + } + + if (dst->windows_systemroot == NULL) { + dst->windows_systemroot = src->windows_systemroot; + src->windows_systemroot = NULL; + } + + if (dst->windows_current_control_set == NULL) { + dst->windows_current_control_set = src->windows_current_control_set; + src->windows_current_control_set = NU...

Proposed patches to fix https://bugzilla.redhat.com/show_bug.cgi?id=858126

Various changes/fixes to use smaller stack frames. Rich.

...+ mutable package_management : package_management option; + mutable product_name : string option; + mutable product_variant : string option; + mutable version : version option; + mutable arch : string option; + mutable hostname : string option; + mutable fstab : fstab_entry list; + mutable windows_systemroot : string option; + mutable windows_software_hive : string option; + mutable windows_system_hive : string option; + mutable windows_current_control_set : string option; + mutable drive_mappings : drive_mapping list; +} +and os_type = + | OS_TYPE_DOS + | OS_TYPE_FREEBSD + | OS_TYPE_HURD + | O...

...s both the static and dynamic usage (alloca and variable length arrays). Multiple changes are made throughout the code to reduce frames to fit within these new limits. Note that stack allocation of large strings can be a security issue. For example, we had code like: size_t len = strlen (fs->windows_systemroot) + 64; char software[len]; snprintf (software, len, "%s/system32/config/software", fs->windows_systemroot); where fs->windows_systemroot is guest controlled. It's not clear what the effects might be of allowing the guest to allocate potentially very large stack fr...

...oca and variable length arrays). > > Multiple changes are made throughout the code to reduce frames to fit > within these new limits. > > Note that stack allocation of large strings can be a security issue. > For example, we had code like: > > size_t len = strlen (fs->windows_systemroot) + 64; > char software[len]; > snprintf (software, len, "%s/system32/config/software", > fs->windows_systemroot); > > where fs->windows_systemroot is guest controlled. It's not clear what > the effects might be of allowing the guest to allocate p...

...estfs_h *g, const void *blob); /* XXX Handling of boot.ini in the Perl version was pretty broken. It * essentially didn't do anything for modern Windows guests. @@ -386,6 +389,7 @@ check_windows_system_registry (guestfs_h *g, struct inspect_fs *fs) int r; size_t len = strlen (fs->windows_systemroot) + 64; char system[len]; + char gpt_prefix[] = "DMIO:ID:"; snprintf (system, len, "%s/system32/config/system", fs->windows_systemroot); @@ -493,9 +497,14 @@ check_windows_system_registry (guestfs_h *g, struct inspect_fs *fs) type = guestfs_hivex...

...estfs_h *g, const void *blob); /* XXX Handling of boot.ini in the Perl version was pretty broken. It * essentially didn't do anything for modern Windows guests. @@ -386,6 +389,7 @@ check_windows_system_registry (guestfs_h *g, struct inspect_fs *fs) int r; size_t len = strlen (fs->windows_systemroot) + 64; char system[len]; + char gpt_prefix[] = "DMIO:ID:"; snprintf (system, len, "%s/system32/config/system", fs->windows_systemroot); @@ -490,12 +494,18 @@ check_windows_system_registry (guestfs_h *g, struct inspect_fs *fs) CLEANUP_FREE char *bl...

...deletion(-) diff --git a/src/inspect-fs-windows.c b/src/inspect-fs-windows.c index ba72727..5adf145 100644 --- a/src/inspect-fs-windows.c +++ b/src/inspect-fs-windows.c @@ -389,7 +389,7 @@ check_windows_system_registry (guestfs_h *g, struct inspect_fs *fs) int r; size_t len = strlen (fs->windows_systemroot) + 64; char system[len]; - char gpt_prefix[] = "DMIO:ID:"; + const char gpt_prefix[] = "DMIO:ID:"; snprintf (system, len, "%s/system32/config/system", fs->windows_systemroot); -- 2.5.0

...t;windows</name> - <arch>x86_64</arch> - <distro>windows</distro> - <product_name>Windows Server 2003 Enterprise x64 Edition</product_name> - <major_version>5</major_version> - <minor_version>2</minor_version> - <windows_systemroot>\WINDOWS</windows_systemroot> - <format>installer</format> - <mountpoints> - <mountpoint dev="/dev/sda">/</mountpoint> - </mountpoints> - <filesystems> - <filesystem dev="/dev/sda"> - <type&...

The current location doesn't exist unless you've installed GNOME, which is not so common on Ubuntu. Unfortunately I couldn't find any other location containing a clean, high quality logo. This adds another low quality icon source, and also prevents any icon being returned if the highquality flag was set (note this prevents virt-manager from displaying an icon, but there's nothing

...> > /* XXX Handling of boot.ini in the Perl version was pretty broken. It > * essentially didn't do anything for modern Windows guests. > @@ -386,6 +389,7 @@ check_windows_system_registry (guestfs_h *g, struct inspect_fs *fs) > int r; > size_t len = strlen (fs->windows_systemroot) + 64; > char system[len]; > + char gpt_prefix[] = "DMIO:ID:"; > snprintf (system, len, "%s/system32/config/system", > fs->windows_systemroot); > > @@ -493,9 +497,14 @@ check_windows_system_registry (guestfs_h *g, struct inspect_fs *fs)...

...data.hostname; if data.fstab <> [] then ( let v = List.map ( fun (a, b) -> sprintf "(%s, %s)" (Mountable.to_string a) b ) data.fstab in bpf " fstab: [%s]\n" (String.concat ", " v) ); - may (fun v -> bpf " windows_systemroot: %s\n" v) - data.windows_systemroot; - may (fun v -> bpf " windows_software_hive: %s\n" v) - data.windows_software_hive; - may (fun v -> bpf " windows_system_hive: %s\n" v) - data.windows_system_hive; - may (fun v -> bpf " windows_cu...

...estfs_h *g, const void *blob); /* XXX Handling of boot.ini in the Perl version was pretty broken. It * essentially didn't do anything for modern Windows guests. @@ -386,6 +389,7 @@ check_windows_system_registry (guestfs_h *g, struct inspect_fs *fs) int r; size_t len = strlen (fs->windows_systemroot) + 64; char system[len]; + char gpt_prefix[] = "DMIO:ID:"; snprintf (system, len, "%s/system32/config/system", fs->windows_systemroot); @@ -490,12 +494,18 @@ check_windows_system_registry (guestfs_h *g, struct inspect_fs *fs) CLEANUP_FREE char *bl...

...i in the Perl version was pretty > > broken.  It > >   * essentially didn't do anything for modern Windows guests. > > @@ -386,6 +389,7 @@ check_windows_system_registry (guestfs_h *g, > > struct inspect_fs *fs) > >    int r; > >    size_t len = strlen (fs->windows_systemroot) + 64; > >    char system[len]; > > +  char gpt_prefix[] = "DMIO:ID:"; > >    snprintf (system, len, "%s/system32/config/system", > >              fs->windows_systemroot); > >   > > @@ -493,9 +497,14 @@ check_windows_system_registry (guestf...

...i = > + let oem_inf = sprintf "oem%d.inf" i in > + if not (g#exists ("/Windows/Inf/" ^ oem_inf)) then oem_inf else loop (i+1) > + in This bit doesn't match what is described in the comment. It's also incorrect for a few reasons: - It should use windows_systemroot, instead of "/Windows" - It doesn't handle case sensitive path stuff Do we still need to check for the registry key? (I have no idea) > + let oem_inf = loop 1 in > + (* Create the key. *) > + g#hivex_node_set_value node oem_inf (* REG_NONE *) 0_L ""; &...

This patch series changes a small part of the library to use __attribute__((cleanup(...))) to automatically free memory when pointers go out of the current scope. In general terms this seems to be a small win although you do have to use it carefully. For functions where you can completely get rid of the "exit code paths", it can simplify things. For a good example, see the