Accepting request 393513 from Base:System
- New upstream release mdadm-3.4 Adds support for clustered-raid1 and journalled raid5 - 0001-super1-Clear-memory-allocated-for-superblock-bitmap-.patch Important upstream bugfix relating to uninialised memory. OBS-URL: https://build.opensuse.org/request/show/393513 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/mdadm?expand=0&rev=105
This commit is contained in:
commit
1b9d44bbd3
@ -0,0 +1,31 @@
|
|||||||
|
From 1dcee1c9cbcf9592275914706b76b1931490092c Mon Sep 17 00:00:00 2001
|
||||||
|
From: Jes Sorensen <Jes.Sorensen@redhat.com>
|
||||||
|
Date: Wed, 6 Apr 2016 16:13:59 -0400
|
||||||
|
Subject: [PATCH] super1: Clear memory allocated for superblock + bitmap before
|
||||||
|
use
|
||||||
|
|
||||||
|
load_super1() did not clear memory allocated for the superblock +
|
||||||
|
bitmap. This causes issues if the superblock does not contain a bitmap
|
||||||
|
as later checks of bitmap features would rely on the bits being
|
||||||
|
cleared.
|
||||||
|
|
||||||
|
This bug has been around for a long time, but was only exposed in
|
||||||
|
mdadm-3.4 with the introduction of the clustering code.
|
||||||
|
|
||||||
|
Reported-by: Jan Stodola <jstodola@redhat.com>
|
||||||
|
Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
|
||||||
|
---
|
||||||
|
super1.c | 2 ++
|
||||||
|
1 file changed, 2 insertions(+)
|
||||||
|
|
||||||
|
--- a/super1.c
|
||||||
|
+++ b/super1.c
|
||||||
|
@@ -2016,6 +2016,8 @@ static int load_super1(struct supertype
|
||||||
|
return 1;
|
||||||
|
}
|
||||||
|
|
||||||
|
+ memset(super, 0, SUPER1_SIZE);
|
||||||
|
+
|
||||||
|
if (aread(&afd, super, MAX_SB_SIZE) != MAX_SB_SIZE) {
|
||||||
|
if (devname)
|
||||||
|
pr_err("Cannot read superblock on %s\n",
|
@ -1,3 +0,0 @@
|
|||||||
version https://git-lfs.github.com/spec/v1
|
|
||||||
oid sha256:8ae5f45306b873190e91f410709b00e51997b633c072b33f8efd9f7df022ca68
|
|
||||||
size 413396
|
|
3
mdadm-3.4.tar.xz
Normal file
3
mdadm-3.4.tar.xz
Normal file
@ -0,0 +1,3 @@
|
|||||||
|
version https://git-lfs.github.com/spec/v1
|
||||||
|
oid sha256:27d0be4627d38a12ddcd1c1c3721d649d4e89e1093914497e22b57245cda8808
|
||||||
|
size 422704
|
@ -1,3 +1,11 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Wed May 4 04:56:42 UTC 2016 - neilb@suse.com
|
||||||
|
|
||||||
|
- New upstream release mdadm-3.4
|
||||||
|
Adds support for clustered-raid1 and journalled raid5
|
||||||
|
- 0001-super1-Clear-memory-allocated-for-superblock-bitmap-.patch
|
||||||
|
Important upstream bugfix relating to uninialised memory.
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Thu Dec 10 17:07:40 CET 2015 - tiwai@suse.de
|
Thu Dec 10 17:07:40 CET 2015 - tiwai@suse.de
|
||||||
|
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
#
|
#
|
||||||
# spec file for package mdadm
|
# spec file for package mdadm
|
||||||
#
|
#
|
||||||
# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
|
# Copyright (c) 2016 SUSE LINUX 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
|
||||||
@ -17,7 +17,7 @@
|
|||||||
|
|
||||||
|
|
||||||
Name: mdadm
|
Name: mdadm
|
||||||
Version: 3.3.4
|
Version: 3.4
|
||||||
Release: 0
|
Release: 0
|
||||||
BuildRequires: binutils-devel
|
BuildRequires: binutils-devel
|
||||||
BuildRequires: groff
|
BuildRequires: groff
|
||||||
@ -39,6 +39,7 @@ Source1: Software-RAID.HOWTO.tar.bz2
|
|||||||
Source2: sysconfig.mdadm
|
Source2: sysconfig.mdadm
|
||||||
Source3: cron.d.mdadm
|
Source3: cron.d.mdadm
|
||||||
Source7: mdadm.cron
|
Source7: mdadm.cron
|
||||||
|
Patch1: 0001-super1-Clear-memory-allocated-for-superblock-bitmap-.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
|
||||||
@ -50,6 +51,7 @@ programs but with a very different interface.
|
|||||||
|
|
||||||
%prep
|
%prep
|
||||||
%setup -q -a1
|
%setup -q -a1
|
||||||
|
%patch1 -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
|
||||||
|
Loading…
Reference in New Issue
Block a user