x86: fix memset(ptr, 0, sizeof ptr).

Signed-off-by: Tim Deegan <tim@xen.org>
Acked-by: Jan Beulich <jbeulich@suse.com>
Acked-by: Christoph Egger <Christoph.Egger@amd.com>
Acked-by: Keir Fraser <keir@xen.org>
Committed-by: Tim Deegan <tim@xen.org>

diff --git a/xen/arch/x86/cpu/mcheck/amd_f10.c b/xen/arch/x86/cpu/mcheck/amd_f10.c
index 0cf5e873acfe85285bfa149f6fe4df48f0b434ad..d73d5ba47b179bf6a8475078989df1318bc6497a 100644 (file)
--- a/xen/arch/x86/cpu/mcheck/amd_f10.c
+++ b/xen/arch/x86/cpu/mcheck/amd_f10.c
@@ -73,9 +73,9 @@ amd_f10_handler(struct mc_info *mi, uint16_t bank, uint64_t status)
                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 --git a/xen/arch/x86/mm/p2m.c b/xen/arch/x86/mm/p2m.c
index 599ea9310e15419105639d08d1f4d287c283c80d..68286f7c867cd7461ee9419179ec0b853184e91d 100644 (file)
--- a/xen/arch/x86/mm/p2m.c
+++ b/xen/arch/x86/mm/p2m.c
@@ -1232,11 +1232,10 @@ bool_t p2m_mem_access_check(unsigned long gpa, bool_t gla_valid, unsigned long g
     }
 
     *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 */