[IMPORTANT BUGFIX][ACM][XM] FIX essential security check in block-attach / indentation problem introduced in change set changeset 11572

[Reiner Sailer <sailer@us.ibm.com>]

[-- Attachment #1: Type: text/plain, Size: 548 bytes --]

This patch fixes an indentation error in main.py. The effect of this bug 
is that block-attach does not check labels if the ACM is active. This 
bug slipped in with change set 11572_:_ ad22c711ccb7 
<http://xenbits.xensource.com/xen-unstable.hg?cs=ad22c711ccb7>.

This patch is essential and should get into 3.0.3. I tested the patch 
with security off and on.

Thanks
Reiner
P.S. We are currently enhancing xm-test to include security tests so 
that we can detect simple things like this faster.

Signed-off by: Reiner Sailer <sailer@us.ibm.com>


[-- Attachment #2: block_attach_acm_fix.diff --]
[-- Type: text/plain, Size: 616 bytes --]

---
 tools/python/xen/xm/main.py |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

Index: xen-unstable.hg-shype/tools/python/xen/xm/main.py
===================================================================
--- xen-unstable.hg-shype.orig/tools/python/xen/xm/main.py
+++ xen-unstable.hg-shype/tools/python/xen/xm/main.py
@@ -1222,7 +1222,8 @@ def parse_block_configuration(args):
         label = security.get_security_printlabel(dominfo)
     else:
         label = None
-        security.res_security_check(args[1], label)
+
+    security.res_security_check(args[1], label)
 
     return (dom, vbd)
 




[-- Attachment #3: Type: text/plain, Size: 138 bytes --]

_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xensource.com
http://lists.xensource.com/xen-devel