Am Montag 12 Oktober 2009 schrieb CSÉCSY László:
> 2009-10-12 20:36:59-kor Daniel Exner írta:
> > Hi!
> >
> > attached patch fixes some issues I've got with my raid1..
>
> 1. Seems you forgot to git add segfault_fix.patch.
Your right. I always forget this when using repoman -k (rec|push) :(

> 2. sha1sums are unneeded (thus useless) if the FB has signatures (afaik).
Removed them. Fblint doesn't complain so I guess its ok ;)

Greetings
Daniel "DeX" Exner
From 1539151b34ffcd6ed3ab01247850fadf5329d739 Mon Sep 17 00:00:00 2001
From: Daniel Exner <[email protected]>
Date: Mon, 12 Oct 2009 22:47:04 +0200
Subject: [PATCH] mdadm-3.0.2-2-i686

* forgot patch
* removed sha1sums
* thx Boobaa :-)
---
 source/base/mdadm/FrugalBuild        |    6 ----
 source/base/mdadm/segfault_fix.patch |   49 ++++++++++++++++++++++++++++++++++
 2 files changed, 49 insertions(+), 6 deletions(-)
 create mode 100644 source/base/mdadm/segfault_fix.patch

diff --git a/source/base/mdadm/FrugalBuild b/source/base/mdadm/FrugalBuild
index d52222f..ddb077f 100644
--- a/source/base/mdadm/FrugalBuild
+++ b/source/base/mdadm/FrugalBuild
@@ -18,12 +18,6 @@ source=($url/$pkgname-$pkgver.tar.bz2 \
 	mdadm rc.mdadm rc.mdadm-{de,hu}.po)
 signatures=("${source[0]}.sign" '' '' '' '' '')
 
-sha1sums=('e7f95e0554b51c251d04397eb1cb0884ac2fa336' \
-          'd609783b41db60c709ca59ca40f914a5425a8e64' \
-          '66c02e7212047d89c99991ec13173a8ebb246aec' \
-          'd8ea38aa71933a28d09c68f03fefbc7f7445fa6d' \
-          'e301d725ccf18702882fc8b2dfce6118564f35d8' \
-          'd34066bab987534ba167b229b3769591d8e2260e')
 build()
 {
 	Fbuild
diff --git a/source/base/mdadm/segfault_fix.patch b/source/base/mdadm/segfault_fix.patch
new file mode 100644
index 0000000..27d758a
--- /dev/null
+++ b/source/base/mdadm/segfault_fix.patch
@@ -0,0 +1,49 @@
+From 2b9aa337af7291d3f141322da96c9f667c99d53c Mon Sep 17 00:00:00 2001
+From: NeilBrown <[email protected]>
+Date: Thu, 1 Oct 2009 12:51:04 +1000
+Subject: [PATCH] Fix null-dereference in set_member_info
+
+set_member_info would try to dereference ->metadata_version, without
+checking that it isn't NULL.
+
+Signed-off-by: NeilBrown <[email protected]>
+---
+ mapfile.c |   15 +++++++++------
+ 1 files changed, 9 insertions(+), 6 deletions(-)
+
+diff --git a/mapfile.c b/mapfile.c
+index a3038be..ed59db5 100644
+--- a/mapfile.c
++++ b/mapfile.c
+@@ -303,19 +303,22 @@ struct map_ent *map_by_name(struct map_ent **map, char *name)
+  */
+ static void set_member_info(struct supertype *st, struct mdstat_ent *ent)
+ {
+-	char version[strlen(ent->metadata_version)+1];
+ 
+ 	st->subarray[0] = '\0';
+ 
+-	if (strncmp(ent->metadata_version, "external:", 9) != 0)
++	if (ent->metadata_version == NULL ||
++	    strncmp(ent->metadata_version, "external:", 9) != 0)
+ 		return;
+ 
+-	strcpy(version, ent->metadata_version);
+-
+-	if (is_subarray(&version[9])) {
+-		char *subarray = strrchr(version, '/');
++	if (is_subarray(&ent->metadata_version[9])) {
++		char version[strlen(ent->metadata_version)+1];
++		char *subarray;
+ 		char *name = &version[10];
+ 
++		strcpy(version, ent->metadata_version);
++		subarray = strrchr(version, '/');
++		name = &version[10];
++
+ 		if (!subarray)
+ 			return;
+ 		*subarray++ = '\0';
+-- 
+1.6.3.3
+
-- 
1.6.5

_______________________________________________
Frugalware-devel mailing list
[email protected]
http://frugalware.org/mailman/listinfo/frugalware-devel

Reply via email to