[prev in list] [next in list] [prev in thread] [next in thread]
List: ipcop-svn
Subject: [Ipcop-svn] SF.net SVN: ipcop:[6773] ipcop/trunk
From: gespinasse () users ! sourceforge ! net
Date: 2012-08-20 4:14:46
Message-ID: E1T3JO2-00078R-Ip () sfp-svn-3 ! v30 ! ch3 ! sourceforge ! com
[Download RAW message or body]
Revision: 6773
http://ipcop.svn.sourceforge.net/ipcop/?rev=6773&view=rev
Author: gespinasse
Date: 2012-08-20 04:14:46 +0000 (Mon, 20 Aug 2012)
Log Message:
-----------
Upgrade mdadm to 3.2.5
Add 2 patches from git tree just after release that fix important issues
Modified Paths:
--------------
ipcop/trunk/lfs/mdadm
ipcop/trunk/updates/2.1.0/ROOTFILES.i486-2.1.0
ipcop/trunk/updates/2.1.0/information.xml
Added Paths:
-----------
ipcop/trunk/src/patches/mdadm-3.2.5_imsm-fix-correct-checking-volume-s-degradation.patch
ipcop/trunk/src/patches/mdadm-3.2.5_mdadm-fix-segmentation-fault.patch
Modified: ipcop/trunk/lfs/mdadm
===================================================================
--- ipcop/trunk/lfs/mdadm 2012-08-19 19:58:10 UTC (rev 6772)
+++ ipcop/trunk/lfs/mdadm 2012-08-20 04:14:46 UTC (rev 6773)
@@ -33,12 +33,12 @@
include Config
PKG_NAME = mdadm
-VER = 3.2.3
+VER = 3.2.5
HOST_ARCH = all
OTHER_SRC = yes
THISAPP = $(PKG_NAME)-$(VER)
-DL_FILE = $(THISAPP).tar.bz2
+DL_FILE = $(THISAPP).tar.xz
DL_FROM = $(URL_KERNEL)/linux/utils/raid/mdadm
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(STAGE_ORDER)_$(STAGE)/$(THISAPP)
@@ -51,7 +51,7 @@
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = d789d6ecb9c1d5ebcc64f0fc52bca92f
+$(DL_FILE)_MD5 = 2fd33dedcdb06f0d1461f50ddabb7e4a
install : $(TARGET)
@@ -80,7 +80,9 @@
$(TARGET) : $(firstword $(MAKEFILE_LIST)) $(patsubst %,$(DIR_DL)/%,$(objects))
@$(PREBUILD)
- @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
+ @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar xf $(DIR_DL)/$(DL_FILE)
+ cd $(DIR_APP) && patch -p1 -i \
$(DIR_PATCHES)/$(THISAPP)_mdadm-fix-segmentation-fault.patch + cd $(DIR_APP) && patch \
-p1 -i $(DIR_PATCHES)/$(THISAPP)_imsm-fix-correct-checking-volume-s-degradation.patch \
# CXFLAGS="$(CFLAGS)" is required to set the optimization level or -O0 is used and \
FORTIFY does not apply cd $(DIR_APP) && make -j $(PARALLELISM) CXFLAGS="$(CFLAGS)"
Added: ipcop/trunk/src/patches/mdadm-3.2.5_imsm-fix-correct-checking-volume-s-degradation.patch
===================================================================
--- ipcop/trunk/src/patches/mdadm-3.2.5_imsm-fix-correct-checking-volume-s-degradation.patch \
(rev 0)
+++ ipcop/trunk/src/patches/mdadm-3.2.5_imsm-fix-correct-checking-volume-s-degradation.patch 2012-08-20 \
04:14:46 UTC (rev 6773) @@ -0,0 +1,46 @@
+From e1993023991a6fa6539cc604b4b3d6718833250d Mon Sep 17 00:00:00 2001
+From: Lukasz Dorau <lukasz.dorau@intel.com>
+Date: Fri, 25 May 2012 15:06:41 +0200
+Subject: [PATCH] imsm: fix: correct checking volume's degradation
+
+We do not check the return value of sysfs_get_ll() now. It is wrong.
+If reading of the sysfs "degraded" key does not succeed,
+the "new_degraded" variable will not be initiated
+and accidentally it can have the value of "degraded" variable.
+In that case the change of degradation will not be checked.
+
+It happens if mdadm is compiled with gcc's "-fstack-protector" option
+when one tries to stop a volume under reshape (e.g. OLCE).
+Reshape seems to be finished then (metadata is in normal/clean state)
+but it is not finished, it is broken and data are corrupted.
+
+Now we always check the return value of sysfs_get_ll().
+Even if reading of the sysfs "degraded" key does not succeed
+(rv == -1) the change of degradation will be checked.
+
+Signed-off-by: Lukasz Dorau <lukasz.dorau@intel.com>
+Signed-off-by: NeilBrown <neilb@suse.de>
+---
+ super-intel.c | 6 ++++--
+ 1 file changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/super-intel.c b/super-intel.c
+index 6c87e20..07ab9ae 100644
+--- a/super-intel.c
++++ b/super-intel.c
+@@ -10370,8 +10370,10 @@ int check_degradation_change(struct mdinfo *info,
+ int degraded)
+ {
+ unsigned long long new_degraded;
+- sysfs_get_ll(info, NULL, "degraded", &new_degraded);
+- if (new_degraded != (unsigned long long)degraded) {
++ int rv;
++
++ rv = sysfs_get_ll(info, NULL, "degraded", &new_degraded);
++ if ((rv == -1) || (new_degraded != (unsigned long long)degraded)) {
+ /* check each device to ensure it is still working */
+ struct mdinfo *sd;
+ new_degraded = 0;
+--
+1.7.10.2
+
Added: ipcop/trunk/src/patches/mdadm-3.2.5_mdadm-fix-segmentation-fault.patch
===================================================================
--- ipcop/trunk/src/patches/mdadm-3.2.5_mdadm-fix-segmentation-fault.patch \
(rev 0)
+++ ipcop/trunk/src/patches/mdadm-3.2.5_mdadm-fix-segmentation-fault.patch 2012-08-20 \
04:14:46 UTC (rev 6773) @@ -0,0 +1,44 @@
+From 4687f160276a8f7815675ca758c598d881f04fd7 Mon Sep 17 00:00:00 2001
+From: majianpeng <majianpeng@gmail.com>
+Date: Tue, 29 May 2012 09:21:51 +1000
+Subject: [PATCH] mdadm: Fix Segmentation fault.
+
+In function write_init_super1():
+If "rv = store_super1(st, di->fd)" return error and the di is the last.
+Then the di = NULL && rv > 0, so exec:
+if (rv)
+ fprintf(stderr, Name ": Failed to write metadata to%s\n",
+ di->devname);
+will be segmentation fault.
+
+Signed-off-by: majianpeng <majianpeng@gmail.com>
+Signed-off-by: NeilBrown <neilb@suse.de>
+---
+ super1.c | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/super1.c b/super1.c
+index 4f20cc3..fbc2e8f 100644
+--- a/super1.c
++++ b/super1.c
+@@ -1096,7 +1096,7 @@ static int write_init_super1(struct supertype *st)
+ unsigned long long dsize, array_size;
+ unsigned long long sb_offset, headroom;
+
+- for (di = st->info; di && ! rv ; di = di->next) {
++ for (di = st->info; di; di = di->next) {
+ if (di->disk.state == 1)
+ continue;
+ if (di->fd < 0)
+@@ -1242,6 +1242,8 @@ static int write_init_super1(struct supertype *st)
+ rv = st->ss->write_bitmap(st, di->fd);
+ close(di->fd);
+ di->fd = -1;
++ if (rv)
++ goto error_out;
+ }
+ error_out:
+ if (rv)
+--
+1.7.9.5
+
Modified: ipcop/trunk/updates/2.1.0/ROOTFILES.i486-2.1.0
===================================================================
--- ipcop/trunk/updates/2.1.0/ROOTFILES.i486-2.1.0 2012-08-19 19:58:10 UTC (rev 6772)
+++ ipcop/trunk/updates/2.1.0/ROOTFILES.i486-2.1.0 2012-08-20 04:14:46 UTC (rev 6773)
@@ -451,7 +451,7 @@
## lsof-4.86
/usr/sbin/lsof
##
-## mdadm-3.2.3
+## mdadm-3.2.5
/lib/udev/rules.d/64-md-raid.rules
/sbin/mdadm
/sbin/mdmon
Modified: ipcop/trunk/updates/2.1.0/information.xml
===================================================================
--- ipcop/trunk/updates/2.1.0/information.xml 2012-08-19 19:58:10 UTC (rev 6772)
+++ ipcop/trunk/updates/2.1.0/information.xml 2012-08-20 04:14:46 UTC (rev 6773)
@@ -15,7 +15,7 @@
libffi to 3.0.11, libgd to 2.0.36~rc1, libgcrypt to 1.5.0, libnet to \
1.1.6,
libnetfiltercontrack to 1.0.1, libnl to 3.2.11, libpcap to 1.3.0, libpng \
to 1.5.12,
libusb to 1.0.9, libusb-compat to 0.1.4, libtool to 2.4.2, libxml2 to \
2.8.0, logrotate to 3.8.1, lsof to 4.86,
- net-tools to 1.60-p20120127084908, openldap to 2.4.32, openssh to 6.0, \
openssl to 1.0.1c, openswan to 2.6.38, + mdadm to 3.2.5, net-tools to \
1.60-p20120127084908, openldap to 2.4.32, openssh to 6.0, openssl to 1.0.1c, openswan \
to 2.6.38,
pciutils to 3.1.10, pcre to 8.30, pixman to 0.24.4, procps to 3.3.3, \
psmisc to 22.19,
rsyslog to 5.8.12, shadow to 4.1.5.1, sqlite to 3.7.13, squid to 3.1.20, \
squid-langpack to 20120616, tcpdump to 4.3.0, traceroute to 2.0.18, tzdata to 2012e,
This was sent by the SourceForge.net collaborative development platform, the world's \
largest Open Source development site.
------------------------------------------------------------------------------
Live Security Virtual Conference
Exclusive live event will cover all the ways today's security and
threat landscape has changed and how IT managers can respond. Discussions
will include endpoint security, mobile security and the latest in malware
threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/
_______________________________________________
Ipcop-svn mailing list
Ipcop-svn@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/ipcop-svn
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic