pool/mdadm
SHA256
4
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- mdcheck-careful.patch

Browse Source 
Be careful about reading all output of "mdadm --detail --export"
  as shell commands - it isn't quoted.
  (bnc#910500)

OBS-URL: https://build.opensuse.org/package/show/Base:System/mdadm?expand=0&rev=126
This commit is contained in:
Neil Brown 2015-02-03 23:41:59 +00:00 committed by Git OBS Bridge
parent 246689df82
commit 0fbbbc9233
3 changed files with 39 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
mdadm.changes
View File

@ -1,3 +1,11 @@
-------------------------------------------------------------------
Tue Feb 3 23:40:32 UTC 2015 - nfbrown@suse.com
- mdcheck-careful.patch
Be careful about reading all output of "mdadm --detail --export"
as shell commands - it isn't quoted.
(bnc#910500)
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Nov 3 00:23:45 UTC 2014 - nfbrown@suse.com Mon Nov 3 00:23:45 UTC 2014 - nfbrown@suse.com

5
mdadm.spec
View File

@ -1,7 +1,7 @@
# #
# spec file for package mdadm # spec file for package mdadm
# #
# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany.
# #
# All modifications and additions to the file contributed by third parties # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@ -44,6 +44,8 @@ Patch1: 0001-Makefile-install-mdadm-grow-continue-.service.patch
Patch2: 0001-Grow-fix-removal-of-line-in-wrong-case.patch Patch2: 0001-Grow-fix-removal-of-line-in-wrong-case.patch
# PATCH-FIX-UPSTREAM mdcheck-no-devices.fix bnc#903051 nfbrown@suse.de # PATCH-FIX-UPSTREAM mdcheck-no-devices.fix bnc#903051 nfbrown@suse.de
Patch3: mdcheck-no-devices.fix Patch3: mdcheck-no-devices.fix
# PATCH-FIX-UPSTREAM mdcheck-careful.patch bnc#910500 nfbrown@suse.de
Patch4: mdcheck-careful.patch
%define _udevdir %(pkg-config --variable=udevdir udev) %define _udevdir %(pkg-config --variable=udevdir udev)
%define _systemdshutdowndir %{_unitdir}/../system-shutdown %define _systemdshutdowndir %{_unitdir}/../system-shutdown
@ -58,6 +60,7 @@ programs but with a very different interface.
%patch1 -p1 %patch1 -p1
%patch2 -p1 %patch2 -p1
%patch3 -p1 %patch3 -p1
%patch4 -p1
%build %build
make %{?_smp_mflags} CC="%__cc" CXFLAGS="$RPM_OPT_FLAGS -Wno-error" SUSE=yes make %{?_smp_mflags} CC="%__cc" CXFLAGS="$RPM_OPT_FLAGS -Wno-error" SUSE=yes

27
mdcheck-careful.patch Normal file
View File

@ -0,0 +1,27 @@
From 979b1feb093b1c2e0f8b58716329f2da092741d4 Mon Sep 17 00:00:00 2001
From: NeilBrown <neilb@suse.de>
Date: Wed, 4 Feb 2015 09:06:47 +1100
Subject: [PATCH] mdcheck: be careful when sourcing the output of "mdadm
--detail --export"
The output of "mdadm --detail --export" isn't quoted properly so
fields that contain spaces can be a problem.
We only want the MD_UUID field, and it has a very well defined
format with no spaces.
So use 'grep' to limit the output to just that.
Signed-off-by: NeilBrown <neilb@suse.de>
diff --git a/misc/mdcheck b/misc/mdcheck
index ca5fe84a1284..2c8f54d6e4cf 100644
--- a/misc/mdcheck
+++ b/misc/mdcheck
@@ -88,7 +88,7 @@ do
continue
fi
- mdadm --detail --export "$dev" > $tmp || continue
+ mdadm --detail --export "$dev" | grep '^MD_UUID=' > $tmp || continue
source $tmp
fl="/var/lib/mdcheck/MD_UUID_$MD_UUID"
if [ -z "$cont" ]