Compare commits
3 Commits
Author | SHA1 | Date |
---|---|---|
Karel Zak | cafc6d2e51 | |
Karel Zak | 05aae355d4 | |
Karel Zak | 2d9903e743 |
|
@ -0,0 +1,44 @@
|
|||
From 75f03badd7ed9f1dd951863d75e756883d3acc55 Mon Sep 17 00:00:00 2001
|
||||
From: Karel Zak <kzak@redhat.com>
|
||||
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 <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.14.3
|
||||
|
|
@ -0,0 +1,32 @@
|
|||
From 5b6fa6063990017f3384476537106caa9e3f5867 Mon Sep 17 00:00:00 2001
|
||||
From: Karel Zak <kzak@redhat.com>
|
||||
Date: Tue, 27 Mar 2018 10:40:13 +0200
|
||||
Subject: [PATCH] column: fix leading space characters bug
|
||||
|
||||
The bug has been introduced during column(1) rewrite. The function
|
||||
read_input() need to skip leading space only temporary to detect empty
|
||||
lines, but the rest of the code has to use the original buffer (line).
|
||||
|
||||
Addresses: https://github.com/karelzak/util-linux/issues/575
|
||||
Addresses: https://bugzilla.redhat.com/show_bug.cgi?id=1560283
|
||||
Signed-off-by: Karel Zak <kzak@redhat.com>
|
||||
---
|
||||
text-utils/column.c | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/text-utils/column.c b/text-utils/column.c
|
||||
index 5eb0de1ae..d6a6385e3 100644
|
||||
--- a/text-utils/column.c
|
||||
+++ b/text-utils/column.c
|
||||
@@ -452,7 +452,7 @@ static int read_input(struct column_control *ctl, FILE *fp)
|
||||
if (!str || !*str)
|
||||
continue;
|
||||
|
||||
- wcs = mbs_to_wcs(str);
|
||||
+ wcs = mbs_to_wcs(buf);
|
||||
if (!wcs)
|
||||
err(EXIT_FAILURE, _("read failed"));
|
||||
|
||||
--
|
||||
2.14.3
|
||||
|
|
@ -2,7 +2,7 @@
|
|||
Summary: A collection of basic system utilities
|
||||
Name: util-linux
|
||||
Version: 2.30.2
|
||||
Release: 1%{?dist}
|
||||
Release: 3%{?dist}
|
||||
License: GPLv2 and GPLv2+ and LGPLv2+ and BSD with advertising and Public Domain
|
||||
Group: System Environment/Base
|
||||
URL: http://en.wikipedia.org/wiki/Util-linux
|
||||
|
@ -89,6 +89,12 @@ Requires: libfdisk = %{version}-%{release}
|
|||
# 151635 - makeing /var/log/lastlog
|
||||
Patch0: 2.28-login-lastlog-create.patch
|
||||
|
||||
# 1552641 - CVE-2018-7738 util-linux: Shell command injection in unescaped bash-completed mount point names
|
||||
Patch1: 0001-bash-completion-umount-use-findmnt-escape-a-space-in.patch
|
||||
|
||||
# 1560283 - column does not properly handle spaces at beginning of tab-separated table columns
|
||||
Patch2: column-fix-leading-space-characters-bug.patch
|
||||
|
||||
%description
|
||||
The util-linux package contains a large variety of low-level system
|
||||
utilities that are necessary for a Linux system to function. Among
|
||||
|
@ -930,6 +936,12 @@ exit 0
|
|||
%{_libdir}/python*/site-packages/libmount/*
|
||||
|
||||
%changelog
|
||||
* Tue Mar 27 2018 Karel Zak <kzak@redhat.com> - 2.30.2-3
|
||||
- fix #1560283 - column does not properly handle spaces at beginning of tab-separated table columns
|
||||
|
||||
* Thu Mar 8 2018 Karel Zak <kzak@redhat.com> - 2.30.2-2
|
||||
- fix #1552641 - CVE-2018-7738 util-linux: Shell command injection in unescaped bash-completed mount point names
|
||||
|
||||
* Fri Sep 22 2017 Karel Zak <kzak@redhat.com> - 2.30.2-1
|
||||
- upgrade to v2.30.2
|
||||
http://ftp.kernel.org/pub/linux/utils/util-linux/v2.30/v2.30.2-ReleaseNotes
|
||||
|
|
Loading…
Reference in New Issue