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

busybox: Pull in upstream patch for CVE-2018-1000500 #95006

Merged
merged 1 commit into from Aug 10, 2020

Conversation

TethysSvensson
Copy link
Contributor

Motivation for this change

This is a fix for the security vulnerability identified in #94722. See the ubuntu bug for some additional context.

This PR cherry-picks the patch from the upstream git repository.

This was validated as follows:

~> nix-shell -I nixpkgs=$HOME/git/nixpkgs -p busybox openssl

[nix-shell:~]$ busybox wget https://untrusted-root.badssl.com/
Connecting to untrusted-root.badssl.com (104.154.89.105:443)
wget: error getting response: Connection reset by peer

When this is run on the current master, it will instead download the file without any warnings.

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.

@TethysSvensson
Copy link
Contributor Author

@Mic92 I am not sure which branch to target, since I am assuming that we want to backport this to 20.03

@Mic92
Copy link
Member

Mic92 commented Aug 9, 2020

This branch is correct.

@TethysSvensson
Copy link
Contributor Author

This branch is correct.

@Mic92 Does this look good to merge then?

@Mic92 Mic92 merged commit 1667af0 into NixOS:master Aug 10, 2020
@Mic92
Copy link
Member

Mic92 commented Aug 10, 2020

backport: #95093

@TethysSvensson TethysSvensson deleted the fix-issue-94722 branch September 10, 2020 21:24
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.

None yet

2 participants