2022-09-03 23:30:09

by Li Zhong

Subject: [PATCH v2] ata: libata-core: Check errors in sata_print_link_status()

sata_scr_read() could return negative error code on failure. Check the
return value when reading the control register.

Signed-off-by: Li Zhong <[email protected]>
---
drivers/ata/libata-core.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/drivers/ata/libata-core.c b/drivers/ata/libata-core.c
index 826d41f341e4..ae08c7d35cb0 100644
--- a/drivers/ata/libata-core.c
+++ b/drivers/ata/libata-core.c
@@ -3021,7 +3021,8 @@ static void sata_print_link_status(struct ata_link *link)

if (sata_scr_read(link, SCR_STATUS, &sstatus))
return;
- sata_scr_read(link, SCR_CONTROL, &scontrol);
+ if (sata_scr_read(link, SCR_CONTROL, &scontrol))
+ return;

if (ata_phys_link_online(link)) {
tmp = (sstatus >> 4) & 0xf;
--
2.25.1

2022-09-16 14:30:41

by Damien Le Moal

Subject: Re: [PATCH v2] ata: libata-core: Check errors in sata_print_link_status()

On 2022/09/04 0:10, Li Zhong wrote:
> sata_scr_read() could return negative error code on failure. Check the
> return value when reading the control register.
>
> Signed-off-by: Li Zhong <[email protected]>
> ---
> drivers/ata/libata-core.c | 3 ++-
> 1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/ata/libata-core.c b/drivers/ata/libata-core.c
> index 826d41f341e4..ae08c7d35cb0 100644
> --- a/drivers/ata/libata-core.c
> +++ b/drivers/ata/libata-core.c
> @@ -3021,7 +3021,8 @@ static void sata_print_link_status(struct ata_link *link)
>
> if (sata_scr_read(link, SCR_STATUS, &sstatus))
> return;
> - sata_scr_read(link, SCR_CONTROL, &scontrol);
> + if (sata_scr_read(link, SCR_CONTROL, &scontrol))
> + return;
>
> if (ata_phys_link_online(link)) {
> tmp = (sstatus >> 4) & 0xf;

Applied to for-6.1. Thanks.

--
Damien Le Moal
Western Digital Research