[Xen-changelog] [xen-unstable] x86: fix memset(ptr, 0, sizeof ptr).

[Xen patchbot-unstable <patchbot@xxxxxxx>]

# HG changeset patch
# User Tim Deegan <tim@xxxxxxx>
# Date 1334146233 -3600
# Node ID d5f9005dfc4ac2edb444e342a427dbe0f2cdf2f5
# Parent  2badbf64a582ed62f39ca465c189f759c67350c8
x86: fix memset(ptr, 0, sizeof ptr).

Signed-off-by: Tim Deegan <tim@xxxxxxx>
Acked-by: Jan Beulich <jbeulich@xxxxxxxx>
Acked-by: Christoph Egger <Christoph.Egger@xxxxxxx>
Acked-by: Keir Fraser <keir@xxxxxxx>
Committed-by: Tim Deegan <tim@xxxxxxx>
---


diff -r 2badbf64a582 -r d5f9005dfc4a xen/arch/x86/cpu/mcheck/amd_f10.c
--- a/xen/arch/x86/cpu/mcheck/amd_f10.c Wed Apr 11 13:10:33 2012 +0100
+++ b/xen/arch/x86/cpu/mcheck/amd_f10.c Wed Apr 11 13:10:33 2012 +0100
@@ -73,9 +73,9 @@ amd_f10_handler(struct mc_info *mi, uint
                return NULL;
        }
 
-       memset(mc_ext, 0, sizeof(mc_ext));
+       memset(mc_ext, 0, sizeof(*mc_ext));
        mc_ext->common.type = MC_TYPE_EXTENDED;
-       mc_ext->common.size = sizeof(mc_ext);
+       mc_ext->common.size = sizeof(*mc_ext);
        mc_ext->mc_msrs = 3;
 
        mc_ext->mc_msr[0].reg = MSR_F10_MC4_MISC1;
diff -r 2badbf64a582 -r d5f9005dfc4a xen/arch/x86/mm/p2m.c
--- a/xen/arch/x86/mm/p2m.c     Wed Apr 11 13:10:33 2012 +0100
+++ b/xen/arch/x86/mm/p2m.c     Wed Apr 11 13:10:33 2012 +0100
@@ -1232,11 +1232,10 @@ bool_t p2m_mem_access_check(unsigned lon
     }
 
     *req_ptr = NULL;
-    req = xmalloc(mem_event_request_t);
+    req = xzalloc(mem_event_request_t);
     if ( req )
     {
         *req_ptr = req;
-        memset(req, 0, sizeof(req));
         req->reason = MEM_EVENT_REASON_VIOLATION;
 
         /* Pause the current VCPU */

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