validates device parameter for attach-volume

1 files changed, 4 insertions, 0 deletions

diff --git a/nova/api/ec2/cloud.py b/nova/api/ec2/cloud.py
index 784697b01..07229dd73 100644
--- a/nova/api/ec2/cloud.py
+++ b/nova/api/ec2/cloud.py
@@ -25,6 +25,7 @@ datastore.
 import base64
 import datetime
 import logging
+import re
 import os
 import time
 
@@ -519,6 +520,9 @@ class CloudController(object):
 
     def attach_volume(self, context, volume_id, instance_id, device, **kwargs):
         volume_ref = db.volume_get_by_ec2_id(context, volume_id)
+        if not re.match("^/dev/[a-z]d[a-z]+$", device):
+            raise exception.ApiError("Invalid device specified: %s. "
+                                     "Example device: /dev/vdb" % device)
         # TODO(vish): abstract status checking?
         if volume_ref['status'] != "available":
             raise exception.ApiError("Volume status must be available")