lkml.org 
[lkml]   [2022]   [Jul]   [9]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 06/14] staging: r8188eu: always initialise efuse buffer with 0xff
    Date
    If BOOT_FROM_EEPROM is set, efuse_buf is not initialised before it is
    passed to functions that read from it.

    The buffer will be filled with 0x00 in this case like all local variables.
    However, the parsing functions expect the buffer to be filled with 0xFF if
    reading eeprom/efuse data failed. Fill the buffer with 0xFF before we try
    to read the data.

    Please note that this problem existed before we started using a local
    buffer. Adapter->eeprompriv->efuse_eeprom_data was allocated as a part of
    struct adapter by a vzalloc call in rtw_usb_if1_init.

    Signed-off-by: Martin Kaiser <martin@kaiser.cx>
    ---
    drivers/staging/r8188eu/hal/usb_halinit.c | 14 ++++++--------
    1 file changed, 6 insertions(+), 8 deletions(-)

    diff --git a/drivers/staging/r8188eu/hal/usb_halinit.c b/drivers/staging/r8188eu/hal/usb_halinit.c
    index 807d8ce8cbfc..258ab963cf8a 100644
    --- a/drivers/staging/r8188eu/hal/usb_halinit.c
    +++ b/drivers/staging/r8188eu/hal/usb_halinit.c
    @@ -940,14 +940,12 @@ void ReadAdapterInfo8188EU(struct adapter *Adapter)

    eeprom->bautoload_fail_flag = !(eeValue & EEPROM_EN);

    - if (!(eeValue & BOOT_FROM_EEPROM)) {
    - if (eeprom->bautoload_fail_flag) {
    - memset(efuse_buf, 0xFF, sizeof(efuse_buf));
    - } else {
    - rtl8188e_EfusePowerSwitch(Adapter, true);
    - rtl8188e_ReadEFuse(Adapter, 0, EFUSE_MAP_LEN_88E, efuse_buf);
    - rtl8188e_EfusePowerSwitch(Adapter, false);
    - }
    + memset(efuse_buf, 0xFF, sizeof(efuse_buf));
    +
    + if (!(eeValue & BOOT_FROM_EEPROM) && !eeprom->bautoload_fail_flag) {
    + rtl8188e_EfusePowerSwitch(Adapter, true);
    + rtl8188e_ReadEFuse(Adapter, 0, EFUSE_MAP_LEN_88E, efuse_buf);
    + rtl8188e_EfusePowerSwitch(Adapter, false);
    }

    /* parse the eeprom/efuse content */
    --
    2.30.2
    \
     
     \ /
      Last update: 2022-07-09 19:11    [W:4.240 / U:0.432 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site