* [PATCH 2/2] common/partition: check only for partition table types
2013-04-19 8:46 [PATCH 1/2] common/filetype: move partition-table detection into own function Hubert Feurstein
@ 2013-04-19 8:46 ` Hubert Feurstein
2013-04-19 15:46 ` [PATCH 1/2] common/filetype: move partition-table detection into own function Jean-Christophe PLAGNIOL-VILLARD
2013-04-29 7:35 ` Sascha Hauer
2 siblings, 0 replies; 4+ messages in thread
From: Hubert Feurstein @ 2013-04-19 8:46 UTC (permalink / raw)
To: barebox
The detection of the partition table fails when we have a barebox image
in the MBR. So check only for partition table types.
Signed-off-by: Hubert Feurstein <h.feurstein@gmail.com>
---
common/partitions.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/common/partitions.c b/common/partitions.c
index dd25160..683b258 100644
--- a/common/partitions.c
+++ b/common/partitions.c
@@ -89,7 +89,7 @@ static struct partition_parser *partition_parser_get_by_filetype(uint8_t *buf)
struct partition_parser *parser;
/* first new partition table as EFI GPT */
- type = file_detect_type(buf, SECTOR_SIZE * 2);
+ type = file_detect_partition_table(buf, SECTOR_SIZE * 2);
list_for_each_entry(parser, &partition_parser_list, list) {
if (parser->type == type)
@@ -100,7 +100,7 @@ static struct partition_parser *partition_parser_get_by_filetype(uint8_t *buf)
* so if EFI GPT not enable take it as MBR
* useful for compatibility
*/
- type = file_detect_type(buf, SECTOR_SIZE);
+ type = file_detect_partition_table(buf, SECTOR_SIZE);
list_for_each_entry(parser, &partition_parser_list, list) {
if (parser->type == type)
--
1.8.1.3
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [PATCH 1/2] common/filetype: move partition-table detection into own function
2013-04-19 8:46 [PATCH 1/2] common/filetype: move partition-table detection into own function Hubert Feurstein
2013-04-19 8:46 ` [PATCH 2/2] common/partition: check only for partition table types Hubert Feurstein
@ 2013-04-19 15:46 ` Jean-Christophe PLAGNIOL-VILLARD
2013-04-29 7:35 ` Sascha Hauer
2 siblings, 0 replies; 4+ messages in thread
From: Jean-Christophe PLAGNIOL-VILLARD @ 2013-04-19 15:46 UTC (permalink / raw)
To: Hubert Feurstein; +Cc: barebox
On 10:46 Fri 19 Apr , Hubert Feurstein wrote:
> Signed-off-by: Hubert Feurstein <h.feurstein@gmail.com>
> ---
> common/filetype.c | 41 ++++++++++++++++++++++++-----------------
> include/filetype.h | 1 +
> 2 files changed, 25 insertions(+), 17 deletions(-)
>
> diff --git a/common/filetype.c b/common/filetype.c
> index 8652f1d..48fcdff 100644
> --- a/common/filetype.c
> +++ b/common/filetype.c
> @@ -151,13 +151,34 @@ enum filetype is_fat_or_mbr(const unsigned char *sector, unsigned long *bootsec)
> return filetype_mbr;
> }
>
> +enum filetype file_detect_partition_table(const void *_buf, size_t bufsize)
> +{
> + const u8 *buf8 = _buf;
> + enum filetype type;
> +
> + if (bufsize < 512)
> + return filetype_unknown;
> +
> + /*
> + * EFI GPT need to be detected before MBR otherwise
> + * we will detect a MBR
> + */
> + if (bufsize >= 520 && is_gpt_valid(buf8))
> + return filetype_gpt;
> +
> + type = is_fat_or_mbr(buf8, NULL);
> + if (type != filetype_unknown)
> + return type;
> +
> + return filetype_unknown;
> +}
> +
> enum filetype file_detect_type(const void *_buf, size_t bufsize)
> {
> const u32 *buf = _buf;
> const u64 *buf64 = _buf;
> const u8 *buf8 = _buf;
> const u16 *buf16 = _buf;
> - enum filetype type;
>
> if (bufsize < 9)
> return filetype_unknown;
> @@ -204,24 +225,10 @@ enum filetype file_detect_type(const void *_buf, size_t bufsize)
> if (bufsize < 512)
> return filetype_unknown;
>
> - /*
> - * EFI GPT need to be detected before MBR otherwise
> - * we will detect a MBR
> - */
> - if (bufsize >= 520 && is_gpt_valid(buf8))
> - return filetype_gpt;
> -
> - type = is_fat_or_mbr(buf8, NULL);
> - if (type != filetype_unknown)
> - return type;
> -
> - if (bufsize < 1536)
> - return filetype_unknown;
> -
> - if (buf16[512 + 28] == le16_to_cpu(0xef53))
> + if (bufsize >= 1536 && buf16[512 + 28] == le16_to_cpu(0xef53))
> return filetype_ext;
>
> - return filetype_unknown;
> + return file_detect_partition_table(_buf, bufsize);
no you need to move this UP and keep the if bufsize < 1536
and we always need to return unknown at the end
> }
>
> enum filetype file_name_detect_type(const char *filename)
> diff --git a/include/filetype.h b/include/filetype.h
> index 78ca5d2..ee777ac 100644
> --- a/include/filetype.h
> +++ b/include/filetype.h
> @@ -31,6 +31,7 @@ enum filetype {
>
> const char *file_type_to_string(enum filetype f);
> const char *file_type_to_short_string(enum filetype f);
> +enum filetype file_detect_partition_table(const void *_buf, size_t bufsize);
> enum filetype file_detect_type(const void *_buf, size_t bufsize);
> enum filetype file_name_detect_type(const char *filename);
> enum filetype is_fat_or_mbr(const unsigned char *sector, unsigned long *bootsec);
> --
> 1.8.1.3
>
>
> _______________________________________________
> barebox mailing list
> barebox@lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/barebox
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [PATCH 1/2] common/filetype: move partition-table detection into own function
2013-04-19 8:46 [PATCH 1/2] common/filetype: move partition-table detection into own function Hubert Feurstein
2013-04-19 8:46 ` [PATCH 2/2] common/partition: check only for partition table types Hubert Feurstein
2013-04-19 15:46 ` [PATCH 1/2] common/filetype: move partition-table detection into own function Jean-Christophe PLAGNIOL-VILLARD
@ 2013-04-29 7:35 ` Sascha Hauer
2 siblings, 0 replies; 4+ messages in thread
From: Sascha Hauer @ 2013-04-29 7:35 UTC (permalink / raw)
To: Hubert Feurstein; +Cc: barebox
Hi Hubert,
On Fri, Apr 19, 2013 at 10:46:04AM +0200, Hubert Feurstein wrote:
> Signed-off-by: Hubert Feurstein <h.feurstein@gmail.com>
> ---
> common/filetype.c | 41 ++++++++++++++++++++++++-----------------
> include/filetype.h | 1 +
> 2 files changed, 25 insertions(+), 17 deletions(-)
Modified this slightly to the below and applied both.
Thanks
Sascha
8<------------------------------------------------------
From c06956e15f8fb32d46e479950719c30bae57e5bb Mon Sep 17 00:00:00 2001
From: Hubert Feurstein <h.feurstein@gmail.com>
Date: Fri, 19 Apr 2013 10:46:04 +0200
Subject: [PATCH] common/filetype: move partition-table detection into own
function
Signed-off-by: Hubert Feurstein <h.feurstein@gmail.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
---
common/filetype.c | 36 ++++++++++++++++++++++++------------
include/filetype.h | 1 +
2 files changed, 25 insertions(+), 12 deletions(-)
diff --git a/common/filetype.c b/common/filetype.c
index 8652f1d..1ff3dd2 100644
--- a/common/filetype.c
+++ b/common/filetype.c
@@ -151,6 +151,28 @@ enum filetype is_fat_or_mbr(const unsigned char *sector, unsigned long *bootsec)
return filetype_mbr;
}
+enum filetype file_detect_partition_table(const void *_buf, size_t bufsize)
+{
+ const u8 *buf8 = _buf;
+ enum filetype type;
+
+ if (bufsize < 512)
+ return filetype_unknown;
+
+ /*
+ * EFI GPT need to be detected before MBR otherwise
+ * we will detect a MBR
+ */
+ if (bufsize >= 520 && is_gpt_valid(buf8))
+ return filetype_gpt;
+
+ type = is_fat_or_mbr(buf8, NULL);
+ if (type != filetype_unknown)
+ return type;
+
+ return filetype_unknown;
+}
+
enum filetype file_detect_type(const void *_buf, size_t bufsize)
{
const u32 *buf = _buf;
@@ -204,21 +226,11 @@ enum filetype file_detect_type(const void *_buf, size_t bufsize)
if (bufsize < 512)
return filetype_unknown;
- /*
- * EFI GPT need to be detected before MBR otherwise
- * we will detect a MBR
- */
- if (bufsize >= 520 && is_gpt_valid(buf8))
- return filetype_gpt;
-
- type = is_fat_or_mbr(buf8, NULL);
+ type = file_detect_partition_table(_buf, bufsize);
if (type != filetype_unknown)
return type;
- if (bufsize < 1536)
- return filetype_unknown;
-
- if (buf16[512 + 28] == le16_to_cpu(0xef53))
+ if (bufsize >= 1536 && buf16[512 + 28] == le16_to_cpu(0xef53))
return filetype_ext;
return filetype_unknown;
diff --git a/include/filetype.h b/include/filetype.h
index 78ca5d2..ee777ac 100644
--- a/include/filetype.h
+++ b/include/filetype.h
@@ -31,6 +31,7 @@ enum filetype {
const char *file_type_to_string(enum filetype f);
const char *file_type_to_short_string(enum filetype f);
+enum filetype file_detect_partition_table(const void *_buf, size_t bufsize);
enum filetype file_detect_type(const void *_buf, size_t bufsize);
enum filetype file_name_detect_type(const char *filename);
enum filetype is_fat_or_mbr(const unsigned char *sector, unsigned long *bootsec);
--
1.8.2.rc2
--
Pengutronix e.K. | |
Industrial Linux Solutions | http://www.pengutronix.de/ |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
^ permalink raw reply [flat|nested] 4+ messages in thread