Skip to content
Merged
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions tsc/frr/sonic_frr_update_process.md
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ The assigned FRR Maintainer is responsible for the following tasks:
* Bring in FRR vulnerabilities and critical patches to SONiC
- The FRR maintainer for the current SONiC release is responsible for monitoring the corresponding FRR release branch (e.g., the 10.4 branch for SONiC 202511) and cherry-picking any critical patches into both the SONiC release branch (202511) and the master branch.
- Additionally, the maintainer must also monitor the FRR branch selected for the previous SONiC release (e.g., FRR 10.3 for SONiC 202505) and apply any critical patches from that branch to the prior SONiC release branch (e.g., 202505).
- As suggested by the NV team, the FRR maintainer is responsible to proactively patch FRR CVEs (https://nvd.nist.gov/vuln/search#/nvd/home?keyword=FRR&resultType=records) and SONiC-specific issues. However, for other fixes in release branches, proactive patching is not necessary to avoid introducing potentially unstable changes.

Note:
1. Currently, SONiC FRR maintainers are NOT responsible for cherry-picking patches across different SONiC releases. For example, applying critical patches from the FRR 10.4 branch to the SONiC 202505 branch. Such patches must first be merged upstream into FRR.
Expand Down