Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) client-ip=2620:137:e000::3:7;
Message-ID: <bf18eb83-8cbd-46b3-b3d5-ba3527d16bc8@kernel.org>
Date:   Wed, 18 Oct 2023 15:19:08 +0900
MIME-Version: 1.0
User-Agent: Mozilla Thunderbird
Subject: Re: [PATCH] pata_lagacy: Handle failed ATA timing computation in
 opti82c46x_set_piomode
Content-Language: en-US
To:     Haonan Li <lihaonan1105@gmail.com>,
        Sergey Shtylyov <s.shtylyov@omp.ru>, linux-ide@vger.kernel.org,
        linux-kernel@vger.kernel.org
References: <1a0c4378-29b2-43b4-982b-0d92dfb8ed4f@kernel.org>
 <20231018005220.2551586-1-lihaonan1105@gmail.com>
From:   Damien Le Moal <dlemoal@kernel.org>
Organization: Western Digital Research
In-Reply-To: <20231018005220.2551586-1-lihaonan1105@gmail.com>
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 7bit
Precedence: bulk

On 10/18/23 09:52, Haonan Li wrote:
> The function opti82c46x_set_piomode utilizes the ata_timing_compute()
> to determine the appropriate ATA timings for a given device. However,
> in certain conditions where the ata_timing_find_mode() function does
> not find a valid mode, ata_timing_compute() returns an error (-EINVAL),
> leaving the tp struct uninitialized.
> 
> This patch checks the return value of ata_timing_compute() and print
> err message. This avoids any potential use of uninitialized `tp`
> struct in the opti82c46x_set_piomode function.
> 
> Signed-off-by: Haonan Li <lihaonan1105@gmail.com>

Please do not send patches in reply to something else. Also, this is a v2 of a
previous patch so the patch title prefix should indicate that and a change log
should be present after the "---" below.

> ---
>  drivers/ata/pata_legacy.c | 11 +++++++++--
>  1 file changed, 9 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/ata/pata_legacy.c b/drivers/ata/pata_legacy.c
> index 448a511cbc17..3c7163f97aaf 100644
> --- a/drivers/ata/pata_legacy.c
> +++ b/drivers/ata/pata_legacy.c
> @@ -579,12 +579,19 @@ static void opti82c46x_set_piomode(struct ata_port *ap, struct ata_device *adev)
>  	clock = 1000000000 / khz[sysclk];
>  
>  	/* Get the timing data in cycles */
> -	ata_timing_compute(adev, adev->pio_mode, &t, clock, 1000);
> +	if (ata_timing_compute(adev, adev->pio_mode, &t, clock, 1000)) {
> +		dev_err(ap->dev, "adev: unknown mode %d\n", adev->pio_mode);
> +		return;
> +	}
>  
>  	/* Setup timing is shared */
>  	if (pair) {
>  		struct ata_timing tp;
> -		ata_timing_compute(pair, pair->pio_mode, &tp, clock, 1000);
> +
> +		if (ata_timing_compute(pair, pair->pio_mode, &tp, clock, 1000)) {
> +			dev_err(ap->dev, "pair: unknown mode %d\n", pair->pio_mode);
> +			return;
> +		}
>  
>  		ata_timing_merge(&t, &tp, &t, ATA_TIMING_SETUP);
>  	}

-- 
Damien Le Moal
Western Digital Research