d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add additional check to EBR probe and create methods:

Browse Source 
don't try probe and create  EBR scheme when parent partition type
is not "ebr". This fixes error messages about corrupted EBR for
some partitions where is actually another partition scheme.

NOTE: if you have EBR on the partition with different than "ebr"
(0x05) type, then you will lost access to partitions until it will be
changed.

MFC after:	2 weeks
This commit is contained in:
Andrey V. Elsukov 2012-02-15 10:33:29 +00:00
parent 0d8bc07eba
commit 3bcf7d7191
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=231754
1 changed files with 19 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
sys/geom/part/g_part_ebr.c
View File

@ -268,7 +268,7 @@ g_part_ebr_add(struct g_part_table *basetable, struct g_part_entry *baseentry,
static int static int
g_part_ebr_create(struct g_part_table *basetable, struct g_part_parms *gpp) g_part_ebr_create(struct g_part_table *basetable, struct g_part_parms *gpp)
{ {
char psn[8]; char type[64];
struct g_consumer *cp; struct g_consumer *cp;
struct g_provider *pp; struct g_provider *pp;
uint32_t msize; uint32_t msize;
@ -285,10 +285,15 @@ g_part_ebr_create(struct g_part_table *basetable, struct g_part_parms *gpp)
if (basetable->gpt_depth == 0) if (basetable->gpt_depth == 0)
return (ENXIO); return (ENXIO);
cp = LIST_FIRST(&pp->consumers); cp = LIST_FIRST(&pp->consumers);
error = g_getattr("PART::scheme", cp, &psn); error = g_getattr("PART::scheme", cp, &type);
if (error) if (error != 0)
return (error); return (error);
if (strcmp(psn, "MBR")) if (strcmp(type, "MBR") != 0)
return (ENXIO);
error = g_getattr("PART::type", cp, &type);
if (error != 0)
return (error);
if (strcmp(type, "ebr") != 0)
return (ENXIO); return (ENXIO);
msize = MIN(pp->mediasize / pp->sectorsize, UINT32_MAX); msize = MIN(pp->mediasize / pp->sectorsize, UINT32_MAX);
@ -405,7 +410,7 @@ g_part_ebr_precheck(struct g_part_table *table, enum g_part_ctl req,
static int static int
g_part_ebr_probe(struct g_part_table *table, struct g_consumer *cp) g_part_ebr_probe(struct g_part_table *table, struct g_consumer *cp)
{ {
char psn[8]; char type[64];
struct g_provider *pp; struct g_provider *pp;
u_char *buf, *p; u_char *buf, *p;
int error, index, res; int error, index, res;
@ -422,10 +427,16 @@ g_part_ebr_probe(struct g_part_table *table, struct g_consumer *cp)
/* Check that we have a parent and that it's a MBR. */ /* Check that we have a parent and that it's a MBR. */
if (table->gpt_depth == 0) if (table->gpt_depth == 0)
return (ENXIO); return (ENXIO);
error = g_getattr("PART::scheme", cp, &psn); error = g_getattr("PART::scheme", cp, &type);
if (error) if (error != 0)
return (error); return (error);
if (strcmp(psn, "MBR")) if (strcmp(type, "MBR") != 0)
return (ENXIO);
/* Check that partition has type DOSPTYP_EBR. */
error = g_getattr("PART::type", cp, &type);
if (error != 0)
return (error);
if (strcmp(type, "ebr") != 0)
return (ENXIO); return (ENXIO);
/* Check that there's a EBR. */ /* Check that there's a EBR. */