diff options
| author | Juergen Borleis <jbe@pengutronix.de> | 2020-09-09 13:01:14 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2020-09-14 12:07:27 +0200 |
| commit | 1df6acb55021b68d5e3d946e6a9a85a93f731a3e (patch) | |
| tree | 995618b00a16307ad5e7abc4d33599e2bf880fbb /commands/mmc_extcsd.c | |
| parent | c6d2ab432d054976e233dc93734e362f0a1ab173 (diff) | |
| download | barebox-1df6acb55021b68d5e3d946e6a9a85a93f731a3e.tar.gz barebox-1df6acb55021b68d5e3d946e6a9a85a93f731a3e.tar.xz | |
commands: mmc_extcsd: print_field: fix 32 bit overflow
Signed-off-by: Juergen Borleis <jbe@pengutronix.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'commands/mmc_extcsd.c')
| -rw-r--r-- | commands/mmc_extcsd.c | 23 |
1 files changed, 15 insertions, 8 deletions
diff --git a/commands/mmc_extcsd.c b/commands/mmc_extcsd.c index c9a28fb1fe..40d11df17d 100644 --- a/commands/mmc_extcsd.c +++ b/commands/mmc_extcsd.c @@ -11,6 +11,7 @@ #include <mci.h> #include <getopt.h> #include <fs.h> +#include <linux/sizes.h> #define EXT_CSD_BLOCKSIZE 512 @@ -1142,7 +1143,7 @@ static int print_field(u8 *reg, int index) return 1; case EXT_CSD_SEC_COUNT: - tmp64 = val * 512; + tmp64 *= 512; printf("\tDevice density: %llu B\n", tmp64); return 1; @@ -1232,7 +1233,7 @@ static int print_field(u8 *reg, int index) case EXT_CSD_HC_ERASE_GRP_SIZE: val = get_field_val(EXT_CSD_HC_ERASE_GRP_SIZE, 0, 0xFF); - val = val * 524288; + val = val * SZ_512K; if (val) str = basprintf("Erase-unit size: %u", val); else @@ -1342,7 +1343,8 @@ static int print_field(u8 *reg, int index) case EXT_CSD_ENH_SIZE_MULT: tmp = get_field_val(EXT_CSD_HC_WP_GRP_SIZE, 0, 0xFF); tmp = tmp + get_field_val(EXT_CSD_HC_ERASE_GRP_SIZE, 0, 0xFF); - tmp64 = val * tmp * 524288; + tmp64 *= tmp; + tmp64 *= SZ_512K; printf("\tEnhanced User Data Area %i Size: %llu B\n", index - EXT_CSD_ENH_SIZE_MULT, tmp64); return 1; @@ -1350,28 +1352,32 @@ static int print_field(u8 *reg, int index) case EXT_CSD_GP_SIZE_MULT3: tmp = get_field_val(EXT_CSD_HC_WP_GRP_SIZE, 0, 0xFF); tmp = tmp + get_field_val(EXT_CSD_HC_ERASE_GRP_SIZE, 0, 0xFF); - tmp64 = val * tmp * 524288; + tmp64 *= tmp; + tmp64 *= SZ_512K; printf("\tGeneral_Purpose_Partition_3 Size: %llu B\n", tmp64); return 1; case EXT_CSD_GP_SIZE_MULT2: tmp = get_field_val(EXT_CSD_HC_WP_GRP_SIZE, 0, 0xFF); tmp = tmp + get_field_val(EXT_CSD_HC_ERASE_GRP_SIZE, 0, 0xFF); - tmp64 = val * tmp * 524288; + tmp64 *= tmp; + tmp64 *= SZ_512K; printf("\tGeneral_Purpose_Partition_2 Size: %llu B\n", tmp64); return 1; case EXT_CSD_GP_SIZE_MULT1: tmp = get_field_val(EXT_CSD_HC_WP_GRP_SIZE, 0, 0xFF); tmp = tmp + get_field_val(EXT_CSD_HC_ERASE_GRP_SIZE, 0, 0xFF); - tmp64 = val * tmp * 524288; + tmp64 *= tmp; + tmp64 *= SZ_512K; printf("\tGeneral_Purpose_Partition_1 Size: %llu B\n", tmp64); return 1; case EXT_CSD_GP_SIZE_MULT0: tmp = get_field_val(EXT_CSD_HC_WP_GRP_SIZE, 0, 0xFF); tmp = tmp + get_field_val(EXT_CSD_HC_ERASE_GRP_SIZE, 0, 0xFF); - tmp64 = val * tmp * 524288; + tmp64 *= tmp; + tmp64 *= SZ_512K; printf("\tGeneral_Purpose_Partition_0 Size: %llu B\n", tmp64); return 1; @@ -1422,7 +1428,8 @@ static int print_field(u8 *reg, int index) case EXT_CSD_MAX_ENH_SIZE_MULT: tmp = get_field_val(EXT_CSD_HC_WP_GRP_SIZE, 0, 0xFF); tmp = tmp + get_field_val(EXT_CSD_HC_ERASE_GRP_SIZE, 0, 0xFF); - tmp64 = val * tmp * 524288; + tmp64 *= tmp; + tmp64 *= SZ_512K; printf("\tMax Enhanced Area: %llu B\n", tmp64); return 1; |