* [PATCH v2] ata: libata-core: Check errors in sata_print_link_status()
@ 2022-09-03 23:10 Li Zhong
2022-09-16 14:21 ` Damien Le Moal
0 siblings, 1 reply; 2+ messages in thread
From: Li Zhong @ 2022-09-03 23:10 UTC (permalink / raw)
To: linux-kernel, linux-ide; +Cc: damien.lemoal, Li Zhong
sata_scr_read() could return negative error code on failure. Check the
return value when reading the control register.
Signed-off-by: Li Zhong <floridsleeves@gmail.com>
---
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
^ permalink raw reply [flat|nested] 2+ messages in thread* Re: [PATCH v2] ata: libata-core: Check errors in sata_print_link_status()
2022-09-03 23:10 [PATCH v2] ata: libata-core: Check errors in sata_print_link_status() Li Zhong
@ 2022-09-16 14:21 ` Damien Le Moal
0 siblings, 0 replies; 2+ messages in thread
From: Damien Le Moal @ 2022-09-16 14:21 UTC (permalink / raw)
To: Li Zhong, linux-kernel, linux-ide
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 <floridsleeves@gmail.com>
> ---
> 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
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2022-09-16 14:22 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-09-03 23:10 [PATCH v2] ata: libata-core: Check errors in sata_print_link_status() Li Zhong
2022-09-16 14:21 ` Damien Le Moal
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®