diff options
| author | Parabola <dev@list.parabolagnulinux.org> | 2011-07-12 14:15:20 +0000 |
|---|---|---|
| committer | Parabola <dev@list.parabolagnulinux.org> | 2011-07-12 14:15:20 +0000 |
| commit | 079c689ef9b252fd82dbf9b182ec2517c48f8737 (patch) | |
| tree | 76d35549f6bb5cf84901953a98be8682c25bb8fb /core/mdadm | |
| parent | ec9bd2e246eb94181a9254dcb2de7ddc191bb8cc (diff) | |
Tue Jul 12 14:15:20 UTC 2011
Diffstat (limited to 'core/mdadm')
| -rw-r--r-- | core/mdadm/segfault-3.2.1.patch | 68 |
1 files changed, 0 insertions, 68 deletions
diff --git a/core/mdadm/segfault-3.2.1.patch b/core/mdadm/segfault-3.2.1.patch deleted file mode 100644 index 6042d86c2..000000000 --- a/core/mdadm/segfault-3.2.1.patch +++ /dev/null @@ -1,68 +0,0 @@ -From 4019ad07013a5d8618b867f724d1c4a13c5cb05d Mon Sep 17 00:00:00 2001 -From: Jonathan Liu <net147@gmail.com> -Date: Tue, 12 Apr 2011 18:28:01 +1000 -Subject: [PATCH] Monitor: avoid NULL dereference with 0.90 metadata - -0.90 array do not report the metadata type in /proc/mdstat, so -we cannot assume that mse->metadata_version is non-NULL. - -So add an appropriate check. - -This adds an additional check missed by commit -eb28e119b03fd5149886ed516fa4bb006ad3602e. - -Signed-off-by: NeilBrown <neilb@suse.de> ---- - Monitor.c | 3 ++- - 1 files changed, 2 insertions(+), 1 deletions(-) - -diff --git a/Monitor.c b/Monitor.c -index a3ea724..55aebeb 100644 ---- a/Monitor.c -+++ b/Monitor.c -@@ -577,7 +577,8 @@ static int check_array(struct state *st, struct mdstat_ent *mdstat, - info[i].major = info[i].minor = 0; - } - -- if (strncmp(mse->metadata_version, "external:", 9) == 0 && -+ if (mse->metadata_version && -+ strncmp(mse->metadata_version, "external:", 9) == 0 && - is_subarray(mse->metadata_version+9)) - st->parent_dev = - devname2devnum(mse->metadata_version+10); --- -1.7.2.3 - -From eb28e119b03fd5149886ed516fa4bb006ad3602e Mon Sep 17 00:00:00 2001 -From: NeilBrown <neilb@suse.de> -Date: Tue, 5 Apr 2011 09:16:57 +1000 -Subject: [PATCH] Monitor: avoid NULL dereference with 0.90 metadata - -0.90 array do not report the metadata type in /proc/mdstat, so -we cannot assume that mse->metadata_version is non-NULL. - -So add an appropriate check. - -Reported-by: Eugene <hdejin@yahoo.com> -Signed-off-by: NeilBrown <neilb@suse.de> ---- - Monitor.c | 3 ++- - 1 files changed, 2 insertions(+), 1 deletions(-) - -diff --git a/Monitor.c b/Monitor.c -index 291e465..337785d 100644 ---- a/Monitor.c -+++ b/Monitor.c -@@ -688,7 +688,8 @@ static int add_new_arrays(struct mdstat_ent *mdstat, struct state **statelist, - st->devnum = mse->devnum; - st->percent = -2; - st->expected_spares = -1; -- if (strncmp(mse->metadata_version, "external:", 9) == 0 && -+ if (mse->metadata_version && -+ strncmp(mse->metadata_version, "external:", 9) == 0 && - is_subarray(mse->metadata_version+9)) - st->parent_dev = - devname2devnum(mse->metadata_version+10); --- -1.7.2.3 - |