]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
staging: rts5208: Add a check for ms_read_extra_data
authorAditya Pakki <pakki001@umn.edu>
Thu, 27 Dec 2018 19:35:53 +0000 (13:35 -0600)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 7 Jan 2019 07:56:07 +0000 (08:56 +0100)
In ms_copy_page, the function ms_read_extra_data may fail for many
reasons. The fix adds a check similar to other invocation to return
error upstream.

Signed-off-by: Aditya Pakki <pakki001@umn.edu>
Reviewed-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/rts5208/ms.c

index e43f92080c20f4fc7b1c9c45b0779994faec6570..1128eec3bd087f4e4c193e15f5ac5284957af2bb 100644 (file)
@@ -1665,7 +1665,10 @@ static int ms_copy_page(struct rtsx_chip *chip, u16 old_blk, u16 new_blk,
                        return STATUS_FAIL;
                }
 
-               ms_read_extra_data(chip, old_blk, i, extra, MS_EXTRA_SIZE);
+               retval = ms_read_extra_data(chip, old_blk, i, extra,
+                                           MS_EXTRA_SIZE);
+               if (retval != STATUS_SUCCESS)
+                       return STATUS_FAIL;
 
                retval = ms_set_rw_reg_addr(chip, OverwriteFlag,
                                            MS_EXTRA_SIZE, SystemParm, 6);