Skip to content

eigrpd: improve validation and error-handling in tlv parsing (backport #21316) - #21365

Closed
mergify[bot] wants to merge 2 commits into
stable/10.3from
mergify/bp/stable/10.3/pr-21316
Closed

eigrpd: improve validation and error-handling in tlv parsing (backport #21316)#21365
mergify[bot] wants to merge 2 commits into
stable/10.3from
mergify/bp/stable/10.3/pr-21316

Conversation

@mergify

@mergify mergify Bot commented Mar 25, 2026

Copy link
Copy Markdown

Add more length validation before accessing packet data; add error-detection in several paths; try to skip unknown TLV types in more cases.


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

Mark Stapp added 2 commits March 25, 2026 22:24
Harden validation of lengths before accessing packets;
detect and handle invalid INT TLVs where they're created.

Reported-by: Haruto Kimura (Stella) <harutokimura0608@gmail.com>
Signed-off-by: Mark Stapp <mjs@cisco.com>
(cherry picked from commit 284c966)

# Conflicts:
#	eigrpd/eigrp_packet.c
#	eigrpd/eigrp_update.c
Try to skip unknown TLVs in places where we don't process
all types.

Reported-by: Haruto Kimura (Stella) <harutokimura0608@gmail.com>
Signed-off-by: Mark Stapp <mjs@cisco.com>
(cherry picked from commit d05029d)
@mergify mergify Bot added the conflicts label Mar 25, 2026
@mergify

mergify Bot commented Mar 25, 2026

Copy link
Copy Markdown
Author

Cherry-pick of 284c966 has failed:

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

You are currently cherry-picking commit 284c966d5.
  (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:   eigrpd/eigrp_query.c
	modified:   eigrpd/eigrp_reply.c
	modified:   eigrpd/eigrp_siaquery.c
	modified:   eigrpd/eigrp_siareply.c

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

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

@greptile-apps

greptile-apps Bot commented Mar 25, 2026

Copy link
Copy Markdown

Target branch is not in the allowed branches list.

@mjstapp

mjstapp commented Mar 26, 2026

Copy link
Copy Markdown
Contributor

looks like auto-backports aren't working; closing

@mjstapp mjstapp closed this Mar 26, 2026
@mjstapp
mjstapp deleted the mergify/bp/stable/10.3/pr-21316 branch March 26, 2026 12:51
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.

1 participant