Attachment 684893 Details for Bug 902629 – essex-CVE-2013-0208-1069904.patch

[patch] essex-CVE-2013-0208-1069904.patch

essex-CVE-2013-0208-1069904.patch (text/plain), 2.14 KB, created by Kurt Seifried on 2013-01-22 06:51:55 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Kurt Seifried

Created: 2013-01-22 06:51:55 UTC

Size: 2.14 KB

patch

obsolete

>commit 7d72c6e24a1485c9cbb39c8db336c97175ac06b0
>Author: Michael Still <mikal@stillhq.com>
>Date:   Sun Dec 16 11:51:26 2012 +1100
>
>    Backport patch for 1069904 to essex.
>    
>    Change-Id: Ic14b5f69534ecea65ff3236a7dea09634a80e4a0
>
>diff --git a/nova/compute/api.py b/nova/compute/api.py
>index f64a10c..8506be3 100644
>--- a/nova/compute/api.py
>+++ b/nova/compute/api.py
>@@ -390,6 +390,20 @@ class API(BaseAPI):
> 
>         LOG.debug(_("Going to run %s instances...") % num_instances)
> 
>+        # Validate our use of the block devices
>+        for bdm in block_device_mapping:
>+            # NOTE(vish): For now, just make sure the volumes are accessible.
>+            if bdm.get('snapshot_id') is not None and bdm['volume_id'] is None:
>+                try:
>+                    self.volume_api.get_snapshot(context, bdm['snapshot_id'])
>+                except Exception:
>+                    raise exception.InvalidBDMSnapshot(id=bdm['snapshot_id'])
>+            elif bdm['volume_id'] is not None:
>+                try:
>+                    self.volume_api.get(context, bdm['volume_id'])
>+                except Exception:
>+                    raise exception.InvalidBDMVolume(id=bdm['volume_id'])
>+
>         if create_instance_here:
>             instance = self.create_db_entry_for_new_instance(
>                     context, instance_type, image, base_options,
>diff --git a/nova/exception.py b/nova/exception.py
>index 107d926..5a9aa9e 100644
>--- a/nova/exception.py
>+++ b/nova/exception.py
>@@ -309,6 +309,24 @@ class InstanceInvalidState(Invalid):
>                 "%(method)s while the instance is in this state.")
> 
> 
>+class InvalidBDM(Invalid):
>+    message = _("Block Device Mapping is Invalid.")
>+
>+
>+class InvalidBDMSnapshot(InvalidBDM):
>+    message = _("Block Device Mapping is Invalid: "
>+                "failed to get snapshot %(id)s.")
>+
>+
>+class InvalidBDMVolume(InvalidBDM):
>+    message = _("Block Device Mapping is Invalid: "
>+                "failed to get volume %(id)s.")
>+
>+
>+class InvalidSnapshot(Invalid):
>+    message = _("Invalid snapshot") + ": %(reason)s"
>+
>+
> class InstanceNotRunning(Invalid):
>     message = _("Instance %(instance_id)s is not running.")
>

Actions: View | Diff

Attachments on bug 902629: 684893 | 684894 | 687206 | 687207