Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:18 as permitted sender) client-ip=2620:137:e000::1:18;
Message-ID: <96911abe-c1c6-42a4-322e-d7b06dae0c8e@kernel.org>
Date:   Mon, 2 May 2022 16:02:59 -0500
MIME-Version: 1.0
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101
 Thunderbird/91.7.0
Subject: Re: [RESEND][PATCH] firmware: stratix10-svc: fix a missing check on
 list iterator
Content-Language: en-US
To:     Xiaomeng Tong <xiam0nd.tong@gmail.com>
Cc:     gregkh@linuxfoundation.org, richard.gong@intel.com,
        atull@kernel.org, linux-kernel@vger.kernel.org,
        stable@vger.kernel.org
References: <20220414035609.2239-1-xiam0nd.tong@gmail.com>
From:   Dinh Nguyen <dinguyen@kernel.org>
In-Reply-To: <20220414035609.2239-1-xiam0nd.tong@gmail.com>
Content-Type: text/plain; charset=UTF-8; format=flowed
Content-Transfer-Encoding: 7bit
Precedence: bulk


On 4/13/22 22:56, Xiaomeng Tong wrote:
> The bug is here:
> 	pmem->vaddr = NULL;
> 
> The list iterator 'pmem' will point to a bogus position containing
> HEAD if the list is empty or no element is found. This case must
> be checked before any use of the iterator, otherwise it will
> lead to a invalid memory access.
> 
> To fix this bug, just gen_pool_free/set NULL/list_del() and return
> when found, otherwise list_del HEAD and return;
> 
> Cc: stable@vger.kernel.org
> Fixes: 7ca5ce896524f ("firmware: add Intel Stratix10 service layer driver")
> Signed-off-by: Xiaomeng Tong <xiam0nd.tong@gmail.com>
> ---
>   drivers/firmware/stratix10-svc.c | 12 ++++++------
>   1 file changed, 6 insertions(+), 6 deletions(-)
> 
> diff --git a/drivers/firmware/stratix10-svc.c b/drivers/firmware/stratix10-svc.c
> index 29c0a616b317..30093aa82b7f 100644
> --- a/drivers/firmware/stratix10-svc.c
> +++ b/drivers/firmware/stratix10-svc.c
> @@ -941,17 +941,17 @@ EXPORT_SYMBOL_GPL(stratix10_svc_allocate_memory);
>   void stratix10_svc_free_memory(struct stratix10_svc_chan *chan, void *kaddr)
>   {
>   	struct stratix10_svc_data_mem *pmem;
> -	size_t size = 0;
>   
>   	list_for_each_entry(pmem, &svc_data_mem, node)
>   		if (pmem->vaddr == kaddr) {
> -			size = pmem->size;
> -			break;
> +			gen_pool_free(chan->ctrl->genpool,
> +				       (unsigned long)kaddr, pmem->size);
> +			pmem->vaddr = NULL;
> +			list_del(&pmem->node);
> +			return;
>   		}
>   
> -	gen_pool_free(chan->ctrl->genpool, (unsigned long)kaddr, size);
> -	pmem->vaddr = NULL;
> -	list_del(&pmem->node);
> +	list_del(&svc_data_mem);
>   }
>   EXPORT_SYMBOL_GPL(stratix10_svc_free_memory);
>   

Acked-by: Dinh Nguyen <dinguyen@kernel.org>