01/01: gnu: util-linux: Fix CVE-2018-7738.

[Leo Famulari]

lfam pushed a commit to branch master
in repository guix.

commit 77166eb758ff565837db9e9a26d34ba9aaa16281
Author: Leo Famulari <address@hidden>
Date:   Thu Mar 15 13:57:48 2018 -0400

    gnu: util-linux: Fix CVE-2018-7738.
    
    * gnu/packages/patches/util-linux-CVE-2018-7738.patch: New file.
    * gnu/local.mk (dist_patch_DATA): Add it.
    * gnu/packages/linux.scm (util-linux)[replacement]: New field.
    (util-linux/fixed): New variable.
---
 gnu/local.mk                                       |  1 +
 gnu/packages/linux.scm                             | 10 +++++
 .../patches/util-linux-CVE-2018-7738.patch         | 49 ++++++++++++++++++++++
 3 files changed, 60 insertions(+)

diff --git a/gnu/local.mk b/gnu/local.mk
index 69e4d2b..788b260 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1135,6 +1135,7 @@ dist_patch_DATA =                                         
\
   %D%/packages/patches/unzip-overflow-long-fsize.patch         \
   %D%/packages/patches/unzip-remove-build-date.patch           \
   %D%/packages/patches/ustr-fix-build-with-gcc-5.patch         \
+  %D%/packages/patches/util-linux-CVE-2018-7738.patch          \
   %D%/packages/patches/util-linux-tests.patch                  \
   %D%/packages/patches/upower-builddir.patch                   \
   %D%/packages/patches/valgrind-enable-arm.patch               \
diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm
index bd6f005..df6d746 100644
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@ -547,6 +547,7 @@ providing the system administrator with some help in common 
tasks.")
 (define-public util-linux
   (package
     (name "util-linux")
+    (replacement util-linux/fixed)
     (version "2.31")
     (source (origin
               (method url-fetch)
@@ -634,6 +635,15 @@ block devices, UUIDs, TTYs, and many other tools.")
     (license (list license:gpl3+ license:gpl2+ license:gpl2 license:lgpl2.0+
                    license:bsd-4 license:public-domain))))
 
+(define util-linux/fixed
+  (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")))))))
+
 (define-public ddate
   (package
     (name "ddate")
diff --git a/gnu/packages/patches/util-linux-CVE-2018-7738.patch 
b/gnu/packages/patches/util-linux-CVE-2018-7738.patch
new file mode 100644
index 0000000..080e2f5
--- /dev/null
+++ b/gnu/packages/patches/util-linux-CVE-2018-7738.patch
@@ -0,0 +1,49 @@
+Fix CVE-2018-7738:
+
+https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2018-7738
+
+Patch copied from upstream source repository:
+
+https://github.com/karelzak/util-linux/commit/75f03badd7ed9f1dd951863d75e756883d3acc55
+
+From 75f03badd7ed9f1dd951863d75e756883d3acc55 Mon Sep 17 00:00:00 2001
+From: Karel Zak <address@hidden>
+Date: Thu, 16 Nov 2017 16:27:32 +0100
+Subject: [PATCH] bash-completion: (umount) use findmnt, escape a space in
+ paths
+
+ # mount /dev/sdc1 /mnt/test/foo\ bar
+ # umount <tab>
+
+has to return "/mnt/test/foo\ bar".
+
+Changes:
+
+ * don't use mount | awk output, we have findmnt
+ * force compgen use \n as entries separator
+
+Addresses: https://github.com/karelzak/util-linux/issues/539
+Signed-off-by: Karel Zak <address@hidden>
+---
+ bash-completion/umount | 9 +++++----
+ 1 file changed, 5 insertions(+), 4 deletions(-)
+
+diff --git a/bash-completion/umount b/bash-completion/umount
+index d76cb9fff..98c90d61a 100644
+--- a/bash-completion/umount
++++ b/bash-completion/umount
+@@ -40,9 +40,10 @@ _umount_module()
+                       return 0
+                       ;;
+       esac
+-      local DEVS_MPOINTS
+-      DEVS_MPOINTS="$(mount | awk '{print $1, $3}')"
+-      COMPREPLY=( $(compgen -W "$DEVS_MPOINTS" -- $cur) )
+-      return 0
++
++      local oldifs=$IFS
++      IFS=$'\n'
++      COMPREPLY=( $( compgen -W '$(findmnt -lno TARGET | sed 
"s/\([[:blank:]]\)/\\\\\1/g")' -- "$cur" ) )
++      IFS=$oldifs
+ }
+ complete -F _umount_module umount