[202506] Backport FRR IPv6 RA crash fix and align submodule - #2927
Open
kktheballer wants to merge 2 commits into
Open
kktheballer wants to merge 2 commits into
kktheballer wants to merge 2 commits into
Conversation
Backport FRR commit d019ad49382553f1f01711d435f3473b3848be90 to prevent duplicate router-advertisement wheel entries and free the advertised-interface record when RA is stopped. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> Copilot-Session: f8890733-5a02-40f4-9d96-515670381f33 Signed-off-by: Kavin Kamaraj <kakamara@microsoft.com>
|
Azure Pipelines: There may be pipelines that require an authorized user to comment /azp run to run. |
Restore the sonic-frr submodule branch and gitlink to FRR 10.3 so they match rules/frr.mk and the FRR package actually built by the 202506 branch. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> Copilot-Session: f8890733-5a02-40f4-9d96-515670381f33 Signed-off-by: Kavin Kamaraj <kakamara@microsoft.com>
kktheballer
changed the title
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
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.
Why I did it
Zebra can crash in
process_rtadv()after an IPv6 router-advertisement interface is added to the RA wheel more than once and subsequently deleted. The remaining wheel entry points to freed interface memory.This backports FRR commit FRRouting/frr@d019ad4 from FRRouting/frr#19000 to the FRR 10.3 patch stack used by the 202506 branch.
The PR also restores the sonic-frr submodule metadata and gitlink to FRR 10.3. The previous pointer to FRR 10.4.1 was inconsistent with
rules/frr.mk, which explicitly builds FRR 10.3 and applies the local patch series.How I did it
rtadv_stop_ra().src/sonic-frr/patch/series..gitmodulessonic-frr branch fromfrr-10.4.1back tofrr-10.3.85cf1ed576deed121751e16a64970f8a652a9e1e.How to verify it
Which release branch to backport
Description for the changelog
Backport the FRR IPv6 RA crash fix and align the FRR submodule with the 202506 build version.