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

Bgp hate #12043

Merged
merged 2 commits into from
Oct 1, 2022
Merged

Bgp hate #12043

merged 2 commits into from
Oct 1, 2022

Conversation

donaldsharp
Copy link
Member

Fix some possible read beyond end of stream. See individual commits. Making this 2 commits because they are separate functions which effectively do the same thing.

…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>
…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>
@frrbot frrbot bot added the bgp label Sep 30, 2022
Copy link
Member

@ton31337 ton31337 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@NetDEF-CI
Copy link
Collaborator

NetDEF-CI commented Sep 30, 2022

Continuous Integration Result: FAILED

Continuous Integration Result: FAILED

Test incomplete. See below for issues.
CI System Testrun URL: https://ci1.netdef.org/browse/FRR-PULLREQ2-7652/

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.

Get source / Pull Request: Successful

Building Stage: Successful

Basic Tests: Incomplete

Topotests Ubuntu 18.04 arm8 part 1: Incomplete (check logs for details)
Successful on other platforms/tests
  • Topotests Ubuntu 18.04 arm8 part 8
  • Addresssanitizer topotests part 7
  • Topotests debian 10 amd64 part 4
  • Topotests debian 10 amd64 part 9
  • Topotests Ubuntu 18.04 i386 part 2
  • Topotests Ubuntu 18.04 amd64 part 3
  • Topotests Ubuntu 18.04 i386 part 7
  • Addresssanitizer topotests part 5
  • Topotests Ubuntu 18.04 i386 part 6
  • Topotests Ubuntu 18.04 amd64 part 2
  • Ubuntu 16.04 deb pkg check
  • Topotests debian 10 amd64 part 8
  • Topotests Ubuntu 18.04 amd64 part 4
  • Topotests Ubuntu 18.04 i386 part 1
  • Topotests Ubuntu 18.04 arm8 part 4
  • Ubuntu 20.04 deb pkg check
  • Addresssanitizer topotests part 2
  • Topotests Ubuntu 18.04 arm8 part 9
  • Debian 10 deb pkg check
  • Topotests Ubuntu 18.04 amd64 part 5
  • Topotests Ubuntu 18.04 amd64 part 0
  • Topotests Ubuntu 18.04 arm8 part 2
  • Addresssanitizer topotests part 3
  • Fedora 29 rpm pkg check
  • Topotests Ubuntu 18.04 amd64 part 7
  • Topotests Ubuntu 18.04 arm8 part 7
  • Topotests debian 10 amd64 part 0
  • Addresssanitizer topotests part 9
  • Topotests Ubuntu 18.04 i386 part 3
  • Topotests Ubuntu 18.04 i386 part 8
  • Topotests Ubuntu 18.04 arm8 part 5
  • Addresssanitizer topotests part 8
  • CentOS 7 rpm pkg check
  • Topotests Ubuntu 18.04 amd64 part 9
  • Topotests Ubuntu 18.04 i386 part 9
  • Addresssanitizer topotests part 6
  • Static analyzer (clang)
  • Topotests debian 10 amd64 part 1
  • Topotests Ubuntu 18.04 i386 part 5
  • Topotests Ubuntu 18.04 amd64 part 1
  • Topotests Ubuntu 18.04 i386 part 0
  • Topotests debian 10 amd64 part 2
  • Topotests debian 10 amd64 part 7
  • Topotests Ubuntu 18.04 arm8 part 0
  • Topotests Ubuntu 18.04 amd64 part 8
  • Topotests debian 10 amd64 part 3
  • Addresssanitizer topotests part 0
  • Topotests Ubuntu 18.04 amd64 part 6
  • Ubuntu 18.04 deb pkg check
  • Topotests debian 10 amd64 part 6
  • Topotests Ubuntu 18.04 arm8 part 6
  • Addresssanitizer topotests part 1
  • Topotests Ubuntu 18.04 i386 part 4
  • Topotests debian 10 amd64 part 5
  • Topotests Ubuntu 18.04 arm8 part 3
  • Debian 9 deb pkg check
  • Addresssanitizer topotests part 4

@donaldsharp
Copy link
Member Author

ci:rerun some sort of ci system failure?

@NetDEF-CI
Copy link
Collaborator

NetDEF-CI commented Sep 30, 2022

Continuous Integration Result: FAILED

Continuous Integration Result: FAILED

See below for issues.
CI System Testrun URL: https://ci1.netdef.org/browse/FRR-PULLREQ2-7656/

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.

Get source / Pull Request: Successful

Building Stage: Failed

Redhat 8 amd64 build: Failed (click for details) Redhat 8 amd64 build: No useful log found
Successful on other platforms/tests
  • OpenBSD 7 amd64 build
  • Debian 10 amd64 build
  • Ubuntu 16.04 arm7 build
  • CentOS 7 amd64 build
  • Ubuntu 18.04 i386 build
  • Ubuntu 18.04 amd64 build
  • FreeBSD 11 amd64 build
  • Ubuntu 22.04 amd64 build
  • Debian 9 amd64 build
  • Ubuntu 16.04 arm8 build
  • Ubuntu 20.04 amd64 build
  • Ubuntu 16.04 amd64 build
  • Ubuntu 18.04 ppc64le build
  • NetBSD 9 amd64 build
  • FreeBSD 12 amd64 build
  • Ubuntu 16.04 i386 build
  • Fedora 29 amd64 build
  • Debian 11 amd64 build
  • Ubuntu 18.04 arm7 build
  • Ubuntu 18.04 arm8 build

@davischw
Copy link
Contributor

ci:rerun RedHat CDN certificate foo.

@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-7665/

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.

@ton31337 ton31337 merged commit 5cb79bd into FRRouting:master Oct 1, 2022
@donaldsharp
Copy link
Member Author

@Mergifyio backport stable/8.2

@donaldsharp
Copy link
Member Author

@Mergifyio backport stable/8.3

@donaldsharp
Copy link
Member Author

@Mergifyio backport stable/8.4

@mergify
Copy link

mergify bot commented Oct 7, 2022

backport stable/8.2

✅ Backports have been created

@mergify
Copy link

mergify bot commented Oct 7, 2022

backport stable/8.3

✅ Backports have been created

@mergify
Copy link

mergify bot commented Oct 7, 2022

backport stable/8.4

❌ No backport have been created

  • Backport to branch stable/8.4 failed: Branch not found

donaldsharp added a commit that referenced this pull request Oct 7, 2022
ton31337 added a commit that referenced this pull request Oct 10, 2022
@Jafaral
Copy link
Member

Jafaral commented May 9, 2023

@Mergifyio backport stable/8.4

@mergify
Copy link

mergify bot commented May 9, 2023

backport stable/8.4

✅ Backports have been created

qiluo-msft pushed a commit to sonic-net/sonic-buildimage that referenced this pull request Jun 5, 2023
…VE-2022-40302 (#15262)

Add patches from PRs
FRRouting/frr#12043
FRRouting/frr#12247

#### Why I did it
To fix CVEs found in FRR 8.2

#### How I did it
Take commit from  the FRR repo and created a patch from them
qiluo-msft pushed a commit to sonic-net/sonic-buildimage that referenced this pull request Jun 19, 2023
…22-40318… (#15263)

… CVE-2022-40302

Add patches from PRs
FRRouting/frr#12043
FRRouting/frr#12247

#### Why I did it
To fix CVEs GHSA-x7mf-v6gh-vm4g GHSA-9rqq-99cf-35g5 GHSA-j7hm-p94x-q9pw

##### Work item tracking
- Microsoft ADO **(number only)**: 23268946

#### How I did it
Added patches from the FRR fix PRs
yxieca pushed a commit to yxieca/sonic-buildimage that referenced this pull request Jun 19, 2023
…22-40318… (sonic-net#15263)

… CVE-2022-40302

Add patches from PRs
FRRouting/frr#12043
FRRouting/frr#12247

#### Why I did it
To fix CVEs GHSA-x7mf-v6gh-vm4g GHSA-9rqq-99cf-35g5 GHSA-j7hm-p94x-q9pw

##### Work item tracking
- Microsoft ADO **(number only)**: 23268946

#### How I did it
Added patches from the FRR fix PRs
yxieca added a commit to sonic-net/sonic-buildimage that referenced this pull request Jun 20, 2023
…22-40318… (#15263) (#15537)

… CVE-2022-40302

Add patches from PRs
FRRouting/frr#12043
FRRouting/frr#12247

#### Why I did it
To fix CVEs GHSA-x7mf-v6gh-vm4g GHSA-9rqq-99cf-35g5 GHSA-j7hm-p94x-q9pw

##### Work item tracking
- Microsoft ADO **(number only)**: 23268946

#### How I did it
Added patches from the FRR fix PRs

Co-authored-by: DavidZagury <32644413+DavidZagury@users.noreply.github.com>
sonic-otn pushed a commit to sonic-otn/sonic-buildimage that referenced this pull request Sep 20, 2023
…VE-2022-40302 (sonic-net#15262)

Add patches from PRs
FRRouting/frr#12043
FRRouting/frr#12247

#### Why I did it
To fix CVEs found in FRR 8.2

#### How I did it
Take commit from  the FRR repo and created a patch from them
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.

5 participants