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

[24.05] openssh: add backported security fix patches #323761

Merged

Conversation

emilazy
Copy link
Member

@emilazy emilazy commented Jul 1, 2024

Fixes a critical security bug allowing remote code execution as root: https://www.openssh.com/txt/release-9.8

This may be CVE-2024-6387 (currently embargoed): https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2024-6387

Thanks to upstream and Sam James for the backport: gentoo/gentoo@1633ef4

Closes #323759.

Description of changes

Things done

  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandboxing enabled in nix.conf? (See Nix manual)
    • sandbox = relaxed
    • sandbox = true
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 24.11 Release Notes (or backporting 23.11 and 24.05 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
  • Fits CONTRIBUTING.md.

Add a 👍 reaction to pull requests you find important.

Fixes a critical security bug allowing remote code execution as root:
<https://www.openssh.com/txt/release-9.8>

This may be CVE-2024-6387 (currently embargoed):
<https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2024-6387>

Thanks to upstream and Sam James <[email protected]> for the backport:
<gentoo/gentoo@1633ef4>
@emilazy emilazy added 1.severity: security Issues which raise a security issue, or PRs that fix one backport release-23.11 labels Jul 1, 2024
@emilazy
Copy link
Member Author

emilazy commented Jul 1, 2024

@ofborg test openssh

@emilazy
Copy link
Member Author

emilazy commented Jul 1, 2024

@alyssais alyssais merged commit 10c832d into NixOS:release-24.05 Jul 1, 2024
14 of 21 checks passed
Copy link
Contributor

github-actions bot commented Jul 1, 2024

Backport failed for release-23.11, because it was unable to cherry-pick the commit(s).

Please cherry-pick the changes locally and resolve any conflicts.

git fetch origin release-23.11
git worktree add -d .worktree/backport-323761-to-release-23.11 origin/release-23.11
cd .worktree/backport-323761-to-release-23.11
git switch --create backport-323761-to-release-23.11
git cherry-pick -x cace7b935dcb3646070ac95e4d8e69cfc132a129

@whitequark
Copy link

Thanks!

@nixos-discourse
Copy link

This pull request has been mentioned on NixOS Discourse. There might be relevant details there:

https://discourse.nixos.org/t/security-advisory-openssh-cve-2024-6387-regresshion-update-your-servers-asap/48220/19

@emilazy emilazy deleted the openssh-security-backport-24.05 branch August 26, 2024 01:05
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
1.severity: security Issues which raise a security issue, or PRs that fix one
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants