Re: Oops on 2.5.40, flush_tlb_mm

[Zwane Mwaikambo]

On Wed, 2 Oct 2002, Andrew Morton wrote:

> You need Hugh's patch.  Was sent to Linus yesterday...

Oh, thanks, sucks being in the dark like this :/

> 
> Patch from Hugh Dickins
> 
> Our earlier fix for mprotect_fixup was broken - passing an
> already-freed VMA to change_protection().
> 
> 
> 
>  mm/mprotect.c |    4 +++-
>  1 files changed, 3 insertions(+), 1 deletion(-)
> 
> --- 2.5.40/mm/mprotect.c~hugh-mprotect-fix	Tue Oct  1 23:43:14 2002
> +++ 2.5.40-akpm/mm/mprotect.c	Tue Oct  1 23:43:14 2002
> @@ -186,8 +186,10 @@ mprotect_fixup(struct vm_area_struct *vm
>  		/*
>  		 * Try to merge with the previous vma.
>  		 */
> -		if (mprotect_attempt_merge(vma, *pprev, end, newflags))
> +		if (mprotect_attempt_merge(vma, *pprev, end, newflags)) {
> +			vma = *pprev;
>  			goto success;
> +		}
>  	} else {
>  		error = split_vma(mm, vma, start, 1);
>  		if (error)
> 
> .
> 

-- 
function.linuxpower.ca