Skip to content

Bgp hate (backport #12043)#13481

Closed
mergify[bot] wants to merge 2 commits intostable/8.4from
mergify/bp/stable/8.4/pr-12043
Closed

Bgp hate (backport #12043)#13481
mergify[bot] wants to merge 2 commits intostable/8.4from
mergify/bp/stable/8.4/pr-12043

Conversation

@mergify
Copy link

@mergify mergify bot commented May 9, 2023

This is an automatic backport of pull request #12043 done by Mergify.
Cherry-pick of 3e46b43 has failed:

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

You are currently cherry-picking commit 3e46b43e3.
  (all conflicts fixed: 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)

nothing to commit, working tree clean

Cherry-pick of 1117bac has failed:

On branch mergify/bp/stable/8.4/pr-12043
Your branch is ahead of 'origin/stable/8.4' by 1 commit.
  (use "git push" to publish your local commits)

You are currently cherry-picking commit 1117baca3.
  (all conflicts fixed: 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)

nothing to commit, working tree clean

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

…bility

In peek_for_as4_capability the code is checking that the
stream has at least 2 bytes to read ( the opt_type and the
opt_length ).  However if BGP_OPEN_EXT_OPT_PARAMS_CAPABLE(peer)
is configured then FRR is reading 3 bytes.  Which is not good
since the packet could be badly formated.  Ensure that
FRR has the appropriate data length to read the data.

Signed-off-by: Donald Sharp <sharpd@nvidia.com>
(cherry picked from commit 3e46b43)
…arse

In bgp_open_option_parse the code is checking that the
stream has at least 2 bytes to read ( the opt_type and
the opt_length).  However if BGP_OPEN_EXT_OPT_PARAMS_CAPABLE(peer)
is configured then FRR is reading 3 bytes.  Which is not good
since the packet could be badly formateed.  Ensure that
FRR has the appropriate data length to read the data.

Signed-off-by: Donald Sharp <sharpd@nvidia.com>
(cherry picked from commit 1117bac)
@mergify mergify bot added the conflicts label May 9, 2023
@mergify mergify bot mentioned this pull request May 9, 2023
@frrbot frrbot bot added the bgp label May 9, 2023
@ton31337
Copy link
Member

ton31337 commented May 9, 2023

This is already backported.

@ton31337 ton31337 closed this May 9, 2023
@ton31337 ton31337 deleted the mergify/bp/stable/8.4/pr-12043 branch May 9, 2023 12:43
@NetDEF-CI
Copy link
Collaborator

Continuous Integration Result: SUCCESSFUL

Congratulations, this patch passed basic tests

Tested-by: NetDEF / OpenSourceRouting.org CI System

CI System Testrun URL: https://ci1.netdef.org/browse/FRR-PULLREQ2-11409/

This is a comment from an automated CI system.
For questions and feedback in regards to this CI system, please feel free to email
Martin Winter - mwinter (at) opensourcerouting.org.

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.

3 participants