Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
IronPort-SDR: Obmjmct6wScHDh6d8TTjw67y1N3usSNW/eOodhUgbwIQOSO/4wphYh8+xnDTwMuHQSERIStArK
 7EvGcW/kGtvndImDHjhQcHeIEKg9lhmYL8LxuVXGlgbI/rsRc+VnfqudEsTa1u7gQXYFSlJKnp
 dvI4X8Yd+4zdD4S3kI2Phe1Ta2EtQrDKxmZpWsB+gw0wVpnANgX6Dg9RVzm8NmK3U2Uk6wOg/X
 CV50BcojGF0Ton23jfcrB4vuFhbfC7eTxuM/DRmS0dx1oJ+wjGBdrDFO7x8pUXuPsmhx7zU/AO
 2O8PCGksZFcgGZD4X3SklFwr
IronPort-SDR: S7f0Hwezw6fgjri5ljwIhypYY8F0+2cC6UkDNUBaVvEJJHUXB1LFUwJwgK8cSn7EOviRMLdYsq
 JfpXL1/0sBVmjofqUX4xf0HLN5JGOps28udEL/ckQb996P32v3pQaRP2F4KgNqzRpw1LkXx+s1
 aIfTpwGKSuETIgLu4LakgKdvlCtMdee/9oV5xHE1BFedrN5cagERxypLR8h7g/jX71e6EJqf0y
 ENv7GL9A3JDeGAwgQfYnBvjzzptvIX9/UsefTkqaS/pco19Rb0Kw3pBGlaUuvEGj1KbveEsE7X
 psw=
WDCIronportException: Internal
Message-ID: <0a7afa9a-db24-910c-314d-2a6f7c43c5ea@opensource.wdc.com>
Date:   Thu, 14 Oct 2021 12:35:47 +0900
MIME-Version: 1.0
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101
 Thunderbird/91.1.0
Subject: Re: [PATCH] ata: ahci_platform: fix null-ptr-deref in
 ahci_platform_enable_regulators()
Content-Language: en-US
To:     Wang Hai <wanghai38@huawei.com>, hdegoede@redhat.com,
        axboe@kernel.dk, lgirdwood@gmail.com, broonie@kernel.org
Cc:     linux-ide@vger.kernel.org, linux-kernel@vger.kernel.org
References: <20211013061631.2958938-1-wanghai38@huawei.com>
From:   Damien Le Moal <damien.lemoal@opensource.wdc.com>
Organization: Western Digital Research
In-Reply-To: <20211013061631.2958938-1-wanghai38@huawei.com>
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 7bit
Precedence: bulk

On 10/13/21 15:16, Wang Hai wrote:
> I got a null-ptr-deref report:
> 
> KASAN: null-ptr-deref in range [0x0000000000000090-0x0000000000000097]
> ...
> RIP: 0010:regulator_enable+0x84/0x260
> ...
> Call Trace:
>  ahci_platform_enable_regulators+0xae/0x320
>  ahci_platform_enable_resources+0x1a/0x120
>  ahci_probe+0x4f/0x1b9
>  platform_probe+0x10b/0x280
> ...
>  entry_SYSCALL_64_after_hwframe+0x44/0xae
> 
> If devm_regulator_get() in ahci_platform_get_resources() fails,
> hpriv->phy_regulator will point to NULL, when enabling or disabling it,
> null-ptr-deref will occur.
> 
> ahci_probe()
> 	ahci_platform_get_resources()
> 		devm_regulator_get(, "phy") // failed, let phy_regulator = NULL
> 	ahci_platform_enable_resources()
> 		ahci_platform_enable_regulators()
> 			regulator_enable(hpriv->phy_regulator) // null-ptr-deref
> 
> commit 962399bb7fbf ("ata: libahci_platform: Fix regulator_get_optional()
> misuse") replaces devm_regulator_get_optional() with devm_regulator_get(),
> but PHY regulator omits to delete "hpriv->phy_regulator = NULL;" like AHCI.
> Delete it like AHCI regulator to fix this bug.
> 
> Fixes: commit 962399bb7fbf ("ata: libahci_platform: Fix regulator_get_optional() misuse")
> Reported-by: Hulk Robot <hulkci@huawei.com>
> Signed-off-by: Wang Hai <wanghai38@huawei.com>
> ---
>  drivers/ata/libahci_platform.c | 5 +----
>  1 file changed, 1 insertion(+), 4 deletions(-)
> 
> diff --git a/drivers/ata/libahci_platform.c b/drivers/ata/libahci_platform.c
> index b2f552088291..0910441321f7 100644
> --- a/drivers/ata/libahci_platform.c
> +++ b/drivers/ata/libahci_platform.c
> @@ -440,10 +440,7 @@ struct ahci_host_priv *ahci_platform_get_resources(struct platform_device *pdev,
>  	hpriv->phy_regulator = devm_regulator_get(dev, "phy");
>  	if (IS_ERR(hpriv->phy_regulator)) {
>  		rc = PTR_ERR(hpriv->phy_regulator);
> -		if (rc == -EPROBE_DEFER)
> -			goto err_out;
> -		rc = 0;
> -		hpriv->phy_regulator = NULL;
> +		goto err_out;
>  	}
>  
>  	if (flags & AHCI_PLATFORM_GET_RESETS) {
> 

I applied this to for-5.15-fixes.

Note that the code right before the hunk you fixed looks like this:

        hpriv->ahci_regulator = devm_regulator_get(dev, "ahci");
        if (IS_ERR(hpriv->ahci_regulator)) {
                rc = PTR_ERR(hpriv->ahci_regulator);
                if (rc != 0)
                        goto err_out;
        }

This looks very strange to me. The "if (rc != 0)" seems bogus since if
IS_ERR() is true, then hpriv->ahci_regulator is not NULL, it is an error
pointer. Some cleanup seems necessary to me.


-- 
Damien Le Moal
Western Digital Research