Skip to content

Fix off-by-one s_client overflows#30731

Closed
mattcaswell wants to merge 1 commit into
openssl:masterfrom
mattcaswell:fix-s_client-off-by-one
Closed

Fix off-by-one s_client overflows#30731
mattcaswell wants to merge 1 commit into
openssl:masterfrom
mattcaswell:fix-s_client-off-by-one

Conversation

@mattcaswell
Copy link
Copy Markdown
Member

There are one byte buffer overflows possible in s_client's handling of STARTTLS in various protocols. If a server's response fills the entire buffer (16k) then we attempt to add a NUL terminator one byte off the end of the buffer.

This was reported by Igor Morgenstern from AISLE to openssl-security and assessed by the security team as "bug or hardening only".

There are one byte buffer overflows possible in s_client's handling
of STARTTLS in various protocols. If a server's response fills the entire
buffer (16k) then we attempt to add a NUL terminator one byte off the end
of the buffer.

This was reported by Igor Morgenstern from AISLE to openssl-security and
assessed by the security team as "bug or hardening only".
@mattcaswell mattcaswell added branch: master Applies to master branch approval: review pending This pull request needs review by a committer triaged: bug The issue/pr is/fixes a bug branch: 4.0 Applies to openssl-4.0 labels Apr 8, 2026
@mattcaswell
Copy link
Copy Markdown
Member Author

See also the backport in #30732

@github-project-automation github-project-automation Bot moved this from Waiting Review to Waiting Merge in Development Board Apr 9, 2026
@openssl-machine openssl-machine added approval: done This pull request has the required number of approvals and removed approval: review pending This pull request needs review by a committer labels Apr 9, 2026
@t8m t8m added the tests: exempted The PR is exempt from requirements for testing label Apr 9, 2026
@t8m t8m added this to the 4.0.0 Final Release milestone Apr 9, 2026
@openssl-machine openssl-machine added approval: ready to merge The 24 hour grace period has passed, ready to merge and removed approval: done This pull request has the required number of approvals labels Apr 10, 2026
@openssl-machine
Copy link
Copy Markdown
Collaborator

This pull request is ready to merge

openssl-machine pushed a commit that referenced this pull request Apr 11, 2026
There are one byte buffer overflows possible in s_client's handling
of STARTTLS in various protocols. If a server's response fills the entire
buffer (16k) then we attempt to add a NUL terminator one byte off the end
of the buffer.

This was reported by Igor Morgenstern from AISLE to openssl-security and
assessed by the security team as "bug or hardening only".

Reviewed-by: Paul Dale <paul.dale@oracle.com>
Reviewed-by: Tomas Mraz <tomas@openssl.foundation>
Reviewed-by: Eugene Syromiatnikov <esyr@openssl.org>
Reviewed-by: Nikola Pajkovsky <nikolap@openssl.org>
MergeDate: Sat Apr 11 16:16:24 2026
(Merged from #30731)
openssl-machine pushed a commit that referenced this pull request Apr 11, 2026
There are one byte buffer overflows possible in s_client's handling
of STARTTLS in various protocols. If a server's response fills the entire
buffer (16k) then we attempt to add a NUL terminator one byte off the end
of the buffer.

This was reported by Igor Morgenstern from AISLE to openssl-security and
assessed by the security team as "bug or hardening only".

Reviewed-by: Paul Dale <paul.dale@oracle.com>
Reviewed-by: Tomas Mraz <tomas@openssl.foundation>
Reviewed-by: Eugene Syromiatnikov <esyr@openssl.org>
Reviewed-by: Nikola Pajkovsky <nikolap@openssl.org>
MergeDate: Sat Apr 11 16:25:52 2026
(Merged from #30731)
@npajkovsky
Copy link
Copy Markdown

Thank you for your contribution. Merged into master and 'openssl-4.0`.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

approval: ready to merge The 24 hour grace period has passed, ready to merge branch: master Applies to master branch branch: 4.0 Applies to openssl-4.0 tests: exempted The PR is exempt from requirements for testing triaged: bug The issue/pr is/fixes a bug

Projects

Status: Done

Development

Successfully merging this pull request may close these issues.

6 participants