[Pkg-xen-changes] [xen] 26/70: arm: rate-limit logging from unimplemented PHYSDEVOP and HVMOP.

[Ian James Campbell]

This is an automated email from the git hooks/post-receive script.

ijc pushed a commit to branch feature/bug805508
in repository xen.

commit 22f46f69b330f779b7b2a8fc862270dacb6164ff
Author: Ian Campbell <ian.campbell at citrix.com>
Date:   Thu Oct 29 13:47:10 2015 +0100

    arm: rate-limit logging from unimplemented PHYSDEVOP and HVMOP.
    
    These are guest accessible and should therefore be rate-limited.
    Moreover, include them only in debug builds.
    
    This is CVE-2015-7813 / XSA-146.
    
    Signed-off-by: Ian Campbell <ian.campbell at citrix.com>
    Reviewed-by: Jan Beulich <jbeulich at suse.com>
    master commit: 1c0e59ff15764e7b0c59282365974f5b8924ce83
    master date: 2015-10-29 13:33:38 +0100
    
    (cherry picked from commit b18d995ca341d07a38fec04aa137e9ef85ee4dd0)
    
    Patch-Name: CVE-2015-7813.diff
---
 xen/arch/arm/hvm.c     | 2 +-
 xen/arch/arm/physdev.c | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/xen/arch/arm/hvm.c b/xen/arch/arm/hvm.c
index 471c4cd..5fd0753 100644
--- a/xen/arch/arm/hvm.c
+++ b/xen/arch/arm/hvm.c
@@ -57,7 +57,7 @@ long do_hvm_op(unsigned long op, XEN_GUEST_HANDLE_PARAM(void) arg)
 
     default:
     {
-        printk("%s: Bad HVM op %ld.\n", __func__, op);
+        gdprintk(XENLOG_DEBUG, "HVMOP op=%lu: not implemented\n", op);
         rc = -ENOSYS;
         break;
     }
diff --git a/xen/arch/arm/physdev.c b/xen/arch/arm/physdev.c
index 61b4a18..27bbbda 100644
--- a/xen/arch/arm/physdev.c
+++ b/xen/arch/arm/physdev.c
@@ -8,12 +8,13 @@
 #include <xen/types.h>
 #include <xen/lib.h>
 #include <xen/errno.h>
+#include <xen/sched.h>
 #include <asm/hypercall.h>
 
 
 int do_physdev_op(int cmd, XEN_GUEST_HANDLE_PARAM(void) arg)
 {
-    printk("%s %d cmd=%d: not implemented yet\n", __func__, __LINE__, cmd);
+    gdprintk(XENLOG_DEBUG, "PHYSDEVOP cmd=%d: not implemented\n", cmd);
     return -ENOSYS;
 }
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-xen/xen.git