[AutoPR- Security] Patch openssh for CVE-2025-61985, CVE-2025-61984 [LOW]

[azurelinux-security]

Auto Patch openssh for CVE-2025-61985, CVE-2025-61984.

Autosec pipeline run -> https://dev.azure.com/mariner-org/mariner-chatbot/_build/results?buildId=947824&view=results

Merge Checklist

All boxes should be checked before merging the PR (just tick any boxes which don't apply to this PR)

• The toolchain has been rebuilt successfully (or no changes were made to it)
• The toolchain/worker package manifests are up-to-date
• Any updated packages successfully build (or no packages were changed)
• Packages depending on static components modified in this PR (Golang, *-static subpackages, etc.) have had their Release tag incremented.
• Package tests (%check section) have been verified with RUN_CHECK=y for existing SPEC files, or added to new SPEC files
• All package sources are available
• cgmanifest files are up-to-date and sorted (./cgmanifest.json, ./toolkit/scripts/toolchain/cgmanifest.json, .github/workflows/cgmanifest.json)
• LICENSE-MAP files are up-to-date (./LICENSES-AND-NOTICES/SPECS/data/licenses.json, ./LICENSES-AND-NOTICES/SPECS/LICENSES-MAP.md, ./LICENSES-AND-NOTICES/SPECS/LICENSE-EXCEPTIONS.PHOTON)
• All source files have up-to-date hashes in the *.signatures.json files
• sudo make go-tidy-all and sudo make go-test-coverage pass
• Documentation has been updated to match any changes to the build system
• Ready to merge

---

Summary

What does the PR accomplish, why was it needed?

• Auto Patch openssh for CVE-2025-61985 (LOW), CVE-2025-61984 (LOW).

Change Log

• CVE-2025-61985
• CVE-2025-61984

Does this affect the toolchain?

YES/NO

Associated issues

• N/A

Links to CVEs

• https://nvd.nist.gov/vuln/detail/CVE-2025-61985
• https://nvd.nist.gov/vuln/detail/CVE-2025-61984

Test Methodology

• Pipeline build id: Buddy Build URL

[Kanishk-Bansal]

Buddy Build

[mayankfz]

This fix is for CVE-2025-61985, would request for swapping the patch filenames. This patch looks fine.

[mayankfz]

This comment change not required

[mayankfz]

Only change in valid_ruser() looks sufficient to fix CVE-2025-61984. Rest all changes are not required as we are not expanding user in the openssh-9.8p1 version.

[mayankfz]

As per my understanding the changes in main() in ssh,c and macro in sshconnect.h not required.

[mayankfz]

Buddy Build -> https://dev.azure.com/mariner-org/mariner/_build/results?buildId=950508&view=results

[mayankfz]

Patch applies cleanly with modification

• Buddy Build
• patch applied during the build (check rpm.log)
• patch include an upstream reference
• PR has security tag
• ptest regression

[kgodara912]

As per the CVE description,
ssh in OpenSSH allows control characters in usernames that originate from certain possibly untrusted sources, potentially leading to code execution when a ProxyCommand is used. The untrusted sources are the command line and %-sequence expansion of a configuration file.
(A configuration file that provides a complete literal username is not categorized as an untrusted source.). As we haven't changed,

		if (!valid_ruser(options.user))
			fatal("remote username contains invalid characters");

Shouldn't we check the same way as it was done in the upstream patch like when user_expanded is not true, then we should allow that username?

	if ((user_on_commandline || user_expanded) &&
	    !valid_ruser(options.user))
		fatal("remote username contains invalid characters");

Which will allow complete literal username from configuration file. Or, @mayankfz, as per your analysis, that will be taken care by iscntrl((u_char)s[i]) itself?

[mayankfz]

In the present code we are not expanding username, so that's why we do not need to use that code only, this code would have been introduced in some later version, so that's why we do not need the complete code. These changes are to only expand trusted sources only but we are not expanding in the current version, so in my opinion, changes are not required, only the valid_ruser will take care of it.