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.

Sign up for GitHub

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

Jump to bottom

crispy-doom: fixed CVE-2020-14983 #92236

Merged
merged 1 commit into from Jul 5, 2020
Merged

crispy-doom: fixed CVE-2020-14983 #92236

merged 1 commit into from Jul 5, 2020

Conversation

neonfuz
Copy link
Contributor

@neonfuz neonfuz commented Jul 3, 2020

Motivation for this change

Fix CVE-2020-14983

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.

@neonfuz neonfuz mentioned this pull request Jul 3, 2020
Closed
1 task
danieldk
danieldk suggested changes Jul 4, 2020
View reviewed changes
Copy link
Contributor

@danieldk danieldk left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for the fix. Please use fetchpatch to make the origin of the patches clear.

pkgs/games/crispy-doom/default.nix Outdated Show resolved Hide resolved
@ckauhaus ckauhaus linked an issue Jul 4, 2020 that may be closed by this pull request
Vulnerability roundup 87: crispy-doom-5.8.0: 1 advisory [9.8] #92015
Closed
1 task
@neonfuz
Copy link
Contributor Author

neonfuz commented Jul 5, 2020

Okay added fetchpatch. When writing this I almost did this but forgot the pattern (almost used fetchurl lol)

Also would like to point out this is a security patch so this should be backported to at least 20.03.

@danieldk
Copy link
Contributor

danieldk commented Jul 5, 2020

I made two changes to the commit:

  • The hashes were incorrect. Note that fetchpatch does some normalization, so the hash is not the same as fetchurl/nix-prefetch-url.
  • Used nixpkgs-fmt to make the formatting a bit more canonical (just some spacing changes).

I will merge this once ofborg is also happy.

danieldk
danieldk approved these changes Jul 5, 2020
View reviewed changes
Copy link
Contributor

@danieldk danieldk left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Result of nixpkgs-review pr 92236 1

1 package built:
- crispyDoom

Checked that the binary works.

@danieldk danieldk merged commit cfceaae into NixOS:master Jul 5, 2020
@veprbl veprbl added 1.severity: security 8.has: port to stable A PR already has a backport to the stable release. labels Jul 5, 2020
@neonfuz
Copy link
Contributor Author

neonfuz commented Jul 7, 2020

Oh weird, it built for me without error so I assumed the hashes were fine. Thanks for the minor changes!

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

@danieldk danieldk danieldk approved these changes

Assignees
No one assigned
Labels
1.severity: security 8.has: port to stable A PR already has a backport to the stable release. 10.rebuild-darwin: 1-10 10.rebuild-darwin: 1 10.rebuild-linux: 1-10 10.rebuild-linux: 1 11.by: package-maintainer
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Vulnerability roundup 87: crispy-doom-5.8.0: 1 advisory [9.8]
3 participants
@neonfuz @danieldk @veprbl