linux-kernel - Re: [PATCH] drm/imagination: fix off by one in pvr_vm_mips

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <810cf46c7f4b646ee2979dd29e53362dff7d9881.camel@imgtec.com>
Date:   Thu, 30 Nov 2023 09:12:35 +0000
From:   Frank Binns <Frank.Binns@...tec.com>
To:     "dan.carpenter@...aro.org" <dan.carpenter@...aro.org>,
        Sarah Walker <Sarah.Walker@...tec.com>
CC:     "kernel-janitors@...r.kernel.org" <kernel-janitors@...r.kernel.org>,
        "tzimmermann@...e.de" <tzimmermann@...e.de>,
        Donald Robson <Donald.Robson@...tec.com>,
        Matt Coster <Matt.Coster@...tec.com>,
        "dri-devel@...ts.freedesktop.org" <dri-devel@...ts.freedesktop.org>,
        "airlied@...il.com" <airlied@...il.com>,
        "linux-kernel@...r.kernel.org" <linux-kernel@...r.kernel.org>,
        "maarten.lankhorst@...ux.intel.com" 
        <maarten.lankhorst@...ux.intel.com>,
        "daniel@...ll.ch" <daniel@...ll.ch>,
        "mripard@...nel.org" <mripard@...nel.org>
Subject: Re: [PATCH] drm/imagination: fix off by one in pvr_vm_mips_init()
 error handling

On Thu, 2023-11-30 at 10:27 +0300, Dan Carpenter wrote:
> If the call to vmap() fails the "page_nr" is one element beyond the end
> of the mips_data->pt_dma_addr[] and mips_data->pt_pages[] arrays.
> 
> The way that this is traditionally written is that we clean up the
> partial loop iteration before the goto and then we can say
> while (--i >= 0).  At that point we know that all the elements thus
> far are initialized so we don't need to have NULL checks.
> 
> Fixes: 927f3e0253c1 ("drm/imagination: Implement MIPS firmware processor and MMU support")
> Signed-off-by: Dan Carpenter <dan.carpenter@...aro.org>

Reviewed-by: Frank Binns <frank.binns@...tec.com>

> ---
>  drivers/gpu/drm/imagination/pvr_vm_mips.c | 11 +++++------
>  1 file changed, 5 insertions(+), 6 deletions(-)
> 
> diff --git a/drivers/gpu/drm/imagination/pvr_vm_mips.c b/drivers/gpu/drm/imagination/pvr_vm_mips.c
> index 7268cf6e630b..2bc7181a4c3e 100644
> --- a/drivers/gpu/drm/imagination/pvr_vm_mips.c
> +++ b/drivers/gpu/drm/imagination/pvr_vm_mips.c
> @@ -57,6 +57,7 @@ pvr_vm_mips_init(struct pvr_device *pvr_dev)
>  							       PAGE_SIZE, DMA_TO_DEVICE);
>  		if (dma_mapping_error(dev, mips_data->pt_dma_addr[page_nr])) {
>  			err = -ENOMEM;
> +			__free_page(mips_data->pt_pages[page_nr]);
>  			goto err_free_pages;
>  		}
>  	}
> @@ -79,13 +80,11 @@ pvr_vm_mips_init(struct pvr_device *pvr_dev)
>  	return 0;
>  
>  err_free_pages:
> -	for (; page_nr >= 0; page_nr--) {
> -		if (mips_data->pt_dma_addr[page_nr])
> -			dma_unmap_page(from_pvr_device(pvr_dev)->dev,
> -				       mips_data->pt_dma_addr[page_nr], PAGE_SIZE, DMA_TO_DEVICE);
> +	while (--page_nr >= 0) {
> +		dma_unmap_page(from_pvr_device(pvr_dev)->dev,
> +			       mips_data->pt_dma_addr[page_nr], PAGE_SIZE, DMA_TO_DEVICE);
>  
> -		if (mips_data->pt_pages[page_nr])
> -			__free_page(mips_data->pt_pages[page_nr]);
> +		__free_page(mips_data->pt_pages[page_nr]);
>  	}
>  
>  	return err;