forked from pool/mdadm
91 lines
2.8 KiB
Diff
91 lines
2.8 KiB
Diff
|
From a44e993e37a76561fa30e932b93d85fab9bcc272 Mon Sep 17 00:00:00 2001
|
||
|
|
From: NeilBrown <neilb@suse.de>
|
||
|
|
Date: Wed, 2 Apr 2014 13:34:10 +1100
|
||
|
|
Subject: [PATCH 2/4] DDF: guard against ->pdnum being negative.
|
||
|
|
|
||
|
|
It is conceivable that ->pdnum could be -1, though only if
|
||
|
|
the metadata is corrupt.
|
||
|
|
We should be careful not to use it if it is.
|
||
|
|
|
||
|
|
Also remove an assignment for pdnum to ->container_member.
|
||
|
|
This is never used and cannot possibly mean anything.
|
||
|
|
|
||
|
|
Signed-off-by: NeilBrown <neilb@suse.de>
|
||
|
|
---
|
||
|
|
super-ddf.c | 22 ++++++++++++++++------
|
||
|
|
1 file changed, 16 insertions(+), 6 deletions(-)
|
||
|
|
|
||
|
|
--- mdadm-3.3.orig/super-ddf.c
|
||
|
|
+++ mdadm-3.3/super-ddf.c
|
||
|
|
@@ -2465,7 +2465,11 @@ static struct extent *get_extents(struct
|
||
|
|
struct extent *rv;
|
||
|
|
int n = 0;
|
||
|
|
unsigned int i;
|
||
|
|
- __u16 state = be16_to_cpu(ddf->phys->entries[dl->pdnum].state);
|
||
|
|
+ __u16 state;
|
||
|
|
+
|
||
|
|
+ if (dl->pdnum < 0)
|
||
|
|
+ return NULL;
|
||
|
|
+ state = be16_to_cpu(ddf->phys->entries[dl->pdnum].state);
|
||
|
|
|
||
|
|
if ((state & (DDF_Online|DDF_Failed|DDF_Missing)) != DDF_Online)
|
||
|
|
return NULL;
|
||
|
|
@@ -2900,7 +2904,7 @@ static int remove_from_super_ddf(struct
|
||
|
|
if (dl->major == dk->major &&
|
||
|
|
dl->minor == dk->minor)
|
||
|
|
break;
|
||
|
|
- if (!dl)
|
||
|
|
+ if (!dl || dl->pdnum < 0)
|
||
|
|
return -1;
|
||
|
|
|
||
|
|
if (st->update_tail) {
|
||
|
|
@@ -4096,7 +4100,7 @@ static int ddf_open_new(struct supertype
|
||
|
|
if (dl->major == dev->disk.major &&
|
||
|
|
dl->minor == dev->disk.minor)
|
||
|
|
break;
|
||
|
|
- if (!dl) {
|
||
|
|
+ if (!dl || dl->pdnum < 0) {
|
||
|
|
pr_err("%s: device %d/%d of subarray %d not found in meta data\n",
|
||
|
|
__func__, dev->disk.major, dev->disk.minor, n);
|
||
|
|
return -1;
|
||
|
|
@@ -4728,6 +4732,9 @@ static void ddf_process_update(struct su
|
||
|
|
for (dl = ddf->dlist; dl; dl = dl->next) {
|
||
|
|
unsigned int vn = 0;
|
||
|
|
int in_degraded = 0;
|
||
|
|
+
|
||
|
|
+ if (dl->pdnum < 0)
|
||
|
|
+ continue;
|
||
|
|
for (vcl = ddf->conflist; vcl ; vcl = vcl->next) {
|
||
|
|
unsigned int dn, ibvd;
|
||
|
|
const struct vd_config *conf;
|
||
|
|
@@ -4991,7 +4998,11 @@ static struct mdinfo *ddf_activate_spare
|
||
|
|
int is_dedicated = 0;
|
||
|
|
struct extent *ex;
|
||
|
|
unsigned int j;
|
||
|
|
- be16 state = ddf->phys->entries[dl->pdnum].state;
|
||
|
|
+ be16 state;
|
||
|
|
+
|
||
|
|
+ if (dl->pdnum < 0)
|
||
|
|
+ continue;
|
||
|
|
+ state = ddf->phys->entries[dl->pdnum].state;
|
||
|
|
if (be16_and(state,
|
||
|
|
cpu_to_be16(DDF_Failed|DDF_Missing)) ||
|
||
|
|
!be16_and(state,
|
||
|
|
@@ -5082,7 +5093,6 @@ static struct mdinfo *ddf_activate_spare
|
||
|
|
di->recovery_start = 0;
|
||
|
|
di->data_offset = pos;
|
||
|
|
di->component_size = a->info.component_size;
|
||
|
|
- di->container_member = dl->pdnum;
|
||
|
|
di->next = rv;
|
||
|
|
rv = di;
|
||
|
|
dprintf("%x:%x (%08x) to be %d at %llu\n",
|
||
|
|
@@ -5140,7 +5150,7 @@ static struct mdinfo *ddf_activate_spare
|
||
|
|
if (dl->major == di->disk.major
|
||
|
|
&& dl->minor == di->disk.minor)
|
||
|
|
break;
|
||
|
|
- if (!dl) {
|
||
|
|
+ if (!dl || dl->pdnum < 0) {
|
||
|
|
pr_err("%s: BUG: can't find disk %d (%d/%d)\n",
|
||
|
|
__func__, di->disk.raid_disk,
|
||
|
|
di->disk.major, di->disk.minor);
|