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: don't deref vxlan-vni array (backport #15647) #15648

Closed
wants to merge 1 commit into from

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Apr 1, 2024

Null-check the vxlan-vni array info coming into zebra from the dataplane.

Fixes: #15564


This is an automatic backport of pull request #15647 done by [Mergify](https://mergify.com).

Null-check the vxlan-vni array info coming into zebra from
the dataplane.

Signed-off-by: Mark Stapp <mjs@cisco.com>
(cherry picked from commit 75ef259)

# Conflicts:
#	zebra/interface.c
Copy link
Author

mergify bot commented Apr 1, 2024

Cherry-pick of 75ef259 has failed:

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

You are currently cherry-picking commit 75ef259b1.
  (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/interface.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

@mjstapp
Copy link
Contributor

mjstapp commented Apr 1, 2024

I think the bug was introduced with interface dataplane changes in 9.1 - not present in 8.5.

@mjstapp mjstapp closed this Apr 1, 2024
@ton31337 ton31337 deleted the mergify/bp/stable/8.5/pr-15647 branch April 1, 2024 21:02
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.

None yet

1 participant