|
@@ -10,10 +10,13 @@
|
|
|
#include "check.h"
|
|
|
#include "osf.h"
|
|
|
|
|
|
+#define MAX_OSF_PARTITIONS 8
|
|
|
+
|
|
|
int osf_partition(struct parsed_partitions *state)
|
|
|
{
|
|
|
int i;
|
|
|
int slot = 1;
|
|
|
+ unsigned int npartitions;
|
|
|
Sector sect;
|
|
|
unsigned char *data;
|
|
|
struct disklabel {
|
|
@@ -45,7 +48,7 @@ int osf_partition(struct parsed_partitions *state)
|
|
|
u8 p_fstype;
|
|
|
u8 p_frag;
|
|
|
__le16 p_cpg;
|
|
|
- } d_partitions[8];
|
|
|
+ } d_partitions[MAX_OSF_PARTITIONS];
|
|
|
} * label;
|
|
|
struct d_partition * partition;
|
|
|
|
|
@@ -63,7 +66,12 @@ int osf_partition(struct parsed_partitions *state)
|
|
|
put_dev_sector(sect);
|
|
|
return 0;
|
|
|
}
|
|
|
- for (i = 0 ; i < le16_to_cpu(label->d_npartitions); i++, partition++) {
|
|
|
+ npartitions = le16_to_cpu(label->d_npartitions);
|
|
|
+ if (npartitions > MAX_OSF_PARTITIONS) {
|
|
|
+ put_dev_sector(sect);
|
|
|
+ return 0;
|
|
|
+ }
|
|
|
+ for (i = 0 ; i < npartitions; i++, partition++) {
|
|
|
if (slot == state->limit)
|
|
|
break;
|
|
|
if (le32_to_cpu(partition->p_size))
|