system-linux: fix a glob related memleak

[project/netifd.git] / proto-shell.c

diff --git a/proto-shell.c b/proto-shell.c
index f32a32f..0131e19 100644 (file)
--- a/proto-shell.c
+++ b/proto-shell.c
@@ -506,9 +506,11 @@ proto_shell_update_link(struct proto_shell_state *state, struct blob_attr *data,
 
        interface_update_complete(state->proto.iface);
 
-       if (!keep)
-               state->proto.proto_event(&state->proto, IFPEV_UP);
-       state->sm = S_IDLE;
+       if ((state->sm != S_SETUP_ABORT) && (state->sm != S_TEARDOWN)) {
+               if (!keep)
+                       state->proto.proto_event(&state->proto, IFPEV_UP);
+               state->sm = S_IDLE;
+       }
 
        return 0;
 }
@@ -578,7 +580,7 @@ proto_shell_kill_command(struct proto_shell_state *state, struct blob_attr **tb)
                signal = SIGTERM;
 
        if (state->proto_task.uloop.pending) {
-               if (signal == SIGTERM)
+               if (signal == SIGTERM || signal == SIGKILL)
                        state->proto_task_killed = true;
                kill(state->proto_task.uloop.pid, signal);
        }