fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-04-20 22:20:38 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

wifi: fix entering possible endless loop

Browse source 
Clarify how we're supposed to break out of the nl_recvmsgs() loop
and also break out if we get an error from nl_recvmsgs().  What's
supposed to happen is that one of the callbacks we've registered
figures out that we're done and sets the 'done' flag, which then
breaks out of the recvmsgs() loop.  Using 'err' there previously
was pretty unclear.
This commit is contained in:
Dan Williams 2012-03-08 12:48:46 -06:00
parent 25e011b5cf
commit bba834f842
1 changed files with 14 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
src/wifi/wifi-utils-nl80211.c
View file

@ -105,7 +105,7 @@ _nl80211_send_and_recv (struct nl_sock *nl_sock,
void *valid_data)
{
struct nl_cb *cb;
int err;
int err, done;
g_return_val_if_fail (msg != NULL, -ENOMEM);
g_return_val_if_fail (valid_handler != NULL, -EINVAL);
@ -120,14 +120,21 @@ _nl80211_send_and_recv (struct nl_sock *nl_sock,
if (err < 0)
goto out;
err = 1;
nl_cb_err (cb, NL_CB_CUSTOM, error_handler, &err);
nl_cb_set (cb, NL_CB_FINISH, NL_CB_CUSTOM, finish_handler, &err);
nl_cb_set (cb, NL_CB_ACK, NL_CB_CUSTOM, ack_handler, &err);
done = 1;
nl_cb_err (cb, NL_CB_CUSTOM, error_handler, &done);
nl_cb_set (cb, NL_CB_FINISH, NL_CB_CUSTOM, finish_handler, &done);
nl_cb_set (cb, NL_CB_ACK, NL_CB_CUSTOM, ack_handler, &done);
nl_cb_set (cb, NL_CB_VALID, NL_CB_CUSTOM, valid_handler, valid_data);
while (err > 0)
nl_recvmsgs (nl_sock, cb);
/* Loop until one of our NL callbacks says we're done */
while (done) {
err = nl_recvmsgs (nl_sock, cb);
if (err && err != -NLE_AGAIN) {
nm_log_warn (LOGD_WIFI, "nl_recvmsgs() error: (%d) %s",
err, nl_geterror (err));
break;
}
}
out:
nl_cb_put (cb);