Skip to contentSkip to conversation

powerpc: kvm: powerpc: fix information leak to userland

PATCH In review Vasiliy Kulikov 2 participants 2 messages Oct 30, 2010

Subsystems (4)
lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 powerpc: kvm: powerpc: fix information leak to userland

Structure kvm_ppc_pvinfo is copied to userland with "flags" and "pad" fields unitialized. It leads to leaking of contents of kernel stack memory. We have to initialize them to zero.

In patch v1 Jan Kiszka suggested to fill reserved fields with zeros instead of memset'ting the whole struct. It makes sense as these fields are explicitly marked as padding. No more fields need zeroing.

---
 arch/powerpc/kvm/powerpc.c |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)
arch/powerpc/kvm/powerpc.c +2 -0
index 2f87a16..5962336 100644
@@ -604,6 +604,8 @@ static int kvm_vm_ioctl_get_pvinfo(struct kvm_ppc_pvinfo *pvinfo)
 	pvinfo->hcall[1] = inst_ori | (KVM_SC_MAGIC_R0 & inst_imm_mask);
 	pvinfo->hcall[2] = inst_sc;
 	pvinfo->hcall[3] = inst_nop;
+	pvinfo->flags = 0;
+	memset(&pvinfo->pad, 0, sizeof(pvinfo->pad));
 
 	return 0;
 }
Signature · 1 line
1.7.0.4
#1 lore raw
Quoted 18 lines · Vasiliy Kulikov

Structure kvm_ppc_pvinfo is copied to userland with "flags" and "pad" fields unitialized. It leads to leaking of contents of kernel stack memory. We have to initialize them to zero.

In patch v1 Jan Kiszka suggested to fill reserved fields with zeros instead of memset'ting the whole struct. It makes sense as these fields are explicitly marked as padding. No more fields need zeroing.

---
arch/powerpc/kvm/powerpc.c | 2 ++

1 files changed, 2 insertions(+), 0 deletions(-)
arch/powerpc/kvm/powerpc.c +0 -0
index 2f87a16..5962336 100644

arch/powerpc/kvm/powerpc.c static int kvm_vm_ioctl_get_pvinfo(struct kvm_ppc_pvinfo *pvinfo) · line 608

Quoted 5 lines
arch/powerpc/kvm/powerpc.c +2 -0
@@ -604,6 +604,8 @@ static int kvm_vm_ioctl_get_pvinfo(struct kvm_ppc_pvinfo *pvinfo)
 	pvinfo->hcall[1] = inst_ori | (KVM_SC_MAGIC_R0 & inst_imm_mask);
 	pvinfo->hcall[2] = inst_sc;
 	pvinfo->hcall[3] = inst_nop;
+	pvinfo->flags = 0;
+	memset(&pvinfo->pad, 0, sizeof(pvinfo->pad));

This should only be memset(pvinfo->pad), no? It's an array after all which automatically translates to a pointer when referenced.

Alex