From: Marius Bakke <mbakke@fastmail.com>
To: "Leo Famulari" <leo@famulari.name>, "Ludovic Courtès" <ludo@gnu.org>
Cc: 30827@debbugs.gnu.org
Subject: [bug#30827] [PATCH] gnu: util-linux: Fix CVE-2018-7738.
Date: Tue, 20 Mar 2018 02:23:08 +0100 [thread overview]
Message-ID: <87sh8vfslf.fsf@fastmail.com> (raw)
In-Reply-To: <20180319221551.GA25867@jasmine.lan>
[-- Attachment #1: Type: text/plain, Size: 3179 bytes --]
Leo Famulari <leo@famulari.name> writes:
> On Mon, Mar 19, 2018 at 10:15:22AM +0100, Ludovic Courtès wrote:
>> I’m late to the party, but I’m wondering in this case if, instead of
>> grafting, we should simply add an util-linux@2.31a package, and make
>> sure GuixSD uses that one in %base-packages.
>>
>> That way, both GuixSD and manually installed util-linux would get the
>> Bash completion fix. It’s probably OK that packages that depend on
>> util-linux don’t get the fixed version because users don’t get bash
>> completion from there.
>>
>> WDYT?
>
> What do you think of the attached patch?
> From c29872dab8ca0a8fc20bdaf4183d6f061fa2c677 Mon Sep 17 00:00:00 2001
> From: Leo Famulari <leo@famulari.name>
> Date: Mon, 19 Mar 2018 17:13:26 -0400
> Subject: [PATCH] gnu: util-linux: Fix CVE-2018-7738 without grafting.
>
> * gnu/packages/linux.scm (util-linux)[replacement]: Remove field.
> (util-linux-2.31.1): New variable.
> * gnu/system.scm (%base-packages): Use util-linux-2.31.1.
[...]
> -(define util-linux/fixed
> +;; The patch 'util-linux-CVE-2018-7738.patch' fixes a security bug in
> +;; the Bash completions for `mount`. Since this bug doesn't affect
> +;; other programs that link against libraries from util-linux, we don't
> +;; need to use a graft to make the fix available. Instead, users
> +;; installing util-linux will get the fix in this newer version, and
> +;; (@ (gnu system) %base-packages) takes care to use this package.
> +;; This solution was suggested here:
> +;; <https://debbugs.gnu.org/cgi/bugreport.cgi?bug=30827#13>
> +(define-public util-linux-2.31.1
> (package
> (inherit util-linux)
> - (source
> - (origin
> - (inherit (package-source util-linux))
> - (patches (append (origin-patches (package-source util-linux))
> - (search-patches "util-linux-CVE-2018-7738.patch")))))))
> + (name "util-linux")
> + ;; XXX Don't update this without also updating %base-packages!
> + (version "2.31.1")
> + (source (origin
> + (method url-fetch)
> + (uri (string-append "mirror://kernel.org/linux/utils/"
> + name "/v" (version-major+minor version) "/"
> + name "-" version ".tar.xz"))
> + (sha256
> + (base32
> + "04fzrnrr3pvqskvjn9f81y0knh0jvvqx4lmbz5pd4lfdm5pv2l8s"))
> + (patches (search-patches "util-linux-tests.patch"
> + "util-linux-CVE-2018-7738.patch"))
> + (modules '((guix build utils)))
> + (snippet
> + ;; We take the 'logger' program from GNU Inetutils and 'kill'
> + ;; from GNU Coreutils.
> + '(begin
> + (substitute* "configure"
> + (("build_logger=yes") "build_logger=no")
> + (("build_kill=yes") "build_kill=no"))
> + #t))))))
You can keep (inherit (package-source ...)) here to avoid duplicating
snippet, modules and method. Apart from that LGTM.
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 487 bytes --]
next prev parent reply other threads:[~2018-03-20 1:24 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-03-15 17:58 [bug#30827] [PATCH] gnu: util-linux: Fix CVE-2018-7738 Leo Famulari
2018-03-16 14:13 ` Marius Bakke
2018-03-19 9:15 ` Ludovic Courtès
2018-03-19 20:52 ` Leo Famulari
2018-03-19 22:15 ` Leo Famulari
2018-03-20 1:23 ` Marius Bakke [this message]
2018-03-20 8:47 ` Ludovic Courtès
2018-03-20 21:17 ` Leo Famulari
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://guix.gnu.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=87sh8vfslf.fsf@fastmail.com \
--to=mbakke@fastmail.com \
--cc=30827@debbugs.gnu.org \
--cc=leo@famulari.name \
--cc=ludo@gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).