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

emacs: 25.2 -> 25.3 #29261

Merged
merged 1 commit into from Sep 12, 2017
Merged

emacs: 25.2 -> 25.3 #29261

merged 1 commit into from Sep 12, 2017

Conversation

mbrock
Copy link
Contributor

@mbrock mbrock commented Sep 12, 2017

Motivation for this change

https://lists.gnu.org/archive/html/emacs-devel/2017-09/msg00211.html

This is an emergency release to fix a security vulnerability in Emacs.

Enriched Text mode has its support for decoding 'x-display' disabled.
This feature allows saving 'display' properties as part of text.
Emacs 'display' properties support evaluation of arbitrary Lisp forms
as part of instantiating the property, so decoding 'x-display' is
vulnerable to executing arbitrary malicious Lisp code included in the
text (e.g., sent as part of an email message).

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 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 nox --run "nox-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Fits CONTRIBUTING.md.

@mbrock
emacs: 25.2 -> 25.3
78f457c 
https://lists.gnu.org/archive/html/emacs-devel/2017-09/msg00211.html

> This is an emergency release to fix a security vulnerability in Emacs.
>
> Enriched Text mode has its support for decoding 'x-display' disabled.
> This feature allows saving 'display' properties as part of text.
> Emacs 'display' properties support evaluation of arbitrary Lisp forms
> as part of instantiating the property, so decoding 'x-display' is
> vulnerable to executing arbitrary malicious Lisp code included in the
> text (e.g., sent as part of an email message).
@mention-bot
Copy link

@mbrock, thanks for your PR! By analyzing the history of the files in this pull request, we identified @jwiegley, @abbradar and @dudebout to be potential reviewers.

@mdorman
Copy link
Contributor

mdorman commented Sep 12, 2017

The actual emacs build passed on Linux (though failed on OSX).

@mguentner
Copy link
Contributor

Ref: #29287

@joachifm joachifm merged commit 026225e into NixOS:master Sep 12, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
1.severity: security
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
6 participants
@mbrock @mention-bot @mdorman @mguentner @joachifm @bjornfor