Skip to content

Fixes thread_cancel crash issue #14392

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

Fixes thread_cancel crash issue #14392

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 17 additions & 0 deletions src/sonic-frr/patch/0014-fix-bug-of-thread_cancel-will-lead-to-core-dump.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
diff --git a/lib/thread.c b/lib/thread.c
old mode 100644
new mode 100755
index b1224c02e..6ce085f11
--- a/lib/thread.c
+++ b/lib/thread.c
@@ -1358,8 +1358,10 @@ static void do_thread_cancel(struct thread_master *master)

if (list) {
thread_list_del(list, thread);
+ list = NULL;
} else if (thread_array) {
thread_array[thread->u.fd] = NULL;
+ thread_array = NULL;
}

if (thread->ref)
1 change: 1 addition & 0 deletions src/sonic-frr/patch/series
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,3 +13,4 @@ cross-compile-changes.patch
0011-bgpd-enhanced-capability-is-always-turned-on-for-int.patch
0012-Ensure-ospf_apiclient_lsa_originate-cannot-accidently-write-into-stack.patch
0013-zebra-fix-dplane-fpm-nl-to-allow-for-fast-configuration.patch
0014-fix-bug-of-thread_cancel-will-lead-to-core-dump.patch