Patchwork [1/2] KVM: PPC: e500: fix allocation size error on g2h_tlb1_map

login
register
mail settings
Submitter Scott Wood
Date Aug. 23, 2012, 1:04 a.m.
Message ID <1345683864-10815-1-git-send-email-scottwood@freescale.com>
Download mbox | patch
Permalink /patch/179478/
State New
Headers show

Comments

Scott Wood - Aug. 23, 2012, 1:04 a.m.
We were only allocating half the bytes we need, which was made more
obvious by a recent fix to the memset in  clear_tlb1_bitmap().

Signed-off-by: Scott Wood <scottwood@freescale.com>
---
 arch/powerpc/kvm/e500_tlb.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
Alexander Graf - Sept. 25, 2012, 7:46 a.m.
On 23.08.2012, at 03:04, Scott Wood wrote:

> We were only allocating half the bytes we need, which was made more
> obvious by a recent fix to the memset in  clear_tlb1_bitmap().
> 
> Signed-off-by: Scott Wood <scottwood@freescale.com>

Thanks, applied to kvm-ppc-next.

Avi, Marcelo, this one should get applied to anything currently -stable as it essentially means we could overrun an array that has been allocated too small. How do we do this?


Alex

> ---
> arch/powerpc/kvm/e500_tlb.c |    2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/arch/powerpc/kvm/e500_tlb.c b/arch/powerpc/kvm/e500_tlb.c
> index 43489a8..a27d134 100644
> --- a/arch/powerpc/kvm/e500_tlb.c
> +++ b/arch/powerpc/kvm/e500_tlb.c
> @@ -1385,7 +1385,7 @@ int kvmppc_e500_tlb_init(struct kvmppc_vcpu_e500 *vcpu_e500)
> 	if (!vcpu_e500->gtlb_priv[1])
> 		goto err;
> 
> -	vcpu_e500->g2h_tlb1_map = kzalloc(sizeof(unsigned int) *
> +	vcpu_e500->g2h_tlb1_map = kzalloc(sizeof(u64) *
> 					  vcpu_e500->gtlb_params[1].entries,
> 					  GFP_KERNEL);
> 	if (!vcpu_e500->g2h_tlb1_map)
> -- 
> 1.7.9.5
> 
> 
> --
> To unsubscribe from this list: send the line "unsubscribe kvm-ppc" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html

--
To unsubscribe from this list: send the line "unsubscribe kvm-ppc" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Marcelo Tosatti - Sept. 27, 2012, 4:03 p.m.
On Tue, Sep 25, 2012 at 09:46:01AM +0200, Alexander Graf wrote:
> 
> On 23.08.2012, at 03:04, Scott Wood wrote:
> 
> > We were only allocating half the bytes we need, which was made more
> > obvious by a recent fix to the memset in  clear_tlb1_bitmap().
> > 
> > Signed-off-by: Scott Wood <scottwood@freescale.com>
> 
> Thanks, applied to kvm-ppc-next.
> 
> Avi, Marcelo, this one should get applied to anything currently -stable as it essentially means we could overrun an array that has been allocated too small. How do we do this?
> 
> 
> Alex

Apparently Avi prefers that patches are sent directly to the -stable
tree.

Avi?

> 
> > ---
> > arch/powerpc/kvm/e500_tlb.c |    2 +-
> > 1 file changed, 1 insertion(+), 1 deletion(-)
> > 
> > diff --git a/arch/powerpc/kvm/e500_tlb.c b/arch/powerpc/kvm/e500_tlb.c
> > index 43489a8..a27d134 100644
> > --- a/arch/powerpc/kvm/e500_tlb.c
> > +++ b/arch/powerpc/kvm/e500_tlb.c
> > @@ -1385,7 +1385,7 @@ int kvmppc_e500_tlb_init(struct kvmppc_vcpu_e500 *vcpu_e500)
> > 	if (!vcpu_e500->gtlb_priv[1])
> > 		goto err;
> > 
> > -	vcpu_e500->g2h_tlb1_map = kzalloc(sizeof(unsigned int) *
> > +	vcpu_e500->g2h_tlb1_map = kzalloc(sizeof(u64) *
> > 					  vcpu_e500->gtlb_params[1].entries,
> > 					  GFP_KERNEL);
> > 	if (!vcpu_e500->g2h_tlb1_map)
> > -- 
> > 1.7.9.5
> > 
> > 
> > --
> > To unsubscribe from this list: send the line "unsubscribe kvm-ppc" in
> > the body of a message to majordomo@vger.kernel.org
> > More majordomo info at  http://vger.kernel.org/majordomo-info.html
--
To unsubscribe from this list: send the line "unsubscribe kvm-ppc" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Avi Kivity - Sept. 27, 2012, 4:35 p.m.
On 09/27/2012 06:03 PM, Marcelo Tosatti wrote:
> On Tue, Sep 25, 2012 at 09:46:01AM +0200, Alexander Graf wrote:
>> 
>> On 23.08.2012, at 03:04, Scott Wood wrote:
>> 
>> > We were only allocating half the bytes we need, which was made more
>> > obvious by a recent fix to the memset in  clear_tlb1_bitmap().
>> > 
>> > Signed-off-by: Scott Wood <scottwood@freescale.com>
>> 
>> Thanks, applied to kvm-ppc-next.
>> 
>> Avi, Marcelo, this one should get applied to anything currently -stable as it essentially means we could overrun an array that has been allocated too small. How do we do this?
>> 
>> 
>> Alex
> 
> Apparently Avi prefers that patches are sent directly to the -stable
> tree.

We were discussing letting Greg honour Cc: stable@vger.kernel.org
(currently he ignores them), not sending patches directly.

We still haven't told him to do so, but Alex, you can go ahead and add
the Cc: tag to the patch.

Do you have the auto-autotest setup ready?  I guess we can do it
manually until it is.
Alexander Graf - Sept. 27, 2012, 7:59 p.m.
On 09/27/2012 06:35 PM, Avi Kivity wrote:
> On 09/27/2012 06:03 PM, Marcelo Tosatti wrote:
>> On Tue, Sep 25, 2012 at 09:46:01AM +0200, Alexander Graf wrote:
>>> On 23.08.2012, at 03:04, Scott Wood wrote:
>>>
>>>> We were only allocating half the bytes we need, which was made more
>>>> obvious by a recent fix to the memset in  clear_tlb1_bitmap().
>>>>
>>>> Signed-off-by: Scott Wood<scottwood@freescale.com>
>>> Thanks, applied to kvm-ppc-next.
>>>
>>> Avi, Marcelo, this one should get applied to anything currently -stable as it essentially means we could overrun an array that has been allocated too small. How do we do this?
>>>
>>>
>>> Alex
>> Apparently Avi prefers that patches are sent directly to the -stable
>> tree.
> We were discussing letting Greg honour Cc: stable@vger.kernel.org
> (currently he ignores them), not sending patches directly.
>
> We still haven't told him to do so, but Alex, you can go ahead and add
> the Cc: tag to the patch.

Sure, I can certainly do that :).

> Do you have the auto-autotest setup ready?  I guess we can do it
> manually until it is.

I do have a local autotest setup. Or what exactly are you referring to?


Alex

--
To unsubscribe from this list: send the line "unsubscribe kvm-ppc" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Avi Kivity - Sept. 30, 2012, 11:29 a.m.
On 09/27/2012 09:59 PM, Alexander Graf wrote:
> 
>> Do you have the auto-autotest setup ready?  I guess we can do it
>> manually until it is.
> 
> I do have a local autotest setup. Or what exactly are you referring to?

Getting autotest to run automatically and produce readable reports, and
auto-bisection.
Alexander Graf - Oct. 1, 2012, 10:59 a.m.
On 30.09.2012, at 13:29, Avi Kivity wrote:

> On 09/27/2012 09:59 PM, Alexander Graf wrote:
>> 
>>> Do you have the auto-autotest setup ready?  I guess we can do it
>>> manually until it is.
>> 
>> I do have a local autotest setup. Or what exactly are you referring to?
> 
> Getting autotest to run automatically and produce readable reports, and
> auto-bisection.

I'm not quite there yet :). Do you have any precooked things I could reuse?


Alex

--
To unsubscribe from this list: send the line "unsubscribe kvm-ppc" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Avi Kivity - Oct. 2, 2012, 10:22 a.m.
On 10/01/2012 12:59 PM, Alexander Graf wrote:
> 
> On 30.09.2012, at 13:29, Avi Kivity wrote:
> 
>> On 09/27/2012 09:59 PM, Alexander Graf wrote:
>>> 
>>>> Do you have the auto-autotest setup ready?  I guess we can do it
>>>> manually until it is.
>>> 
>>> I do have a local autotest setup. Or what exactly are you referring to?
>> 
>> Getting autotest to run automatically and produce readable reports, and
>> auto-bisection.
> 
> I'm not quite there yet :). Do you have any precooked things I could reuse?

Nope, currently we eat from the tin.

Patch

diff --git a/arch/powerpc/kvm/e500_tlb.c b/arch/powerpc/kvm/e500_tlb.c
index 43489a8..a27d134 100644
--- a/arch/powerpc/kvm/e500_tlb.c
+++ b/arch/powerpc/kvm/e500_tlb.c
@@ -1385,7 +1385,7 @@  int kvmppc_e500_tlb_init(struct kvmppc_vcpu_e500 *vcpu_e500)
 	if (!vcpu_e500->gtlb_priv[1])
 		goto err;
 
-	vcpu_e500->g2h_tlb1_map = kzalloc(sizeof(unsigned int) *
+	vcpu_e500->g2h_tlb1_map = kzalloc(sizeof(u64) *
 					  vcpu_e500->gtlb_params[1].entries,
 					  GFP_KERNEL);
 	if (!vcpu_e500->g2h_tlb1_map)