A-Team_Digital_Solutions/android_kernel_motorola_sm6375
Watch
2
0
Fork
You've already forked android_kernel_motorola_sm6375
 0
mirror of https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git synced 2026-10-07 12:25:00 -04:00
Code Issues Projects Releases Packages Wiki Activity

Revert "mmc: core: Fix size overflow for mmc partitions"

Browse source 
This reverts commit a21260928b which is
commit f3d7c2292d104519195fdb11192daec13229c219 upstream.

It breaks the API and eMMC partitions are not created by users in
Android.

Bug: 161946584
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: I92366299c847c89d3e652868abd455cabff8ea3e
This commit is contained in:
Greg Kroah-Hartman 2020-10-01 20:42:35 +02:00
commit 63e6ea10ec
2 changed files with 6 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

9
drivers/mmc/core/mmc.c
View file

@ -297,7 +297,7 @@ static void mmc_manage_enhanced_area(struct mmc_card *card, u8 *ext_csd)
}
}
static void mmc_part_add(struct mmc_card *card, u64 size,
static void mmc_part_add(struct mmc_card *card, unsigned int size,
unsigned int part_cfg, char *name, int idx, bool ro,
int area_type)
{
@ -313,7 +313,7 @@ static void mmc_manage_gp_partitions(struct mmc_card *card, u8 *ext_csd)
{
int idx;
u8 hc_erase_grp_sz, hc_wp_grp_sz;
u64 part_size;
unsigned int part_size;
/*
* General purpose partition feature support --
@ -343,7 +343,8 @@ static void mmc_manage_gp_partitions(struct mmc_card *card, u8 *ext_csd)
(ext_csd[EXT_CSD_GP_SIZE_MULT + idx * 3 + 1]
<< 8) +
ext_csd[EXT_CSD_GP_SIZE_MULT + idx * 3];
part_size *= (hc_erase_grp_sz * hc_wp_grp_sz);
part_size *= (size_t)(hc_erase_grp_sz *
hc_wp_grp_sz);
mmc_part_add(card, part_size << 19,
EXT_CSD_PART_CONFIG_ACC_GP0 + idx,
"gp%d", idx, false,
@ -361,7 +362,7 @@ static void mmc_manage_gp_partitions(struct mmc_card *card, u8 *ext_csd)
static int mmc_decode_ext_csd(struct mmc_card *card, u8 *ext_csd)
{
int err = 0, idx;
u64 part_size;
unsigned int part_size;
struct device_node *np;
bool broken_hpi = false;

2
include/linux/mmc/card.h
View file

@ -226,7 +226,7 @@ struct mmc_queue_req;
* MMC Physical partitions
*/
struct mmc_part {
u64 size; /* partition size (in bytes) */
unsigned int size; /* partition size (in bytes) */
unsigned int part_cfg; /* partition type */
char name[MAX_MMC_PART_NAME_LEN];
bool force_ro; /* to make boot parts RO by default */