cmd line partitions: use 64 bit variables to detect partitions/offsets larger than 4G.
PATCH 1/1 cmd line partitions: use 64 bit variables to detect partitions/offsets larger than 4G.
Signed-off-by Saeed Bishara <[email protected]>
--- drivers/mtd/cmdlinepart.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-)
drivers/mtd/cmdlinepart.c +5 -5
@@ -41,8 +41,8 @@/* special size referring to all the remaining space in a partition */ -#define SIZE_REMAINING UINT_MAX -#define OFFSET_CONTINUOUS UINT_MAX +#define SIZE_REMAINING LLONG_MAX +#define OFFSET_CONTINUOUS LLONG_MAXstruct cmdline_mtd_partition {struct cmdline_mtd_partition *next;
@@ -74,8 +74,8 @@ static struct mtd_partition * newpart(char *s, int extra_mem_size) {struct mtd_partition *parts; -unsigned long size; -unsigned long offset =OFFSET_CONTINUOUS ; +unsigned long long size; +unsigned long long offset =OFFSET_CONTINUOUS ;char *name;int name_len;unsigned char *extra_mem;
@@ -93,7 +93,7 @@ static struct mtd_partition * newpart(char *s, size =memparse (s, &s);if (size <PAGE_SIZE ) { - printk(KERN_ERR ERRP "partition size too small (%lx)\n", size); + printk(KERN_ERR ERRP "partition size too small (%llx)\n", size);return NULL ; } }
Signature · 1 line
1.6.0.4
drivers/mtd/cmdlinepart.c +6 -6
@@ -41,8 +41,8 @@/* special size referring to all the remaining space in a partition */ -#define SIZE_REMAINING UINT_MAX -#define OFFSET_CONTINUOUS UINT_MAX +#define SIZE_REMAINING LLONG_MAX +#define OFFSET_CONTINUOUS LLONG_MAXstruct cmdline_mtd_partition {struct cmdline_mtd_partition *next;
@@ -74,8 +74,8 @@ static struct mtd_partition * newpart(char *s, int extra_mem_size) {struct mtd_partition *parts; -unsigned long size; -unsigned long offset =OFFSET_CONTINUOUS ; +unsigned long long size; +unsigned long long offset =OFFSET_CONTINUOUS ;char *name;int name_len;unsigned char *extra_mem;
@@ -93,7 +93,7 @@ static struct mtd_partition * newpart(char *s, size =memparse (s, &s);if (size <PAGE_SIZE ) { - printk(KERN_ERR ERRP "partition size too small (%lx)\n", size); + printk(KERN_ERR ERRP "partition size too small (%llx)\n", size);return NULL ; } }
@@ -304,7 +304,7 @@ static int parse_cmdline_partitions(struct mtd_info *master, struct mtd_partition **pparts, unsigned long origin) { -unsigned long offset; +unsigned long long offset;int i;struct cmdline_mtd_partition *part;const char *mtd_id = master->name;
Signature · 1 line
1.6.0.4
drivers/mtd/cmdlinepart.c
Quoted 5 lines · Saeed Bishara
drivers/mtd/cmdlinepart.c +0
-0@@ -41,8 +41,8 @@
Please, send with Signed-off-by.
Signature · 2 lines
Best Regards, Artem Bityutskiy (Артём Битюцкий)
PATCH 1/1 cmd line partitions: use 64 bit variables to detect partitions/offsets larger than 4G.
Signed-off-by Saeed Bishara <[email protected]>
--- drivers/mtd/cmdlinepart.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-)
drivers/mtd/cmdlinepart.c +6 -6
@@ -41,8 +41,8 @@/* special size referring to all the remaining space in a partition */ -#define SIZE_REMAINING UINT_MAX -#define OFFSET_CONTINUOUS UINT_MAX +#define SIZE_REMAINING LLONG_MAX +#define OFFSET_CONTINUOUS LLONG_MAXstruct cmdline_mtd_partition {struct cmdline_mtd_partition *next;
@@ -74,8 +74,8 @@ static struct mtd_partition * newpart(char *s, int extra_mem_size) {struct mtd_partition *parts; -unsigned long size; -unsigned long offset =OFFSET_CONTINUOUS ; +unsigned long long size; +unsigned long long offset =OFFSET_CONTINUOUS ;char *name;int name_len;unsigned char *extra_mem;
@@ -93,7 +93,7 @@ static struct mtd_partition * newpart(char *s, size =memparse (s, &s);if (size <PAGE_SIZE ) { - printk(KERN_ERR ERRP "partition size too small (%lx)\n", size); + printk(KERN_ERR ERRP "partition size too small (%llx)\n", size);return NULL ; } }
@@ -304,7 +304,7 @@ static int parse_cmdline_partitions(struct mtd_info *master, struct mtd_partition **pparts, unsigned long origin) { -unsigned long offset; +unsigned long long offset;int i;struct cmdline_mtd_partition *part;const char *mtd_id = master->name;
Signature · 1 line
1.6.0.4
Quoted 10 lines · Saeed Bishara
Signed-off-by Saeed Bishara <[email protected]>--- drivers/mtd/cmdlinepart.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-)drivers/mtd/cmdlinepart.c +0
-0
drivers/mtd/cmdlinepart.c line 45
Quoted 7 lines
drivers/mtd/cmdlinepart.c +2
-2@@ -41,8 +41,8 @@/* special size referring to all the remaining space in a partition */ -#define SIZE_REMAINING UINT_MAX -#define OFFSET_CONTINUOUS UINT_MAX +#define SIZE_REMAINING LLONG_MAX +#define OFFSET_CONTINUOUS LLONG_MAX
Should be ULLONG_MAX since you use unsigned long long and also offsets in 'struct mtd_partition' uses uint64_t.
Signature · 2 lines
Best Regards, Artem Bityutskiy (Артём Битюцкий)