Mirror/frr
0
0
Fork 1
mirror of https://github.com/FRRouting/frr.git synced 2025-04-30 13:37:17 +02:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

zebra: guard against use of zapi client data during close

Browse source 
It's possible for the main pthread to try to use a zclient
that has failed/closed. Add some guards to try to prevent
some obvious paths where that might occur.

Signed-off-by: Mark Stapp <mjs@cisco.com>
This commit is contained in:
Mark Stapp 2025-04-24 14:42:39 -04:00
parent 1b0bac0e68
commit 1f74653d41
1 changed files with 16 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
zebra/zserv.c
View file

@ -486,6 +486,10 @@ zread_fail:
static void zserv_client_event(struct zserv *client,
enum zserv_client_event event)
{
/* Don't continue if client is being shut/freed */
if (client->pthread == NULL)
return;
switch (event) {
case ZSERV_CLIENT_READ:
event_add_read(client->pthread->master, zserv_read, client,
@ -568,12 +572,17 @@ static void zserv_process_messages(struct event *thread)
int zserv_send_message(struct zserv *client, struct stream *msg)
{
/* Don't continue if zclient is being freed/shut */
if (client->pthread == NULL)
goto done;
frr_with_mutex (&client->obuf_mtx) {
stream_fifo_push(client->obuf_fifo, msg);
}
zserv_client_event(client, ZSERV_CLIENT_WRITE);
done:
return 0;
}
@ -584,6 +593,10 @@ int zserv_send_batch(struct zserv *client, struct stream_fifo *fifo)
{
struct stream *msg;
/* Don't continue if zclient is being freed/shut */
if (client->pthread == NULL)
goto done;
frr_with_mutex (&client->obuf_mtx) {
msg = stream_fifo_pop(fifo);
while (msg) {
@ -594,6 +607,7 @@ int zserv_send_batch(struct zserv *client, struct stream_fifo *fifo)
zserv_client_event(client, ZSERV_CLIENT_WRITE);
done:
return 0;
}
@ -1405,7 +1419,8 @@ static int zserv_client_close_cb(struct zserv *closed_client)
struct zserv *client = NULL;
frr_each (zserv_client_list, &zrouter.client_list, client) {
if (client->proto == closed_client->proto)
if (client->proto == closed_client->proto ||
client->pthread == NULL)
continue;
zsend_client_close_notify(client, closed_client);