lib: fix crash on distribute-list delete #16530
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
The destroy callback must be executed only once on APPLY stage. Fixes FRRouting#16528 Signed-off-by: Igor Ryzhov <[email protected]>
donaldsharp
reviewed
Aug 7, 2024
| @@ -458,6 +458,8 @@ int group_distribute_list_create_helper( | |||
|
|
|||
| int group_distribute_list_destroy(struct nb_cb_destroy_args *args) | |||
| { | |||
| if (args->event != NB_EV_APPLY) | |||
There was a problem hiding this comment.
would this be a better fix:
diff --git a/lib/northbound.c b/lib/northbound.c
index 0bc79d0277..6158fb5ada 100644
--- a/lib/northbound.c
+++ b/lib/northbound.c
@@ -1585,7 +1585,8 @@ static int nb_callback_destroy(struct nb_context *context,
args.dnode = dnode;
args.errmsg = errmsg;
args.errmsg_len = errmsg_len;
- ret = nb_node->cbs.destroy(&args);
+ if (args.event == NB_EV_APPLY)
+ ret = nb_node->cbs.destroy(&args);
/* Detect and log unexpected errors. */
switch (ret) {
I spot checked a few other destroy functions and they all had this check.
|
@Mergifyio backport stable/10.1 stable/10.0 |
✅ Backports have been created
|
This was referenced Aug 8, 2024
donaldsharp
added a commit
that referenced
this pull request
Aug 8, 2024
lib: fix crash on distribute-list delete (backport #16530)
donaldsharp
added a commit
that referenced
this pull request
Aug 8, 2024
lib: fix crash on distribute-list delete (backport #16530)
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
The destroy callback must be executed only once on APPLY stage.
Fixes #16528