Skip to contentSkip to conversation

staging: rtl8712: fix wrong function output

PATCH New Sergei Krainov 1 participant 1 message Apr 9, 2021

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

PATCH v2 1/1 staging: rtl8712: fix wrong function output

Return NULL from r8712_find_network() if no matched wlan_network was found. Code with a bug:

while (plist != phead) {
	pnetwork = container_of(plist, struct wlan_network, list);
	plist = plist->next;
	if (!memcmp(addr, pnetwork->network.MacAddress, ETH_ALEN))
		break;
}

spin_unlock_irqrestore(&scanned_queue->lock, irqL); return pnetwork;

In this code last processed pnetwork returned if list end was reached and no pnetwork matched test condition.

---
Changes from v1: Updated description

 drivers/staging/rtl8712/rtl871x_mlme.c | 2 ++
 1 file changed, 2 insertions(+)
drivers/staging/rtl8712/rtl871x_mlme.c +2 -0
index 8a97307fbbd6..c38161114b80 100644
@@ -146,6 +146,8 @@ static struct wlan_network *r8712_find_network(struct  __queue *scanned_queue,
 		if (!memcmp(addr, pnetwork->network.MacAddress, ETH_ALEN))
 			break;
 	}
+	if (plist == phead)
+		pnetwork = NULL;
 	spin_unlock_irqrestore(&scanned_queue->lock, irqL);
 	return pnetwork;
 }
Signature · 1 line
2.25.1