diff mbox series

[v1] drivers/ata/libata-core: check return value of sata_scr_read()

Message ID 20220828204443.1954661-1-floridsleeves@gmail.com
State New
Headers show
Series [v1] drivers/ata/libata-core: check return value of sata_scr_read() | expand

Commit Message

Li Zhong Aug. 28, 2022, 8:44 p.m. UTC
sata_scr_read() could return 0 on failure. Check the return value.

Signed-off-by: Li Zhong <floridsleeves@gmail.com>
---
 drivers/ata/libata-core.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

Comments

Damien Le Moal Aug. 30, 2022, 1:38 a.m. UTC | #1
On 2022/08/29 5:45, Li Zhong wrote:
> sata_scr_read() could return 0 on failure. Check the return value.

Looks OK as a fix but the above sentence has a bug. 0 indicates success, not
failure. So this should read:

sata_scr_read() may fail with a negative error code. Check that function return
value when reading the control register.

Also, the patch title should be something like:

ata: libata-core: Check errors in sata_print_link_status()

> 
> 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;
Li Zhong Sept. 3, 2022, 11:05 p.m. UTC | #2
On Mon, Aug 29, 2022 at 6:38 PM Damien Le Moal <Damien.LeMoal@wdc.com> wrote:
>
> On 2022/08/29 5:45, Li Zhong wrote:
> > sata_scr_read() could return 0 on failure. Check the return value.
>
> Looks OK as a fix but the above sentence has a bug. 0 indicates success, not
> failure. So this should read:
>
> sata_scr_read() may fail with a negative error code. Check that function return
> value when reading the control register.
>
> Also, the patch title should be something like:
>
> ata: libata-core: Check errors in sata_print_link_status()
>

Thanks. Will fix it in the new version.

> >
> > 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;
>
> --
> Damien Le Moal
> Western Digital Research
>
diff mbox series

Patch

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;