Skip to content
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.

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

zebra: Fix leaked nhe (backport #17809) #17826

Closed
wants to merge 1 commit into from

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Jan 9, 2025

During route processing in zebra, Zebra will create a nexthop group that matches the nexthops passed down from the routing protocol. Then Zebra will look to see if it can re-use a nhe from a previous version of the route entry( say a interface goes down ). If Zebra decides to re-use an nhe it was just dropping the route entry created. Which led to nexthop group's that had a refcount of 0 and in some cases these nexthop groups were installed into the kernel.

Add a bit of code to see if the returned entry is not being used and it has no reference count and if so, properly dispose of it.


This is an automatic backport of pull request #17809 done by Mergify.

During route processing in zebra, Zebra will create a nexthop
group that matches the nexthops passed down from the routing
protocol.  Then Zebra will look to see if it can re-use a
nhe from a previous version of the route entry( say a interface
goes down ).  If Zebra decides to re-use an nhe it was just dropping
the route entry created.  Which led to nexthop group's that had
a refcount of 0 and in some cases these nexthop groups were installed
into the kernel.

Add a bit of code to see if the returned entry is not being used
and it has no reference count and if so, properly dispose of it.

Signed-off-by: Donald Sharp <[email protected]>
(cherry picked from commit 97fa24e)

# Conflicts:
#	zebra/zebra_nhg.c
@mergify mergify bot added the conflicts label Jan 9, 2025
Copy link
Author

mergify bot commented Jan 9, 2025

Cherry-pick of 97fa24e has failed:

On branch mergify/bp/stable/10.1/pr-17809
Your branch is up to date with 'origin/stable/10.1'.

You are currently cherry-picking commit 97fa24e70.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   zebra/zebra_nhg.c

no changes added to commit (use "git add" and/or "git commit -a")

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

@frrbot frrbot bot added the zebra label Jan 9, 2025
@mergify mergify bot mentioned this pull request Jan 9, 2025
@ton31337 ton31337 closed this Jan 10, 2025
@ton31337 ton31337 deleted the mergify/bp/stable/10.1/pr-17809 branch January 10, 2025 07:46
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants