1. 20 7月, 2010 3 次提交
    • D
      Convert all disk backing store loops to shared helper API · a8853344
      Daniel P. Berrange 提交于
      Update the QEMU cgroups code, QEMU DAC security driver, SELinux
      and AppArmour security drivers over to use the shared helper API
      virDomainDiskDefForeachPath().
      
      * src/qemu/qemu_driver.c, src/qemu/qemu_security_dac.c,
        src/security/security_selinux.c, src/security/virt-aa-helper.c:
        Convert over to use virDomainDiskDefForeachPath()
      a8853344
    • D
      Add an API for iterating over disk paths · 9d0a630f
      Daniel P. Berrange 提交于
      There is duplicated code which iterates over disk backing stores
      performing some action. Provide a convenient helper for doing
      this to eliminate duplication & risk of mistakes with disk format
      probing
      
      * src/conf/domain_conf.c, src/conf/domain_conf.h,
        src/libvirt_private.syms: Add virDomainDiskDefForeachPath()
      9d0a630f
    • D
      Require format to be passed into virStorageFileGetMetadata · bf80fc68
      Daniel P. Berrange 提交于
      Require the disk image to be passed into virStorageFileGetMetadata.
      If this is set to VIR_STORAGE_FILE_AUTO, then the format will be
      resolved using probing. This makes it easier to control when
      probing will be used
      
      * src/qemu/qemu_driver.c, src/qemu/qemu_security_dac.c,
        src/security/security_selinux.c, src/security/virt-aa-helper.c:
        Set VIR_STORAGE_FILE_AUTO when calling virStorageFileGetMetadata.
      * src/storage/storage_backend_fs.c: Probe for disk format before
        calling virStorageFileGetMetadata.
      * src/util/storage_file.h, src/util/storage_file.c: Remove format
        from virStorageFileMeta struct & require it to be passed into
        method.
      bf80fc68
  2. 19 7月, 2010 4 次提交
    • D
      Refactor virStorageFileGetMetadataFromFD to separate functionality · c70cb0f4
      Daniel P. Berrange 提交于
      The virStorageFileGetMetadataFromFD did two jobs in one. First
      it probed for storage type, then it extracted metadata for the
      type. It is desirable to be able to separate these jobs, allowing
      probing without querying metadata, and querying metadata without
      probing.
      
      To prepare for this, split out probing code into a new pair of
      methods
      
        virStorageFileProbeFormatFromFD
        virStorageFileProbeFormat
      
      * src/util/storage_file.c, src/util/storage_file.h,
        src/libvirt_private.syms: Introduce virStorageFileProbeFormat
        and virStorageFileProbeFormatFromFD
      c70cb0f4
    • D
      Remove 'type' field from FileTypeInfo struct · 779b6ea7
      Daniel P. Berrange 提交于
      Instead of including a field in FileTypeInfo struct for the
      disk format, rely on the array index matching the format.
      Use verify() to assert the correct number of elements in the
      array.
      
      * src/util/storage_file.c: remove type field from FileTypeInfo
      779b6ea7
    • D
      Extract the backing store format as well as name, if available · a93402d4
      Daniel P. Berrange 提交于
      When QEMU opens a backing store for a QCow2 file, it will
      normally auto-probe for the format of the backing store,
      rather than assuming it has the same format as the referencing
      file. There is a QCow2 extension that allows an explicit format
      for the backing store to be embedded in the referencing file.
      This closes the auto-probing security hole in QEMU.
      
      This backing store format can be useful for libvirt users
      of virStorageFileGetMetadata, so extract this data and report
      it.
      
      QEMU does not require disk image backing store files to be in
      the same format the file linkee. It will auto-probe the disk
      format for the backing store when opening it. If the backing
      store was intended to be a raw file this could be a security
      hole, because a guest may have written data into its disk that
      then makes the backing store look like a qcow2 file. If it can
      trick QEMU into thinking the raw file is a qcow2 file, it can
      access arbitrary files on the host by adding further backing
      store links.
      
      To address this, callers of virStorageFileGetMeta need to be
      told of the backing store format. If no format is declared,
      they can make a decision whether to allow format probing or
      not.
      a93402d4
    • D
      CVE-2010-2242 Apply a source port mapping to virtual network masquerading · c5678530
      Daniel P. Berrange 提交于
      IPtables will seek to preserve the source port unchanged when
      doing masquerading, if possible. NFS has a pseudo-security
      option where it checks for the source port <= 1023 before
      allowing a mount request. If an admin has used this to make the
      host OS trusted for mounts, the default iptables behaviour will
      potentially allow NAT'd guests access too. This needs to be
      stopped.
      
      With this change, the iptables -t nat -L -n -v rules for the
      default network will be
      
      Chain POSTROUTING (policy ACCEPT 95 packets, 9163 bytes)
       pkts bytes target     prot opt in     out     source               destination
         14   840 MASQUERADE  tcp  --  *      *       192.168.122.0/24    !192.168.122.0/24    masq ports: 1024-65535
         75  5752 MASQUERADE  udp  --  *      *       192.168.122.0/24    !192.168.122.0/24    masq ports: 1024-65535
          0     0 MASQUERADE  all  --  *      *       192.168.122.0/24    !192.168.122.0/24
      
      * src/network/bridge_driver.c: Add masquerade rules for TCP
        and UDP protocols
      * src/util/iptables.c, src/util/iptables.c: Add source port
        mappings for TCP & UDP protocols when masquerading.
      c5678530
  3. 16 7月, 2010 1 次提交
    • D
      RFC: Canonicalize block device paths · ae3275c0
      David Allan 提交于
      There are many naming conventions for partitions associated with a
      block device.  Some of the major ones are:
      
      /dev/foo -> /dev/foo1
      /dev/foo1 -> /dev/foo1p1
      /dev/mapper/foo -> /dev/mapper/foop1
      /dev/disk/by-path/foo -> /dev/disk/by-path/foo-part1
      
      The universe of possible conventions isn't clear.  Rather than trying
      to understand all possible conventions, this patch divides devices
      into two groups, device mapper devices and everything else.  Device
      mapper devices seem always to follow the convention of device ->
      devicep1; everything else is canonicalized.
      ae3275c0
  4. 15 7月, 2010 2 次提交
  5. 14 7月, 2010 1 次提交
  6. 13 7月, 2010 5 次提交
    • J
      cpuCompare: Fix crash on unexpected CPU XML · f5055f23
      Jiri Denemark 提交于
      When comparing a CPU without <model> element, such as
      
          <cpu>
              <topology sockets='1' cores='1' threads='1'/>
          </cpu>
      
      libvirt would happily crash without warning.
      f5055f23
    • J
      cpu: Fail when CPU type cannot be detected from XML · 517aba9f
      Jiri Denemark 提交于
      When autodetecting whether XML describes guest or host CPU, the presence
      of <arch> element is checked. If it's present, we treat the XML as host
      CPU definition. Which is right, since guest CPU definitions do not
      contain <arch> element. However, if at the same time the root <cpu>
      element contains `match' attribute, we would silently ignore it and
      still treat the XML as host CPU. We should rather refuse such invalid
      XML.
      517aba9f
    • J
      cpuCompare: Fix comparison of two host CPUs · ac3daf08
      Jiri Denemark 提交于
      When a CPU to be compared with host CPU describes a host CPU instead of
      a guest CPU, the result is incorrect. This is because instead of
      treating additional features in host CPU description as required, they
      were treated as if they were mentioned with all possible policies at the
      same time.
      ac3daf08
    • J
      qemu: Use -nodefconfig when probing for CPU models · 4677b064
      Jiri Denemark 提交于
      In case qemu supports -nodefconfig, libvirt adds uses it when launching
      new guests. Since this option may affect CPU models supported by qemu,
      we need to use it when probing for available models.
      4677b064
    • D
      Fix potential crash in QEMU monitor JSON impl · 8fa58ab3
      Daniel P. Berrange 提交于
      An indentation mistake meant that a check for return status
      was not properly performed in all cases. This could result
      in a crash on NULL pointer in a following line.
      
      * src/qemu/qemu_monitor_json.c: Fix check for return status
        when processing JSON for blockstats
      8fa58ab3
  7. 07 7月, 2010 4 次提交
  8. 03 7月, 2010 1 次提交
  9. 02 7月, 2010 3 次提交
  10. 30 6月, 2010 3 次提交
    • R
      cgroup: Fix compilation broken on MinGW due to dirent->d_type · 29da015a
      Ryota Ozaki 提交于
      As pointed out by Eric Blake, using dirent->d_type breaks
      compilation on MinGW. This patch addresses this by using
      '#if defined' as same as doing for virCgroupForDriver.
      29da015a
    • D
      Avoid invoking the qemu monitor destroy callback if the constructor fails · 8134d396
      Daniel P. Berrange 提交于
      Some, but not all, codepaths in the qemuMonitorOpen() method
      would trigger the destroy callback. The caller does not expect
      this to be invoked if construction fails, only during normal
      release of the monitor. This resulted in a possible double-unref
      of the virDomainObjPtr, because the caller explicitly unrefs
      the virDomainObjPtr  if qemuMonitorOpen() fails
      
      * src/qemu/qemu_monitor.c: Don't invoke destroy callback from
        qemuMonitorOpen() failure paths
      8134d396
    • R
      cgroup: Add missing errno == ENOENT check in virCgroupRemoveRecursively · adc796c8
      Ryota Ozaki 提交于
      ENOENT happens normally when a subsystem is enabled with any other
      subsystems and the directory of the target group has already removed
      in a prior loop. In that case, the function should just return without
      leaving an error message.
      
      NB this is the same behavior as before introducing virCgroupRemoveRecursively.
      adc796c8
  11. 29 6月, 2010 8 次提交
    • C
      Fix crash when detaching devices from qemu domains. · ec75b0cf
      Chris Lalancette 提交于
      Make sure to *not* call qemuDomainPCIAddressReleaseAddr if
      QEMUD_CMD_FLAG_DEVICE is *not* set (for older qemu).  This
      prevents a crash when trying to do device detachment from
      a qemu guest.
      Signed-off-by: NChris Lalancette <clalance@redhat.com>
      ec75b0cf
    • C
      Check for active PCI devices when doing nodedevice operations. · 53a1db4d
      Chris Lalancette 提交于
      In the current libvirt PCI code, there is no checking whether
      a PCI device is in use by a guest when doing node device
      detach or reattach.  This causes problems when a device is
      assigned to a guest, and the administrator starts issuing
      nodedevice commands.  Make it so that we check the list
      of active devices when trying to detach/reattach, and only
      allow the operation if the device is not assigned to a guest.
      Signed-off-by: NChris Lalancette <clalance@redhat.com>
      53a1db4d
    • E
      virFileResolveLink: guarantee an absolute path · db1fbbd8
      Eric Blake 提交于
      https://bugzilla.redhat.com/show_bug.cgi?id=608092
      
      * src/util/util.c (virFileResolveLink): Use
      canonicalize_file_name, rather than areadlink.
      db1fbbd8
    • E
      phyp: don't steal storage management from other drivers · 5b26f2d8
      Eric Blake 提交于
      Fix regression introduced in commit a4a28724 - basically, the
      phyp storage driver should only accept the same URIs that the
      main phyp driver is willing to accept.  Blindly accepting all
      URIs meant that the phyp storage driver was being consulted for
      'virsh -c qemu:///session pool-list --all', rather than the
      qemu storage driver, then since the URI was not for phyp, attempts
      to then use the phyp driver crashed because it was not initialized.
      
      * src/phyp/phyp_driver.c (phypStorageOpen): Only accept connections
      already open to a phyp driver.
      5b26f2d8
    • L
      Avoid calling virStorageFileIsSharedFS with NULL · 11a70602
      Laine Stump 提交于
      This code was just recently added (by me) and didn't account for the
      fact that stdin_path is sometimes NULL. If it's NULL, and
      SetSecurityAllLabel fails, a segfault would result.
      11a70602
    • R
      lxc: Fix virsh console doesn't work after restarting libvirtd · 1c46f4cc
      Ryota Ozaki 提交于
      Because tty path is unexpectedly not saved in the live configuration
      file of a domain, libvirtd cannot get the console of the domain back
      after restarting.
      
      The reason why the tty path isn't saved is that, to save the tty path,
      the save function, virDomainSaveConfig, requires that the target domain
      is running (pid != -1), however, lxc driver calls the function before
      starting the domain to pass the configuration to controller.
      
      To ensure to save the tty path, the patch lets lxc driver call the save
      function again after starting the domain.
      1c46f4cc
    • R
      lxc: Fix error handlings in lxcContainerRenameAndEnableInterfaces · df8225ac
      Ryota Ozaki 提交于
      The function is expected to return negative value on failure,
      however, it returns positive value when either setInterfaceName
      or vethInterfaceUpOrDown fails. Because the function returns
      the return value of either as is, however, the two functions
      may return positive value on failure.
      
      The patch fixes the defects and add error messages.
      df8225ac
    • R
      lxc: Change VIR_ERROR to VIR_DEBUG for just a debugging message · b3a96d90
      Ryota Ozaki 提交于
      The message is actually not of error but of debugging.
      02:22:56.091: error : lxcControllerMain:316 : monitor=3 client=4 appPty=19 contPty=7
      b3a96d90
  12. 28 6月, 2010 4 次提交
    • L
      Selectively ignore domainSetSecurityAllLabel failure in domain restore · 06f81c63
      Laine Stump 提交于
      When the saved domain image is on an NFS share, at least some part of
      domainSetSecurityAllLabel will fail (for example, selinux labels can't
      be modified). To allow domain restore to still work in this case, just
      ignore the errors.
      06f81c63
    • L
      use virStorageFileIsSharedFS utility function in qemudDomainSaveFlag · f35a9fc1
      Laine Stump 提交于
      Previously, this function had it's own bit of code performing the same
      function. Since there's now an equivalent utility function, let's use it.
      f35a9fc1
    • L
      Enhance virStorageFileIsSharedFS · fb457c5c
      Laine Stump 提交于
      virStorageFileIsSharedFS would previously only work if the entire path
      in question was stat'able by the uid of the libvirtd process. This
      patch changes it to crawl backwards up the path retrying the statfs
      call until it gets to a partial path that *can* be stat'ed.
      
      This is necessary to use the function to learn the fstype for files
      stored as a different user (and readable only by that user) on a
      root-squashed remote filesystem.
      fb457c5c
    • L
      Set proper selinux label on image file during qemu domain restore · 590c9c9a
      Laine Stump 提交于
      Also restore the label to its original value after qemu is finished
      with the file.
      
      Prior to this patch, qemu domain restore did not function properly if
      selinux was set to enforce.
      590c9c9a
  13. 25 6月, 2010 1 次提交
    • D
      Don't squash file permissions when migration fails · 6d974315
      Daniel P. Berrange 提交于
      If an active migration operation fails, or is cancelled by the
      admin, the QEMU on the destination is shutdown and the one on
      the source continues running. It is important in shutting down
      the QEMU on the destination, the security drivers don't reset
      the file labelling/permissions.
      
      * src/qemu/qemu_driver.c: Don't reset labelling/permissions
        on migration abort
      6d974315