From cfb71fe91294d0f5addc3ae1394e3756060c43f099853c4530d3f3f8297a4bb0 Mon Sep 17 00:00:00 2001 From: Stanislav Brabec Date: Fri, 30 Jan 2015 15:19:56 +0000 Subject: [PATCH 1/6] Accepting request 281437 from home:AndreasSchwab:f - Use util-linux:/bin/logger as split-provide, /usr/lib/systemd/system/fstrim.service didn't exist in 13.1 OBS-URL: https://build.opensuse.org/request/show/281437 OBS-URL: https://build.opensuse.org/package/show/Base:System/util-linux?expand=0&rev=270 --- python-libmount.changes | 6 ++++++ python-libmount.spec | 5 ++--- util-linux-systemd.changes | 6 ++++++ util-linux-systemd.spec | 2 +- util-linux.changes | 6 ++++++ util-linux.spec | 2 +- 6 files changed, 22 insertions(+), 5 deletions(-) diff --git a/python-libmount.changes b/python-libmount.changes index aefa97f..f6af435 100644 --- a/python-libmount.changes +++ b/python-libmount.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Jan 15 17:15:47 UTC 2015 - schwab@linux-m68k.org + +- Use util-linux:/bin/logger as split-provide, + /usr/lib/systemd/system/fstrim.service didn't exist in 13.1 + ------------------------------------------------------------------- Sat Jan 10 02:24:25 UTC 2015 - jengelh@inai.de diff --git a/python-libmount.spec b/python-libmount.spec index 08b1d77..3044f84 100644 --- a/python-libmount.spec +++ b/python-libmount.spec @@ -76,7 +76,7 @@ Name: python-libmount %endif Summary: %main_summary License: GPL-2.0+ -Group: %group_pl +Group: %main_group BuildRequires: audit-devel BuildRequires: bc BuildRequires: binutils-devel @@ -215,7 +215,7 @@ Recommends: which %if %build_util_linux_systemd Supplements: packageand(util-linux:systemd) # Split-provides for upgrade from SLE < 12 and openSUSE <= 13.1 -Provides: util-linux:/usr/lib/systemd/system/fstrim.service +Provides: util-linux:/bin/logger # Service files are being migrated during the update from SLE < 12 and openSUSE <= 13.1 Conflicts: util-linux < 2.25 %systemd_requires @@ -366,7 +366,6 @@ SMP systems. %if %build_util_linux %package -n python-libmount Summary: %summary_pl -License: GPL-2.0+ Group: %group_pl %description -n python-libmount diff --git a/util-linux-systemd.changes b/util-linux-systemd.changes index aefa97f..f6af435 100644 --- a/util-linux-systemd.changes +++ b/util-linux-systemd.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Jan 15 17:15:47 UTC 2015 - schwab@linux-m68k.org + +- Use util-linux:/bin/logger as split-provide, + /usr/lib/systemd/system/fstrim.service didn't exist in 13.1 + ------------------------------------------------------------------- Sat Jan 10 02:24:25 UTC 2015 - jengelh@inai.de diff --git a/util-linux-systemd.spec b/util-linux-systemd.spec index 7fb79f5..65ad4fc 100644 --- a/util-linux-systemd.spec +++ b/util-linux-systemd.spec @@ -215,7 +215,7 @@ Recommends: which %if %build_util_linux_systemd Supplements: packageand(util-linux:systemd) # Split-provides for upgrade from SLE < 12 and openSUSE <= 13.1 -Provides: util-linux:/usr/lib/systemd/system/fstrim.service +Provides: util-linux:/bin/logger # Service files are being migrated during the update from SLE < 12 and openSUSE <= 13.1 Conflicts: util-linux < 2.25 %systemd_requires diff --git a/util-linux.changes b/util-linux.changes index aefa97f..f6af435 100644 --- a/util-linux.changes +++ b/util-linux.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Jan 15 17:15:47 UTC 2015 - schwab@linux-m68k.org + +- Use util-linux:/bin/logger as split-provide, + /usr/lib/systemd/system/fstrim.service didn't exist in 13.1 + ------------------------------------------------------------------- Sat Jan 10 02:24:25 UTC 2015 - jengelh@inai.de diff --git a/util-linux.spec b/util-linux.spec index 802815b..d3e8902 100644 --- a/util-linux.spec +++ b/util-linux.spec @@ -215,7 +215,7 @@ Recommends: which %if %build_util_linux_systemd Supplements: packageand(util-linux:systemd) # Split-provides for upgrade from SLE < 12 and openSUSE <= 13.1 -Provides: util-linux:/usr/lib/systemd/system/fstrim.service +Provides: util-linux:/bin/logger # Service files are being migrated during the update from SLE < 12 and openSUSE <= 13.1 Conflicts: util-linux < 2.25 %systemd_requires From 762e4eea0139173b7a0fcddf2539118db5de9c498748d311bea4a518223d41de Mon Sep 17 00:00:00 2001 From: Stanislav Brabec Date: Wed, 4 Feb 2015 17:16:01 +0000 Subject: [PATCH 2/6] Accepting request 283347 from home:rudi_m:branches:Base:System - Update to version 2.25.2: mostly minor fixes - re-enable utmpdump and ipcs tests for all archs OBS-URL: https://build.opensuse.org/request/show/283347 OBS-URL: https://build.opensuse.org/package/show/Base:System/util-linux?expand=0&rev=271 --- python-libmount.changes | 5 +++++ python-libmount.spec | 9 +-------- util-linux-2.25.1.tar.sign | 17 ----------------- util-linux-2.25.1.tar.xz | 3 --- util-linux-2.25.2.tar.sign | 17 +++++++++++++++++ util-linux-2.25.2.tar.xz | 3 +++ util-linux-systemd.changes | 5 +++++ util-linux-systemd.spec | 9 +-------- util-linux.changes | 5 +++++ util-linux.spec | 9 +-------- 10 files changed, 38 insertions(+), 44 deletions(-) delete mode 100644 util-linux-2.25.1.tar.sign delete mode 100644 util-linux-2.25.1.tar.xz create mode 100644 util-linux-2.25.2.tar.sign create mode 100644 util-linux-2.25.2.tar.xz diff --git a/python-libmount.changes b/python-libmount.changes index f6af435..ec756ba 100644 --- a/python-libmount.changes +++ b/python-libmount.changes @@ -1,3 +1,8 @@ +Thu Jan 29 14:13:41 UTC 2015 - sweet_f_a@gmx.de + +- Update to version 2.25.2: mostly minor fixes +- re-enable utmpdump and ipcs tests for all archs + ------------------------------------------------------------------- Thu Jan 15 17:15:47 UTC 2015 - schwab@linux-m68k.org diff --git a/python-libmount.spec b/python-libmount.spec index 3044f84..004a6ea 100644 --- a/python-libmount.spec +++ b/python-libmount.spec @@ -120,7 +120,7 @@ BuildRequires: libmount-devel %endif %endif #END SECOND STAGE DEPENDENCIES -Version: 2.25.1 +Version: 2.25.2 Release: 0 # util-linux is a base package and uuidd pre-requiring pwdutils pulls # that into the core build cycle. pwdutils also pulls in the whole @@ -609,13 +609,8 @@ export TS_OPT_kill_name_to_number_known_fail="yes" export TS_OPT_kill_print_pid_known_fail="yes" export TS_OPT_kill_queue_known_fail="yes" %endif -%ifarch aarch64 s390 s390x -export TS_OPT_utmpdump_known_fail="yes" -%endif # FIXME: These sometimes fails: export TS_OPT_libmount_lock_known_fail="yes" -# FIXME: It still fails with 3a9ec12: -export TS_OPT_ipcs_limits2_known_fail="yes" # # hacks export PATH="$PATH:/sbin:/usr/sbin" @@ -901,14 +896,12 @@ fi %doc Documentation/cal.txt %doc Documentation/col.txt %doc Documentation/deprecated.txt -%doc Documentation/fdisk.txt %doc Documentation/getopt.txt %doc Documentation/howto-debug.txt %doc Documentation/hwclock.txt %doc Documentation/modems-with-agetty.txt %doc Documentation/mount.txt %doc Documentation/pg.txt -%doc Documentation/sfdisk.txt %config %attr(744,root,root) %{_sysconfdir}/init.d/raw %config(noreplace) %attr(644,root,root) %{_sysconfdir}/raw %config(noreplace) %{_sysconfdir}/filesystems diff --git a/util-linux-2.25.1.tar.sign b/util-linux-2.25.1.tar.sign deleted file mode 100644 index 75ede4f..0000000 --- a/util-linux-2.25.1.tar.sign +++ /dev/null @@ -1,17 +0,0 @@ ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1 - -iQIcBAABAgAGBQJUBu2tAAoJEOS3HV7sOcKEkGoP/18DDxNf35S8AQeXlI8fxGNL -+3udU3DWmYLHepRx3fF4swiQiyVE44YdOyTQsqVNr87dPmh2HeO8ewy1dRqaalJi -+FdU7BXYLz9pKOZpiSdD3DmzqTAMeBUC0m1zkCdO0aYHExMckVFRkDot26n4geEQ -vb0zN67bNK8J0Pif5XDmA0xMlwuvBSe2Epmjhf5snNXOqjArRmwbSEwhk77TfH0F -NrBoyQryKwhUio8P4z1U4Gu1SaNBolemgItDV9VqpNl38rY4U7EejGcEUQGseImt -q49SBYBZ3jSxO0urfT8Nlw9gbrVOd8fHQkaHfJrROJePGckDo+sDDCKTGZGqx45q -+Q6L7Uik+UNFVeBhhe22ctfi3oytNheNjPMx2hYs/jslqluMxmggm39Y8PBS/ZwT -zp951T0XMx/kwBizD8NSvGHkALNcbFP1HCUVb5IsgOtZba3LusKi23W4mplCnmfD -0RiwBoPkcFWwJb3Ih5mK0ahZLEDjMpyt/GLVdAh6SFdEDvdIcfjDUNRuXTDtg28/ -80XyBFe+hqGtutHRLF0K1lOqt5pNyXsnKiS6UdH/Detl8g7F/BUmBFRnxfpNqLab -AvKW+TLryi1Ilrtpj1Va6KzdmFzK84KIxrmPmWpcyt16HDVnlcqrvdhLjD/Wx2Wt -VGUYi2GOUXFBCIJrZ50d -=tkds ------END PGP SIGNATURE----- diff --git a/util-linux-2.25.1.tar.xz b/util-linux-2.25.1.tar.xz deleted file mode 100644 index 9f1af75..0000000 --- a/util-linux-2.25.1.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:4701305ae22790c3a92ce48e50794fa05b7ee01f4227f419a171c100d08986e8 -size 3695172 diff --git a/util-linux-2.25.2.tar.sign b/util-linux-2.25.2.tar.sign new file mode 100644 index 0000000..f5cdfad --- /dev/null +++ b/util-linux-2.25.2.tar.sign @@ -0,0 +1,17 @@ +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1 + +iQIcBAABAgAGBQJUSk3GAAoJEOS3HV7sOcKEsrcQAIRmU5klSM7Q+JWzvvvdoKhb +wVqB5VbYCZEH8L5NMRQwzWbZcMtIsFAD6T7tH6hX/jjYxMB5FdJfWrCdaYsevY6k +hpUkEAK6FWzGGJE/s5sq90zgoDQHCBG2VRxLiKj4WfO8zKfBiJTrA43NQPCSj6pN +fT/t1fzpTQj5BRrhjH/e3ghz+CvSw9LH5RZqB8gURBly+1zuTxDw3zfVEqA44/Y7 +Dl+G+r6DzuiUTjGhXlEeG+NfImGhWAiw+r7ScTBEYmF5lQ1VUWlNCg3cX8/JIU/o +U9TQL3mBdcLc0kVBsQ0XcroCpEyYBNDbyjGUEQ8PIVMCdqg114Jphdp7j+9tecSs +ofBo/P99U43jFtozow+ECHYX6j9LiTyynPZAmMnD+bvtIL/tBDaP4/x0qeqtmJyF ++I+V7fARGqMmyt+3xRD3euN16X15HAOW7tchAfhj7T35WfXfV5jHTiz9RA58EgJ5 +7MKAkezEpMbeWUXkVe2nm9Lcki2pU+iuGC36L6hi1Jlxe58gdF1bE2UXW3eXb6mc +1E3uC3jCJ+5gG8mJBYpf4nt+sXA7Elv9QahTsXABbUyNxR43E47rQgsmPqTZgU8O +TxRUz/ZI1ytVFTeledsWb35mItxiP9g8HgCZF7idcZkqx1p41DMkjj7GCkSHxDju +H19vNbkWYnuK8AoqPAQy +=RONJ +-----END PGP SIGNATURE----- diff --git a/util-linux-2.25.2.tar.xz b/util-linux-2.25.2.tar.xz new file mode 100644 index 0000000..044440d --- /dev/null +++ b/util-linux-2.25.2.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e0457f715b73f4a349e1acb08cb410bf0edc9a74a3f75c357070f31f70e33cd6 +size 3703644 diff --git a/util-linux-systemd.changes b/util-linux-systemd.changes index f6af435..ec756ba 100644 --- a/util-linux-systemd.changes +++ b/util-linux-systemd.changes @@ -1,3 +1,8 @@ +Thu Jan 29 14:13:41 UTC 2015 - sweet_f_a@gmx.de + +- Update to version 2.25.2: mostly minor fixes +- re-enable utmpdump and ipcs tests for all archs + ------------------------------------------------------------------- Thu Jan 15 17:15:47 UTC 2015 - schwab@linux-m68k.org diff --git a/util-linux-systemd.spec b/util-linux-systemd.spec index 65ad4fc..7f96ddc 100644 --- a/util-linux-systemd.spec +++ b/util-linux-systemd.spec @@ -120,7 +120,7 @@ BuildRequires: libmount-devel %endif %endif #END SECOND STAGE DEPENDENCIES -Version: 2.25.1 +Version: 2.25.2 Release: 0 # util-linux is a base package and uuidd pre-requiring pwdutils pulls # that into the core build cycle. pwdutils also pulls in the whole @@ -609,13 +609,8 @@ export TS_OPT_kill_name_to_number_known_fail="yes" export TS_OPT_kill_print_pid_known_fail="yes" export TS_OPT_kill_queue_known_fail="yes" %endif -%ifarch aarch64 s390 s390x -export TS_OPT_utmpdump_known_fail="yes" -%endif # FIXME: These sometimes fails: export TS_OPT_libmount_lock_known_fail="yes" -# FIXME: It still fails with 3a9ec12: -export TS_OPT_ipcs_limits2_known_fail="yes" # # hacks export PATH="$PATH:/sbin:/usr/sbin" @@ -901,14 +896,12 @@ fi %doc Documentation/cal.txt %doc Documentation/col.txt %doc Documentation/deprecated.txt -%doc Documentation/fdisk.txt %doc Documentation/getopt.txt %doc Documentation/howto-debug.txt %doc Documentation/hwclock.txt %doc Documentation/modems-with-agetty.txt %doc Documentation/mount.txt %doc Documentation/pg.txt -%doc Documentation/sfdisk.txt %config %attr(744,root,root) %{_sysconfdir}/init.d/raw %config(noreplace) %attr(644,root,root) %{_sysconfdir}/raw %config(noreplace) %{_sysconfdir}/filesystems diff --git a/util-linux.changes b/util-linux.changes index f6af435..ec756ba 100644 --- a/util-linux.changes +++ b/util-linux.changes @@ -1,3 +1,8 @@ +Thu Jan 29 14:13:41 UTC 2015 - sweet_f_a@gmx.de + +- Update to version 2.25.2: mostly minor fixes +- re-enable utmpdump and ipcs tests for all archs + ------------------------------------------------------------------- Thu Jan 15 17:15:47 UTC 2015 - schwab@linux-m68k.org diff --git a/util-linux.spec b/util-linux.spec index d3e8902..08cd63b 100644 --- a/util-linux.spec +++ b/util-linux.spec @@ -120,7 +120,7 @@ BuildRequires: libmount-devel %endif %endif #END SECOND STAGE DEPENDENCIES -Version: 2.25.1 +Version: 2.25.2 Release: 0 # util-linux is a base package and uuidd pre-requiring pwdutils pulls # that into the core build cycle. pwdutils also pulls in the whole @@ -609,13 +609,8 @@ export TS_OPT_kill_name_to_number_known_fail="yes" export TS_OPT_kill_print_pid_known_fail="yes" export TS_OPT_kill_queue_known_fail="yes" %endif -%ifarch aarch64 s390 s390x -export TS_OPT_utmpdump_known_fail="yes" -%endif # FIXME: These sometimes fails: export TS_OPT_libmount_lock_known_fail="yes" -# FIXME: It still fails with 3a9ec12: -export TS_OPT_ipcs_limits2_known_fail="yes" # # hacks export PATH="$PATH:/sbin:/usr/sbin" @@ -901,14 +896,12 @@ fi %doc Documentation/cal.txt %doc Documentation/col.txt %doc Documentation/deprecated.txt -%doc Documentation/fdisk.txt %doc Documentation/getopt.txt %doc Documentation/howto-debug.txt %doc Documentation/hwclock.txt %doc Documentation/modems-with-agetty.txt %doc Documentation/mount.txt %doc Documentation/pg.txt -%doc Documentation/sfdisk.txt %config %attr(744,root,root) %{_sysconfdir}/init.d/raw %config(noreplace) %attr(644,root,root) %{_sysconfdir}/raw %config(noreplace) %{_sysconfdir}/filesystems From 09c19db6276e8bc539288f665e6c2a7f969bad44a9f71668262a1d52feb387e9 Mon Sep 17 00:00:00 2001 From: Stanislav Brabec Date: Wed, 4 Feb 2015 17:32:09 +0000 Subject: [PATCH 3/6] Accepting request 284097 from home:sbrabec:branches:Base:System Include upgrade bug#. OBS-URL: https://build.opensuse.org/request/show/284097 OBS-URL: https://build.opensuse.org/package/show/Base:System/util-linux?expand=0&rev=272 --- python-libmount.changes | 2 ++ python-libmount.spec | 2 +- util-linux-systemd.changes | 2 ++ util-linux-systemd.spec | 2 +- util-linux.changes | 2 ++ util-linux.spec | 2 +- 6 files changed, 9 insertions(+), 3 deletions(-) diff --git a/python-libmount.changes b/python-libmount.changes index ec756ba..a481d40 100644 --- a/python-libmount.changes +++ b/python-libmount.changes @@ -1,6 +1,8 @@ +------------------------------------------------------------------- Thu Jan 29 14:13:41 UTC 2015 - sweet_f_a@gmx.de - Update to version 2.25.2: mostly minor fixes + (including boo#908742, CVE-2014-9114 = bsc#907434) - re-enable utmpdump and ipcs tests for all archs ------------------------------------------------------------------- diff --git a/python-libmount.spec b/python-libmount.spec index 004a6ea..e8fef39 100644 --- a/python-libmount.spec +++ b/python-libmount.spec @@ -1,7 +1,7 @@ # # spec file for package python-libmount # -# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed diff --git a/util-linux-systemd.changes b/util-linux-systemd.changes index ec756ba..a481d40 100644 --- a/util-linux-systemd.changes +++ b/util-linux-systemd.changes @@ -1,6 +1,8 @@ +------------------------------------------------------------------- Thu Jan 29 14:13:41 UTC 2015 - sweet_f_a@gmx.de - Update to version 2.25.2: mostly minor fixes + (including boo#908742, CVE-2014-9114 = bsc#907434) - re-enable utmpdump and ipcs tests for all archs ------------------------------------------------------------------- diff --git a/util-linux-systemd.spec b/util-linux-systemd.spec index 7f96ddc..9b1a9a5 100644 --- a/util-linux-systemd.spec +++ b/util-linux-systemd.spec @@ -1,7 +1,7 @@ # # spec file for package util-linux-systemd # -# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed diff --git a/util-linux.changes b/util-linux.changes index ec756ba..a481d40 100644 --- a/util-linux.changes +++ b/util-linux.changes @@ -1,6 +1,8 @@ +------------------------------------------------------------------- Thu Jan 29 14:13:41 UTC 2015 - sweet_f_a@gmx.de - Update to version 2.25.2: mostly minor fixes + (including boo#908742, CVE-2014-9114 = bsc#907434) - re-enable utmpdump and ipcs tests for all archs ------------------------------------------------------------------- diff --git a/util-linux.spec b/util-linux.spec index 08cd63b..a5a40af 100644 --- a/util-linux.spec +++ b/util-linux.spec @@ -1,7 +1,7 @@ # # spec file for package util-linux # -# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed From 74542b9d3466d7aa567ffe84482fa6a1ea9d173d8e97ceb6264104a83a2445df Mon Sep 17 00:00:00 2001 From: Stanislav Brabec Date: Wed, 4 Feb 2015 17:39:12 +0000 Subject: [PATCH 4/6] 2.25.2 does not fix CVE-2014-9114 = bsc#907434, only boo#908742! OBS-URL: https://build.opensuse.org/package/show/Base:System/util-linux?expand=0&rev=273 --- python-libmount.changes | 2 +- util-linux-systemd.changes | 2 +- util-linux.changes | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/python-libmount.changes b/python-libmount.changes index a481d40..b972a08 100644 --- a/python-libmount.changes +++ b/python-libmount.changes @@ -2,7 +2,7 @@ Thu Jan 29 14:13:41 UTC 2015 - sweet_f_a@gmx.de - Update to version 2.25.2: mostly minor fixes - (including boo#908742, CVE-2014-9114 = bsc#907434) + (including boo#908742) - re-enable utmpdump and ipcs tests for all archs ------------------------------------------------------------------- diff --git a/util-linux-systemd.changes b/util-linux-systemd.changes index a481d40..b972a08 100644 --- a/util-linux-systemd.changes +++ b/util-linux-systemd.changes @@ -2,7 +2,7 @@ Thu Jan 29 14:13:41 UTC 2015 - sweet_f_a@gmx.de - Update to version 2.25.2: mostly minor fixes - (including boo#908742, CVE-2014-9114 = bsc#907434) + (including boo#908742) - re-enable utmpdump and ipcs tests for all archs ------------------------------------------------------------------- diff --git a/util-linux.changes b/util-linux.changes index a481d40..b972a08 100644 --- a/util-linux.changes +++ b/util-linux.changes @@ -2,7 +2,7 @@ Thu Jan 29 14:13:41 UTC 2015 - sweet_f_a@gmx.de - Update to version 2.25.2: mostly minor fixes - (including boo#908742, CVE-2014-9114 = bsc#907434) + (including boo#908742) - re-enable utmpdump and ipcs tests for all archs ------------------------------------------------------------------- From 2228e7f396f48890e2d7bc272fed90594fc2e1752d7bf27323a35795bc5cb409 Mon Sep 17 00:00:00 2001 From: Stanislav Brabec Date: Wed, 4 Feb 2015 18:38:40 +0000 Subject: [PATCH 5/6] - libblkid: care about unsafe chars and possible buffer overflow in cache (CVE-2014-9114, util-linux-libblkid-unsafe-chars.patch, util-linux-libblkid-overflow.patch, bsc#907434) OBS-URL: https://build.opensuse.org/package/show/Base:System/util-linux?expand=0&rev=274 --- python-libmount.changes | 7 ++ python-libmount.spec | 6 + util-linux-libblkid-overflow.patch | 101 +++++++++++++++ util-linux-libblkid-unsafe-chars.patch | 167 +++++++++++++++++++++++++ util-linux-systemd.changes | 7 ++ util-linux-systemd.spec | 6 + util-linux.changes | 7 ++ util-linux.spec | 6 + 8 files changed, 307 insertions(+) create mode 100644 util-linux-libblkid-overflow.patch create mode 100644 util-linux-libblkid-unsafe-chars.patch diff --git a/python-libmount.changes b/python-libmount.changes index b972a08..d45f52b 100644 --- a/python-libmount.changes +++ b/python-libmount.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Wed Feb 4 19:08:43 CET 2015 - sbrabec@suse.cz + +- libblkid: care about unsafe chars and possible buffer overflow + in cache (CVE-2014-9114, util-linux-libblkid-unsafe-chars.patch, + util-linux-libblkid-overflow.patch, bsc#907434) + ------------------------------------------------------------------- Thu Jan 29 14:13:41 UTC 2015 - sweet_f_a@gmx.de diff --git a/python-libmount.spec b/python-libmount.spec index e8fef39..4611e66 100644 --- a/python-libmount.spec +++ b/python-libmount.spec @@ -160,6 +160,10 @@ Source51: blkid.conf Patch4: make-sure-sbin-resp-usr-sbin-are-in-PATH.diff # PATCH-FEATURE-SUSE -- Report about disabled encryption to stderr. Patch12: util-linux-noenc-suse.patch +# PATCH-FIX-SECURITY util-linux-libblkid-unsafe-chars.patch bsc907434 CVE-2014-9114 sbrabec@suse.cz -- libblkid: care about unsafe chars in cache +Patch13: util-linux-libblkid-unsafe-chars.patch +# PATCH-FIX-SECURITY util-linux-libblkid-overflow.patch bsc907434 CVE-2014-9114 sbrabec@suse.cz -- libblkid: fix possible buffer overflow +Patch14: util-linux-libblkid-overflow.patch ## ## klogconsole ## @@ -383,6 +387,8 @@ xzcat %{S:0} | %gpg_verify -p %{_name} %{S:12} - %setup -q -n %{_name}-%{version} -b 40 %patch4 -p1 %patch12 -p1 +%patch13 -p1 +%patch14 -p1 # # setctsid cp -p %{S:22} %{S:23} . diff --git a/util-linux-libblkid-overflow.patch b/util-linux-libblkid-overflow.patch new file mode 100644 index 0000000..0f8e763 --- /dev/null +++ b/util-linux-libblkid-overflow.patch @@ -0,0 +1,101 @@ +From 109df14fad4e9570e26950913ebace6c79289400 Mon Sep 17 00:00:00 2001 +From: Sebastian Krahmer +Date: Fri, 5 Dec 2014 10:06:42 +0100 +Subject: [PATCH] libblkid: fix potential bufer overflows + +While digging deeper into libblk probing, I found that some +computations might wrap and allocate too few buffer space which then +overflows. In particular on 32bit systems (chromebook) where size_t is +32bit, this is problematic (for 64bit the result fits into the calloc +size_t). + +Signed-off-by: Karel Zak +--- + libblkid/src/partitions/gpt.c | 12 ++++++++---- + libblkid/src/probe.c | 7 +++++++ + libblkid/src/superblocks/zfs.c | 3 +++ + 3 files changed, 18 insertions(+), 4 deletions(-) + +diff --git a/libblkid/src/partitions/gpt.c b/libblkid/src/partitions/gpt.c +index 6ab4f71..665577f 100644 +--- a/libblkid/src/partitions/gpt.c ++++ b/libblkid/src/partitions/gpt.c +@@ -17,6 +17,7 @@ + #include + #include + #include ++#include + + #include "partitions.h" + #include "crc32.h" +@@ -263,14 +264,17 @@ static struct gpt_header *get_gpt_header( + return NULL; + } + +- /* Size of blocks with GPT entries */ +- esz = le32_to_cpu(h->num_partition_entries) * +- le32_to_cpu(h->sizeof_partition_entry); +- if (!esz) { ++ if (le32_to_cpu(h->num_partition_entries) == 0 || ++ le32_to_cpu(h->sizeof_partition_entry) == 0 || ++ ULONG_MAX / le32_to_cpu(h->num_partition_entries) < le32_to_cpu(h->sizeof_partition_entry)) { + DBG(LOWPROBE, ul_debug("GPT entries undefined")); + return NULL; + } + ++ /* Size of blocks with GPT entries */ ++ esz = le32_to_cpu(h->num_partition_entries) * ++ le32_to_cpu(h->sizeof_partition_entry); ++ + /* The header seems valid, save it + * (we don't care about zeros in hdr->reserved2 area) */ + memcpy(hdr, h, sizeof(*h)); +diff --git a/libblkid/src/probe.c b/libblkid/src/probe.c +index 3f7e43b..70e882a 100644 +--- a/libblkid/src/probe.c ++++ b/libblkid/src/probe.c +@@ -103,6 +103,7 @@ + #include + #include + #include ++#include + + #ifdef HAVE_LIBUUID + # include +@@ -578,6 +579,12 @@ unsigned char *blkid_probe_get_buffer(blkid_probe pr, + return NULL; + } + ++ /* someone trying to overflow some buffers? */ ++ if (len > ULONG_MAX - sizeof(struct blkid_bufinfo)) { ++ errno = ENOMEM; ++ return NULL; ++ } ++ + /* allocate info and space for data by why call */ + bf = calloc(1, sizeof(struct blkid_bufinfo) + len); + if (!bf) { +diff --git a/libblkid/src/superblocks/zfs.c b/libblkid/src/superblocks/zfs.c +index 6ffa24d..86da59d 100644 +--- a/libblkid/src/superblocks/zfs.c ++++ b/libblkid/src/superblocks/zfs.c +@@ -12,6 +12,7 @@ + #include + #include + #include ++#include + + #include "superblocks.h" + +@@ -108,6 +109,8 @@ static void zfs_extract_guid_name(blkid_probe pr, loff_t offset) + + nvs->nvs_type = be32_to_cpu(nvs->nvs_type); + nvs->nvs_strlen = be32_to_cpu(nvs->nvs_strlen); ++ if (nvs->nvs_strlen > UINT_MAX - sizeof(*nvs)) ++ break; + avail -= nvs->nvs_strlen + sizeof(*nvs); + nvdebug("nvstring: type %u string %*s\n", nvs->nvs_type, + nvs->nvs_strlen, nvs->nvs_string); +-- +2.2.2 + diff --git a/util-linux-libblkid-unsafe-chars.patch b/util-linux-libblkid-unsafe-chars.patch new file mode 100644 index 0000000..833f603 --- /dev/null +++ b/util-linux-libblkid-unsafe-chars.patch @@ -0,0 +1,167 @@ +From 89e90ae7b2826110ea28c1c0eb8e7c56c3907bdc Mon Sep 17 00:00:00 2001 +From: Karel Zak +Date: Thu, 27 Nov 2014 13:39:35 +0100 +Subject: [PATCH] libblkid: care about unsafe chars in cache + +The high-level libblkid API uses /run/blkid/blkid.tab cache to +store probing results. The cache format is + + devname + +and unfortunately the cache code does not escape quotation marks: + + # mkfs.ext4 -L 'AAA"BBB' + + # cat /run/blkid/blkid.tab + ... + /dev/sdb1 + +such string is later incorrectly parsed and blkid(8) returns +nonsenses. And for use-cases like + + # eval $(blkid -o export /dev/sdb1) + +it's also insecure. + +Note that mount, udevd and blkid -p are based on low-level libblkid +API, it bypass the cache and directly read data from the devices. + +The current udevd upstream does not depend on blkid(8) output at all, +it's directly linked with the library and all unsafe chars are encoded by +\x notation. + + # mkfs.ext4 -L 'X"`/tmp/foo` "' /dev/sdb1 + # udevadm info --export-db | grep LABEL + ... + E: ID_FS_LABEL=X__/tmp/foo___ + E: ID_FS_LABEL_ENC=X\x22\x60\x2ftmp\x2ffoo\x60\x20\x22 + +Signed-off-by: Karel Zak +--- + libblkid/src/read.c | 21 ++++++++++++++++++--- + libblkid/src/save.c | 22 +++++++++++++++++++++- + misc-utils/blkid.8 | 5 ++++- + misc-utils/blkid.c | 4 ++-- + 4 files changed, 45 insertions(+), 7 deletions(-) + +diff --git a/libblkid/src/read.c b/libblkid/src/read.c +index 0e91c9c..81ab0df 100644 +--- a/libblkid/src/read.c ++++ b/libblkid/src/read.c +@@ -252,15 +252,30 @@ static int parse_token(char **name, char **value, char **cp) + *value = skip_over_blank(*value + 1); + + if (**value == '"') { +- end = strchr(*value + 1, '"'); +- if (!end) { ++ char *p = end = *value + 1; ++ ++ /* convert 'foo\"bar' to 'foo"bar' */ ++ while (*p) { ++ if (*p == '\\') { ++ p++; ++ *end = *p; ++ } else { ++ *end = *p; ++ if (*p == '"') ++ break; ++ } ++ p++; ++ end++; ++ } ++ ++ if (*end != '"') { + DBG(READ, ul_debug("unbalanced quotes at: %s", *value)); + *cp = *value; + return -BLKID_ERR_CACHE; + } + (*value)++; + *end = '\0'; +- end++; ++ end = ++p; + } else { + end = skip_over_word(*value); + if (*end) { +diff --git a/libblkid/src/save.c b/libblkid/src/save.c +index 8216f09..5e8bbee 100644 +--- a/libblkid/src/save.c ++++ b/libblkid/src/save.c +@@ -26,6 +26,21 @@ + + #include "blkidP.h" + ++ ++static void save_quoted(const char *data, FILE *file) ++{ ++ const char *p; ++ ++ fputc('"', file); ++ for (p = data; p && *p; p++) { ++ if ((unsigned char) *p == 0x22 || /* " */ ++ (unsigned char) *p == 0x5c) /* \ */ ++ fputc('\\', file); ++ ++ fputc(*p, file); ++ } ++ fputc('"', file); ++} + static int save_dev(blkid_dev dev, FILE *file) + { + struct list_head *p; +@@ -43,9 +58,14 @@ static int save_dev(blkid_dev dev, FILE *file) + + if (dev->bid_pri) + fprintf(file, " PRI=\"%d\"", dev->bid_pri); ++ + list_for_each(p, &dev->bid_tags) { + blkid_tag tag = list_entry(p, struct blkid_struct_tag, bit_tags); +- fprintf(file, " %s=\"%s\"", tag->bit_name,tag->bit_val); ++ ++ fputc(' ', file); /* space between tags */ ++ fputs(tag->bit_name, file); /* tag NAME */ ++ fputc('=', file); /* separator between NAME and VALUE */ ++ save_quoted(tag->bit_val, file); /* tag "VALUE" */ + } + fprintf(file, ">%s\n", dev->bid_name); + +diff --git a/misc-utils/blkid.8 b/misc-utils/blkid.8 +index 156a14b..c95b833 100644 +--- a/misc-utils/blkid.8 ++++ b/misc-utils/blkid.8 +@@ -200,7 +200,10 @@ partitions. This output format is \fBDEPRECATED\fR. + .TP + .B export + print key=value pairs for easy import into the environment; this output format +-is automatically enabled when I/O Limits (\fB-i\fR option) are requested ++is automatically enabled when I/O Limits (\fB-i\fR option) are requested. ++ ++The non-printing characters are encoded by ^ and M- notation and all ++potentially unsafe characters are escaped. + .RE + .TP + .BI \-O " offset" +diff --git a/misc-utils/blkid.c b/misc-utils/blkid.c +index a6ca660..1bd8646 100644 +--- a/misc-utils/blkid.c ++++ b/misc-utils/blkid.c +@@ -306,7 +306,7 @@ static void print_value(int output, int num, const char *devname, + printf("DEVNAME=%s\n", devname); + fputs(name, stdout); + fputs("=", stdout); +- safe_print(value, valsz, NULL); ++ safe_print(value, valsz, " \\\"'$`<>"); + fputs("\n", stdout); + + } else { +@@ -315,7 +315,7 @@ static void print_value(int output, int num, const char *devname, + fputs(" ", stdout); + fputs(name, stdout); + fputs("=\"", stdout); +- safe_print(value, valsz, "\""); ++ safe_print(value, valsz, "\"\\"); + fputs("\"", stdout); + } + } +-- +2.2.2 + diff --git a/util-linux-systemd.changes b/util-linux-systemd.changes index b972a08..d45f52b 100644 --- a/util-linux-systemd.changes +++ b/util-linux-systemd.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Wed Feb 4 19:08:43 CET 2015 - sbrabec@suse.cz + +- libblkid: care about unsafe chars and possible buffer overflow + in cache (CVE-2014-9114, util-linux-libblkid-unsafe-chars.patch, + util-linux-libblkid-overflow.patch, bsc#907434) + ------------------------------------------------------------------- Thu Jan 29 14:13:41 UTC 2015 - sweet_f_a@gmx.de diff --git a/util-linux-systemd.spec b/util-linux-systemd.spec index 9b1a9a5..3449ba7 100644 --- a/util-linux-systemd.spec +++ b/util-linux-systemd.spec @@ -160,6 +160,10 @@ Source51: blkid.conf Patch4: make-sure-sbin-resp-usr-sbin-are-in-PATH.diff # PATCH-FEATURE-SUSE -- Report about disabled encryption to stderr. Patch12: util-linux-noenc-suse.patch +# PATCH-FIX-SECURITY util-linux-libblkid-unsafe-chars.patch bsc907434 CVE-2014-9114 sbrabec@suse.cz -- libblkid: care about unsafe chars in cache +Patch13: util-linux-libblkid-unsafe-chars.patch +# PATCH-FIX-SECURITY util-linux-libblkid-overflow.patch bsc907434 CVE-2014-9114 sbrabec@suse.cz -- libblkid: fix possible buffer overflow +Patch14: util-linux-libblkid-overflow.patch ## ## klogconsole ## @@ -383,6 +387,8 @@ xzcat %{S:0} | %gpg_verify -p %{_name} %{S:12} - %setup -q -n %{_name}-%{version} -b 40 %patch4 -p1 %patch12 -p1 +%patch13 -p1 +%patch14 -p1 # # setctsid cp -p %{S:22} %{S:23} . diff --git a/util-linux.changes b/util-linux.changes index b972a08..d45f52b 100644 --- a/util-linux.changes +++ b/util-linux.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Wed Feb 4 19:08:43 CET 2015 - sbrabec@suse.cz + +- libblkid: care about unsafe chars and possible buffer overflow + in cache (CVE-2014-9114, util-linux-libblkid-unsafe-chars.patch, + util-linux-libblkid-overflow.patch, bsc#907434) + ------------------------------------------------------------------- Thu Jan 29 14:13:41 UTC 2015 - sweet_f_a@gmx.de diff --git a/util-linux.spec b/util-linux.spec index a5a40af..61bf76f 100644 --- a/util-linux.spec +++ b/util-linux.spec @@ -160,6 +160,10 @@ Source51: blkid.conf Patch4: make-sure-sbin-resp-usr-sbin-are-in-PATH.diff # PATCH-FEATURE-SUSE -- Report about disabled encryption to stderr. Patch12: util-linux-noenc-suse.patch +# PATCH-FIX-SECURITY util-linux-libblkid-unsafe-chars.patch bsc907434 CVE-2014-9114 sbrabec@suse.cz -- libblkid: care about unsafe chars in cache +Patch13: util-linux-libblkid-unsafe-chars.patch +# PATCH-FIX-SECURITY util-linux-libblkid-overflow.patch bsc907434 CVE-2014-9114 sbrabec@suse.cz -- libblkid: fix possible buffer overflow +Patch14: util-linux-libblkid-overflow.patch ## ## klogconsole ## @@ -383,6 +387,8 @@ xzcat %{S:0} | %gpg_verify -p %{_name} %{S:12} - %setup -q -n %{_name}-%{version} -b 40 %patch4 -p1 %patch12 -p1 +%patch13 -p1 +%patch14 -p1 # # setctsid cp -p %{S:22} %{S:23} . From 5108010c845d227b189edbac0f79606330c523c3a8169fff1f0670a6039dd02e Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Fri, 6 Feb 2015 20:28:51 +0000 Subject: [PATCH 6/6] Accepting request 284526 from home:dimstar:Factory - Do not try to unregister an info file (ipc.info.gz) which we do not own. Already in May 2011, we stopped registering it: "do not register ipc.info.gz (not provided by this package)". OBS-URL: https://build.opensuse.org/request/show/284526 OBS-URL: https://build.opensuse.org/package/show/Base:System/util-linux?expand=0&rev=275 --- python-libmount.changes | 7 +++++++ python-libmount.spec | 4 ++-- util-linux-systemd.changes | 7 +++++++ util-linux-systemd.spec | 1 - util-linux.changes | 7 +++++++ util-linux.spec | 1 - 6 files changed, 23 insertions(+), 4 deletions(-) diff --git a/python-libmount.changes b/python-libmount.changes index d45f52b..50f9cc0 100644 --- a/python-libmount.changes +++ b/python-libmount.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Fri Feb 6 17:01:02 UTC 2015 - dimstar@opensuse.org + +- Do not try to unregister an info file (ipc.info.gz) which we do + not own. Already in May 2011, we stopped registering it: "do not + register ipc.info.gz (not provided by this package)". + ------------------------------------------------------------------- Wed Feb 4 19:08:43 CET 2015 - sbrabec@suse.cz diff --git a/python-libmount.spec b/python-libmount.spec index 4611e66..f98583f 100644 --- a/python-libmount.spec +++ b/python-libmount.spec @@ -76,7 +76,7 @@ Name: python-libmount %endif Summary: %main_summary License: GPL-2.0+ -Group: %main_group +Group: %group_pl BuildRequires: audit-devel BuildRequires: bc BuildRequires: binutils-devel @@ -370,6 +370,7 @@ SMP systems. %if %build_util_linux %package -n python-libmount Summary: %summary_pl +License: GPL-2.0+ Group: %group_pl %description -n python-libmount @@ -826,7 +827,6 @@ if [ -f etc/fstab ]; then fi %postun -%install_info_delete --info-dir=%{_infodir} %{_infodir}/ipc.info.gz %{insserv_cleanup} %verifyscript diff --git a/util-linux-systemd.changes b/util-linux-systemd.changes index d45f52b..50f9cc0 100644 --- a/util-linux-systemd.changes +++ b/util-linux-systemd.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Fri Feb 6 17:01:02 UTC 2015 - dimstar@opensuse.org + +- Do not try to unregister an info file (ipc.info.gz) which we do + not own. Already in May 2011, we stopped registering it: "do not + register ipc.info.gz (not provided by this package)". + ------------------------------------------------------------------- Wed Feb 4 19:08:43 CET 2015 - sbrabec@suse.cz diff --git a/util-linux-systemd.spec b/util-linux-systemd.spec index 3449ba7..9e00e0b 100644 --- a/util-linux-systemd.spec +++ b/util-linux-systemd.spec @@ -826,7 +826,6 @@ if [ -f etc/fstab ]; then fi %postun -%install_info_delete --info-dir=%{_infodir} %{_infodir}/ipc.info.gz %{insserv_cleanup} %verifyscript diff --git a/util-linux.changes b/util-linux.changes index d45f52b..50f9cc0 100644 --- a/util-linux.changes +++ b/util-linux.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Fri Feb 6 17:01:02 UTC 2015 - dimstar@opensuse.org + +- Do not try to unregister an info file (ipc.info.gz) which we do + not own. Already in May 2011, we stopped registering it: "do not + register ipc.info.gz (not provided by this package)". + ------------------------------------------------------------------- Wed Feb 4 19:08:43 CET 2015 - sbrabec@suse.cz diff --git a/util-linux.spec b/util-linux.spec index 61bf76f..e36154d 100644 --- a/util-linux.spec +++ b/util-linux.spec @@ -826,7 +826,6 @@ if [ -f etc/fstab ]; then fi %postun -%install_info_delete --info-dir=%{_infodir} %{_infodir}/ipc.info.gz %{insserv_cleanup} %verifyscript