Unverified Commit 2d13581e authored by parazyd's avatar parazyd

Merge stretch-security into ascii.

This fixes CVE-2018-7738.
parent 81ea6690
util-linux (2.29.2-1+devuan2.1) unstable; urgency=high
* Merge stretch-security into ascii
-- Ivan J. <parazyd@dyne.org> Fri, 04 May 2018 12:23:00 +0200
util-linux (2.29.2-1+deb9u1) stretch-security; urgency=high
* Non-maintainer upload by the Security Team.
* bash-completion: (umount) use findmnt, escape a space in paths
(CVE-2018-7738) (Closes: #892179)
-- Salvatore Bonaccorso <carnil@debian.org> Wed, 07 Mar 2018 19:29:09 +0100
util-linux (2.29.2-1+devuan2) unstable; urgency=medium
* Rebase on debian/2.29.2-1
......
From: Karel Zak <kzak@redhat.com>
Date: Thu, 16 Nov 2017 16:27:32 +0100
Subject: bash-completion: (umount) use findmnt, escape a space in paths
Origin: https://github.com/karelzak/util-linux/commit/75f03badd7ed9f1dd951863d75e756883d3acc55
Bug-Debian: https://bugs.debian.org/892179
Bug-Debian-Security: https://security-tracker.debian.org/tracker/CVE-2018-7738
# 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 <kzak@redhat.com>
---
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
--
2.16.2
......@@ -2,3 +2,4 @@ Multiarch-support-in-util-linux-build.patch
man-page-tweaks-cleanup-my_dev_t.h-ancient-stuff.patch
Disable-the-fallback-clause-in-hwclock-when-dev-rtc-.patch
verbose-tests.patch
bash-completion-umount-use-findmnt-escape-a-space-in.patch
......@@ -55,7 +55,6 @@ else
endif
%:
#dh $@ --with autoreconf
dh $@
override_dh_autoreconf:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment