diff --git a/src/sonic-frr/patch/0014-fix-bug-of-thread_cancel-will-lead-to-core-dump.patch b/src/sonic-frr/patch/0014-fix-bug-of-thread_cancel-will-lead-to-core-dump.patch new file mode 100644 index 000000000000..fea12ff548f4 --- /dev/null +++ b/src/sonic-frr/patch/0014-fix-bug-of-thread_cancel-will-lead-to-core-dump.patch @@ -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) diff --git a/src/sonic-frr/patch/series b/src/sonic-frr/patch/series index 01197120ef2b..2a3b376e3d62 100644 --- a/src/sonic-frr/patch/series +++ b/src/sonic-frr/patch/series @@ -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