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: On shutdown, free up srv6 list data (backport #14996) #15018

Closed
wants to merge 2 commits into from

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Dec 14, 2023

This is an automatic backport of pull request #14996 done by Mergify.
Cherry-pick of 9393d36 has failed:

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

You are currently cherry-picking commit 9393d3669.
  (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)

Changes to be committed:
	modified:   zebra/zebra_srv6.c
	modified:   zebra/zebra_srv6.h

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

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


Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com

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

# Conflicts:
#	zebra/main.c
The adata variable was being leaked on shutdown since
it was calloc'ed.  There is no need to make this dynamic
memory.  Just choose a size and use that.  Add a bit
of code to ensure that if it's not large enough,
it will just stop and the developer will fix it.

Signed-off-by: Donald Sharp <[email protected]>
(cherry picked from commit 8fcacf6)
@mergify mergify bot added the conflicts label Dec 14, 2023
@frrbot frrbot bot added the zebra label Dec 14, 2023
@ton31337 ton31337 closed this Dec 14, 2023
@ton31337 ton31337 deleted the mergify/bp/stable/9.0/pr-14996 branch December 14, 2023 05:45
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