Attachment 601803 Details for Bug 845106 – Patch for CVE-2012-3447 for essex

[patch] Patch for CVE-2012-3447 for essex

CVE-2012-3447-essex.patch (text/plain), 1.93 KB, created by Kurt Seifried on 2012-08-01 19:17:13 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Kurt Seifried

Created: 2012-08-01 19:17:13 UTC

Size: 1.93 KB

patch

obsolete

>From 2c34ec472ed586eff0bebc8adec9b4bef112656d Mon Sep 17 00:00:00 2001
>From: =?UTF-8?q?P=C3=A1draig=20Brady?= <pbrady@redhat.com>
>Date: Tue, 31 Jul 2012 14:05:35 +0100
>Subject: [PATCH] Prohibit file injection writing to host filesystem
>
>This is a refinement of the previous fix in commit 2427d4a9,
>which does the file name canonicalization as the root user.
>This is required so that guest images could not for example,
>protect malicious symlinks in a directory only readable by root.
>
>Change-Id: I7f7cdeeffadebae7451e1e13f73f1313a7df9c5c
>---
> nova/rootwrap/compute.py |    4 ++++
> nova/virt/disk/api.py    |    4 +++-
> 2 files changed, 7 insertions(+), 1 deletions(-)
>
>diff --git a/nova/rootwrap/compute.py b/nova/rootwrap/compute.py
>index a3d7ec0..d28d3a0 100755
>--- a/nova/rootwrap/compute.py
>+++ b/nova/rootwrap/compute.py
>@@ -189,6 +189,10 @@ filterlist = [
>     # nova/virt/libvirt/utils.py: 'qemu-img'
>     filters.CommandFilter("/usr/bin/qemu-img", "root"),
> 
>+    # nova/virt/disk/api.py: 'readlink', '-e'
>+    filters.CommandFilter("/usr/bin/readlink", "root"),
>+    filters.CommandFilter("/bin/readlink", "root"),
>+
>     # nova/virt/disk/api.py: 'touch', target
>     filters.CommandFilter("/usr/bin/touch", "root"),
> 
>diff --git a/nova/virt/disk/api.py b/nova/virt/disk/api.py
>index 04feb76..06c8ca7 100644
>--- a/nova/virt/disk/api.py
>+++ b/nova/virt/disk/api.py
>@@ -314,7 +314,9 @@ def _join_and_check_path_within_fs(fs, *args):
>     mounted guest fs.  Trying to be clever and specifying a
>     path with '..' in it will hit this safeguard.
>     '''
>-    absolute_path = os.path.realpath(os.path.join(fs, *args))
>+    absolute_path, _err = utils.execute('readlink', '-m',
>+                                        os.path.join(fs, *args),
>+                                        run_as_root=True)
>     if not absolute_path.startswith(os.path.realpath(fs) + '/'):
>         raise exception.Invalid(_('injected file path not valid'))
>     return absolute_path
>-- 
>1.7.6.4
>

Actions: View | Diff

Attachments on bug 845106: 601803 | 601804