aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/staging/rts5208/ms.c
diff options
context:
space:
mode:
authorDan Carpenter <dan.carpenter@oracle.com>2018-01-22 13:23:32 +0300
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2018-01-22 15:21:09 +0100
commit7f7aeea7cf30368b9fdb86dcc9d2c8a3ebc65dfb (patch)
treef7266fa6b4cb78297d7aaf20ada15da2cd4ab8b4 /drivers/staging/rts5208/ms.c
parentstaging: greybus: audio_codec.h Fix alignment should match open parenthesis (diff)
downloadlinux-dev-7f7aeea7cf30368b9fdb86dcc9d2c8a3ebc65dfb.tar.xz
linux-dev-7f7aeea7cf30368b9fdb86dcc9d2c8a3ebc65dfb.zip
staging: rts5208: Fix "seg_no" calculation in reset_ms_card()
I get some static checker warnings like this: drivers/staging/rts5208/ms.c:2607 ms_build_l2p_tbl() error: buffer underflow 'ms_card->segment' (-1)-16 The problem is that we memset "ms_card" to zero at the start of the reset_ms_card() function. That means that when we try to calculate "ms_card->total_block / 512 - 1" then it's just always -1. The fix is to calculate "seg_no" before doing the memset(). This is a static checker fix, and I am not able to test it. My theory is that reset_ms_card() gets very little testing which is why this bug exists. Fixes: fa590c222fba ("staging: rts5208: add support for rts5208 and rts5288") Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/rts5208/ms.c')
-rw-r--r--drivers/staging/rts5208/ms.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/staging/rts5208/ms.c b/drivers/staging/rts5208/ms.c
index 7cdce87f3051..821256b95e22 100644
--- a/drivers/staging/rts5208/ms.c
+++ b/drivers/staging/rts5208/ms.c
@@ -2821,6 +2821,7 @@ BUILD_FAIL:
int reset_ms_card(struct rtsx_chip *chip)
{
struct ms_info *ms_card = &chip->ms_card;
+ int seg_no = ms_card->total_block / 512 - 1;
int retval;
memset(ms_card, 0, sizeof(struct ms_info));
@@ -2863,7 +2864,7 @@ int reset_ms_card(struct rtsx_chip *chip)
/* Build table for the last segment,
* to check if L2P table block exists, erasing it
*/
- retval = ms_build_l2p_tbl(chip, ms_card->total_block / 512 - 1);
+ retval = ms_build_l2p_tbl(chip, seg_no);
if (retval != STATUS_SUCCESS) {
rtsx_trace(chip);
return STATUS_FAIL;