Skip to content

lxc: 2.0.4 -> 2.0.6 (security) #20766

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

Merged
merged 2 commits into from
Nov 28, 2016
Merged

lxc: 2.0.4 -> 2.0.6 (security) #20766

merged 2 commits into from
Nov 28, 2016

Conversation

avnik
Copy link
Contributor

@avnik avnik commented Nov 28, 2016

Motivation for this change

Update to fix CVE-2016-8649

Things done
  • Tested using sandboxing
    (nix.useSandbox on NixOS,
    or option build-use-sandbox in nix.conf
    on non-NixOS)
  • Built on platform(s)
    • NixOS
    • macOS
    • Linux
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nox --run "nox-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Fits CONTRIBUTING.md.

https://security-tracker.debian.org/tracker/CVE-2016-8649

Also fix chrooted build (attempt write to /etc/bash_completion.d)

Sorry, something went wrong.

@mention-bot
Copy link

@avnik, thanks for your PR! By analyzing the history of the files in this pull request, we identified @7c6f434c, @wkennington and @peti to be potential reviewers.

@pSub pSub added 1.severity: security Issues which raise a security issue, or PRs that fix one 8.has: package (update) This PR updates a package to a newer version labels Nov 28, 2016
@@ -57,6 +57,7 @@ stdenv.mkDerivation rec {
installFlags = [
"localstatedir=\${TMPDIR}"
"sysconfdir=\${out}/etc"
"bashcompdir=\${out}/etc/bash_completion.d"
Copy link
Member

Choose a reason for hiding this comment

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

Bash completion files should no longer go to etc since these are no configuration files. Instead, $out/share/bash-completion/completions/lxc would be the proper place.

Copy link
Member

Choose a reason for hiding this comment

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

For future security PRs, please make the minimum change necessary to get it fixed, then a separate PR (or commit) of the improvements

@avnik avnik force-pushed the update/lxc branch 2 times, most recently from 0055bd9 to dc2b1b7 Compare November 28, 2016 12:48
@avnik
Copy link
Contributor Author

avnik commented Nov 28, 2016

@peti I am asked on irc, about completion files placement, but no one answers.

@grahamc You are right, I splitted commits (Ideally they should be swapped, because it not builds without second one, but I am pushed as is)

@avnik
Copy link
Contributor Author

avnik commented Nov 28, 2016

Well, I am finally swapped them

@peti
Copy link
Member

peti commented Nov 28, 2016

@avnik, well, I am on IRC, but apparently I did not see your question.

@@ -58,6 +58,7 @@ stdenv.mkDerivation rec {
"localstatedir=\${TMPDIR}"
"sysconfdir=\${out}/etc"
"sysconfigdir=\${out}/etc/default"
"bashcompdir=\${out}/etc/bash_completion.d"
Copy link
Member

@peti peti Nov 28, 2016

Choose a reason for hiding this comment

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

Please put bash completion files into $out/share/bash-completion/completions, not into $out/etc/bash_completion.d.

@avnik
Copy link
Contributor Author

avnik commented Nov 28, 2016

@peti Fixed again, it strike back as rebase artifact

@@ -58,6 +58,7 @@ stdenv.mkDerivation rec {
"localstatedir=\${TMPDIR}"
"sysconfdir=\${out}/etc"
"sysconfigdir=\${out}/etc/default"
"bashcompdir=\${out}/share/bash-completion/completions/lxc"
Copy link
Member

@peti peti Nov 28, 2016

Choose a reason for hiding this comment

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

The directory is $out/share/bash-completion/completions, not $out/share/bash-completion/completions/lxc.

Package attempt to write /etc/bash_completion.d, I directed it to
"${out}/etc/bash_completion.d" as it was suggested.
@avnik
Copy link
Contributor Author

avnik commented Nov 28, 2016

@peti $out/share/bash-completion/completions/lxc would be the proper place. was your suggestion ;) But anyway I fixed as you requested in last comment.

@peti
Copy link
Member

peti commented Nov 28, 2016

@avnik, that path referred to the completion file that lxc would install.

@peti peti merged commit 21a5532 into NixOS:master Nov 28, 2016
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 8.has: package (update) This PR updates a package to a newer version
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants