Re: [PATCH 12/12] staging: r8188eu: hal_data_sz is set but never used

From: Michael Straube
Date: Sun Dec 05 2021 - 10:22:57 EST




On 12/5/21 15:42, Pavel Skripkin wrote:
On 12/5/21 16:59, Michael Straube wrote:
hal_data_sz in struct adapter is set but never used. Remove it.

Signed-off-by: Michael Straube <straube.linux@xxxxxxxxx>
---
  drivers/staging/r8188eu/hal/usb_halinit.c   | 1 -
  drivers/staging/r8188eu/include/drv_types.h | 1 -
  2 files changed, 2 deletions(-)

diff --git a/drivers/staging/r8188eu/hal/usb_halinit.c b/drivers/staging/r8188eu/hal/usb_halinit.c
index 641aaf299109..da966538596f 100644
--- a/drivers/staging/r8188eu/hal/usb_halinit.c
+++ b/drivers/staging/r8188eu/hal/usb_halinit.c
@@ -1969,5 +1969,4 @@ void rtl8188eu_alloc_haldata(struct adapter *adapt)
      adapt->HalData = kzalloc(sizeof(struct hal_data_8188e), GFP_KERNEL);
      if (!adapt->HalData)
          DBG_88E("cant not alloc memory for HAL DATA\n");
-    adapt->hal_data_sz = sizeof(struct hal_data_8188e);
  }

Not related to your patch, but not returning an error from this function  looks very dangerous to me.

adapt->HalData is used in GET_HAL_DATA() macro all across the driver code and nobody checks if it valid or not. If allocation fails here, than we will likely hit GPF while accessing hal_data fields.

Maybe we can embed struct hal_data_8188e instead of storing a pointer to it?

Rethinking my prevoius answer, embedding struct hal_data_8188e is the
better solution I think.

Regards,
Michael