Skip to contentSkip to conversation

mwifiex: remove function pointer check

PATCH In review [email protected] 3 participants 3 messages Sep 6, 2020 – Sep 9, 2020

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 mwifiex: remove function pointer check

From: Tom Rix <[email protected]>

clang static analyzer reports this problem

init.c:739:8: warning: Called function pointer
is null (null dereference)

        ret = adapter->if_ops.check_fw_status( ...
              ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

In mwifiex_dnld_fw, there is an earlier check for check_fw_status(), The check was introduced for usb support at the same time this check in _mwifiex_fw_dpc() was made

	if (adapter->if_ops.dnld_fw) {
		ret = adapter->if_ops.dnld_fw(adapter, &fw);
	} else {
		ret = mwifiex_dnld_fw(adapter, &fw);
	}

And a dnld_fw function initialized as part the usb's mwifiex_if_ops.

The other instances of mwifiex_if_ops for pci and sdio both set check_fw_status.

So the first check is not needed and can be removed.

Fixes 4daffe354366 ("mwifiex: add support for Marvell USB8797 chipset")
---
 drivers/net/wireless/marvell/mwifiex/init.c | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)
drivers/net/wireless/marvell/mwifiex/init.c +6 -8
index 82d69bc3aaaf..f006a3d72b40 100644
@@ -695,14 +695,12 @@ int mwifiex_dnld_fw(struct mwifiex_adapter *adapter,
 	int ret;
 	u32 poll_num = 1;
 
-	if (adapter->if_ops.check_fw_status) {
-		/* check if firmware is already running */
-		ret = adapter->if_ops.check_fw_status(adapter, poll_num);
-		if (!ret) {
-			mwifiex_dbg(adapter, MSG,
-				    "WLAN FW already running! Skip FW dnld\n");
-			return 0;
-		}
+	/* check if firmware is already running */
+	ret = adapter->if_ops.check_fw_status(adapter, poll_num);
+	if (!ret) {
+		mwifiex_dbg(adapter, MSG,
+			    "WLAN FW already running! Skip FW dnld\n");
+		return 0;
 	}
 
 	/* check if we are the winner for downloading FW */
Signature · 1 line
2.18.1
Reviewed-by on v1 1/1
#1 lore raw
Quoted 22 lines · On Sun, Sep 06, 2020 at 01:05:48PM -0700, [email protected] wrote:

From: Tom Rix <[email protected]>

clang static analyzer reports this problem

init.c:739:8: warning: Called function pointer
is null (null dereference)

        ret = adapter->if_ops.check_fw_status( ...
              ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

In mwifiex_dnld_fw, there is an earlier check for check_fw_status(), The check was introduced for usb support at the same time this check in _mwifiex_fw_dpc() was made

	if (adapter->if_ops.dnld_fw) {
		ret = adapter->if_ops.dnld_fw(adapter, &fw);
	} else {
		ret = mwifiex_dnld_fw(adapter, &fw);
	}

And a dnld_fw function initialized as part the usb's mwifiex_if_ops.

Quoted 7 lines

The other instances of mwifiex_if_ops for pci and sdio both set check_fw_status.

So the first check is not needed and can be removed.

Fixes 4daffe354366 ("mwifiex: add support for Marvell USB8797 chipset")

Indeed, on the surface, mwifiex_dnld_fw assumes that check_fw_status() cannot be NULL because it will always be called at the end of the function even if the first check is skipped.

Quoted 36 lines
---
 drivers/net/wireless/marvell/mwifiex/init.c | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)
drivers/net/wireless/marvell/mwifiex/init.c +6 -8
index 82d69bc3aaaf..f006a3d72b40 100644
@@ -695,14 +695,12 @@ int mwifiex_dnld_fw(struct mwifiex_adapter *adapter,
 	int ret;
 	u32 poll_num = 1;
 
-	if (adapter->if_ops.check_fw_status) {
-		/* check if firmware is already running */
-		ret = adapter->if_ops.check_fw_status(adapter, poll_num);
-		if (!ret) {
-			mwifiex_dbg(adapter, MSG,
-				    "WLAN FW already running! Skip FW dnld\n");
-			return 0;
-		}
+	/* check if firmware is already running */
+	ret = adapter->if_ops.check_fw_status(adapter, poll_num);
+	if (!ret) {
+		mwifiex_dbg(adapter, MSG,
+			    "WLAN FW already running! Skip FW dnld\n");
+		return 0;
 	}
 
 	/* check if we are the winner for downloading FW */
Signature · 6 lines
2.18.1

-- 
You received this message because you are subscribed to the Google Groups "Clang Built Linux" group.
To unsubscribe from this group and stop receiving emails from it, send an email to [email protected].
To view this discussion on the web visit https://groups.google.com/d/msgid/clang-built-linux/20200906200548.18053-1-trix%40redhat.com.
#2 lore raw
In reply to [email protected]
Quoted 22 lines · [email protected] wrote:

From: Tom Rix <[email protected]>

clang static analyzer reports this problem

init.c:739:8: warning: Called function pointer
is null (null dereference)

        ret = adapter->if_ops.check_fw_status( ...
              ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

In mwifiex_dnld_fw, there is an earlier check for check_fw_status(), The check was introduced for usb support at the same time this check in _mwifiex_fw_dpc() was made

	if (adapter->if_ops.dnld_fw) {
		ret = adapter->if_ops.dnld_fw(adapter, &fw);
	} else {
		ret = mwifiex_dnld_fw(adapter, &fw);
	}

And a dnld_fw function initialized as part the usb's mwifiex_if_ops.

Quoted 8 lines

The other instances of mwifiex_if_ops for pci and sdio both set check_fw_status.

So the first check is not needed and can be removed.

Fixes 4daffe354366 ("mwifiex: add support for Marvell USB8797 chipset")

Patch applied to wireless-drivers-next.git, thanks.

eb2c6ca2db8c mwifiex: remove function pointer check

Signature · 3 lines
https://patchwork.kernel.org/patch/11759719/

https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches