]> git.ipfire.org Git - thirdparty/hostap.git/commitdiff
nl80211: Fix error path in if_indices_reason reallocation
authorJouni Malinen <j@w1.fi>
Fri, 18 Mar 2016 14:25:35 +0000 (16:25 +0200)
committerJouni Malinen <j@w1.fi>
Fri, 18 Mar 2016 14:25:35 +0000 (16:25 +0200)
Commit 732b1d20ec06ab92fd22dbdea4609a6528bcf50a ('nl80211: Clean up
ifidx properly if interface in a bridge is removed') added
drv->if_indices_reason array similarly to the previously used
drv->if_indices. However, it had a copy-paste error here on the error
path where a reallocation failure after at least one successful
reallocation would result in the drv->if_indices being overridden
instead of restoring drv->if_indices_reason to the old value. Fix this
by setting the correct variable on the error path. (CID 138514)

Signed-off-by: Jouni Malinen <j@w1.fi>
src/drivers/driver_nl80211.c

index b4c3462c734973a8f053a896938c05ea5ba2d298..b93721c69a023e9bf86d4b7521459a731e943f15 100644 (file)
@@ -5712,7 +5712,7 @@ static void add_ifidx(struct wpa_driver_nl80211_data *drv, int ifidx,
                if (!old_reason)
                        drv->if_indices_reason = drv->default_if_indices_reason;
                else
-                       drv->if_indices = old_reason;
+                       drv->if_indices_reason = old_reason;
        }
        if (!drv->if_indices || !drv->if_indices_reason) {
                wpa_printf(MSG_ERROR, "Failed to reallocate memory for "