Bufferoverflow on eMMC partition handling

Bufferoverflow on eMMC partition handling

[Florian Otte]

[-- Attachment #1: Type: text/plain, Size: 492 bytes --]

Hi Everyone.

I tried to use all general purpose partitions on an eMMC storage device and ran into some trouble. In ./include/mci.h the number of partitions is limited to 6, but there might be 7 partitions. This results in a buffer overflow or access out of bound and causes a nasty bootloop when all general purpose-partitions are used. I created a simple patch and appended it to this mail.

Kind regards
fotte

[Edit]: Sorry. Clicked the wrong button to fast. Now with Attachment.

[-- Attachment #2: 0001-FIX-buffer-overflow-on-MCI-partition-enumeration.patch --]
[-- Type: text/plain, Size: 1082 bytes --]

>From 0bae0df23bbc4a9e98f1bcac6c6fbe0c3b21bc78 Mon Sep 17 00:00:00 2001
From: Florian Otte <fotte@uos.de>
Date: Mon, 2 Sep 2024 11:27:47 +0200
Subject: [PATCH] FIX: buffer overflow on MCI-partition enumeration

Memory for up to 6 partitions is reserved, however there can be up to 7
partitions on an mci storage (e.g. emmc). A user partition two boot partitions
and up to four general pupose partitions.
---
 include/mci.h | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/include/mci.h b/include/mci.h
index 3bf1455a40..cd01e2f992 100644
--- a/include/mci.h
+++ b/include/mci.h
@@ -600,7 +600,10 @@ struct mci_host {
 
 #define MMC_NUM_BOOT_PARTITION	2
 #define MMC_NUM_GP_PARTITION	4
-#define MMC_NUM_PHY_PARTITION	6
+#define MMC_NUM_USER_PARTITION	1
+#define MMC_NUM_PHY_PARTITION	(MMC_NUM_BOOT_PARTITION + \
+                                 MMC_NUM_GP_PARTITION + \
+                                 MMC_NUM_USER_PARTITION)
 
 struct mci_part {
 	struct block_device	blk;		/**< the blockdevice for the card */
-- 
2.39.2

Re: Bufferoverflow on eMMC partition handling

[Sascha Hauer]

On Mon, 02 Sep 2024 11:37:56 +0200, Florian Otte wrote:
> Memory for up to 6 partitions is reserved, however there can be up to 7
> partitions on an mci storage (e.g. emmc). A user partition two boot partitions
> and up to four general pupose partitions.
> 
> 

Applied, thanks!

[1/1] Bufferoverflow on eMMC partition handling
      https://git.pengutronix.de/cgit/barebox/commit/?id=46b577013b3c (link may not be stable)

Best regards,
-- 
Sascha Hauer <s.hauer@pengutronix.de>

Re: Bufferoverflow on eMMC partition handling

[Sascha Hauer]

On Mon, Sep 02, 2024 at 11:37:56AM +0200, Florian Otte wrote:
> Hi Everyone.
> 
> I tried to use all general purpose partitions on an eMMC storage
> device and ran into some trouble. In ./include/mci.h the number of
> partitions is limited to 6, but there might be 7 partitions. This
> results in a buffer overflow or access out of bound and causes a nasty
> bootloop when all general purpose-partitions are used. I created a
> simple patch and appended it to this mail.
> 
> Kind regards
> fotte
> 
> [Edit]: Sorry. Clicked the wrong button to fast. Now with Attachment.

> From 0bae0df23bbc4a9e98f1bcac6c6fbe0c3b21bc78 Mon Sep 17 00:00:00 2001
> From: Florian Otte <fotte@uos.de>
> Date: Mon, 2 Sep 2024 11:27:47 +0200
> Subject: [PATCH] FIX: buffer overflow on MCI-partition enumeration
> 
> Memory for up to 6 partitions is reserved, however there can be up to 7
> partitions on an mci storage (e.g. emmc). A user partition two boot partitions
> and up to four general pupose partitions.
> ---
>  include/mci.h | 5 ++++-
>  1 file changed, 4 insertions(+), 1 deletion(-)

Your patch lacks a Signed-off-by: line. Please respond with such a line.

Otherwise ok, thanks for fixing this. I additionally created a patch to
check for the array boundaries.

Sascha

-- 
Pengutronix e.K.                           |                             |
Steuerwalder Str. 21                       | http://www.pengutronix.de/  |
31137 Hildesheim, Germany                  | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

Re: Bufferoverflow on eMMC partition handling

[Sascha Hauer]

On Fri, Sep 06, 2024 at 08:28:26AM +0200, Florian Otte wrote:
> Hey Sascha,
> 
> thank your for your reply. I am a little bit unfamiliar with the
> processes, so I hope this is what your are asking for.

Indeed, that's what I was asking for. All good now, patch applied,
thanks

Sascha

> 
> Kind Regards,
> Florian
> 
> 
> 
> On Tuesday, September 03, 2024 13:38 CEST, Sascha Hauer <s.hauer@pengutronix.de> wrote:
> 
> > On Mon, Sep 02, 2024 at 11:37:56AM +0200, Florian Otte wrote:
> > > Hi Everyone.
> > > 
> > > I tried to use all general purpose partitions on an eMMC storage
> > > device and ran into some trouble. In ./include/mci.h the number of
> > > partitions is limited to 6, but there might be 7 partitions. This
> > > results in a buffer overflow or access out of bound and causes a nasty
> > > bootloop when all general purpose-partitions are used. I created a
> > > simple patch and appended it to this mail.
> > > 
> > > Kind regards
> > > fotte
> > > 
> > > [Edit]: Sorry. Clicked the wrong button to fast. Now with Attachment.
> > 
> > > From 0bae0df23bbc4a9e98f1bcac6c6fbe0c3b21bc78 Mon Sep 17 00:00:00 2001
> > > From: Florian Otte <fotte@uos.de>
> > > Date: Mon, 2 Sep 2024 11:27:47 +0200
> > > Subject: [PATCH] FIX: buffer overflow on MCI-partition enumeration
> > > 
> > > Memory for up to 6 partitions is reserved, however there can be up to 7
> > > partitions on an mci storage (e.g. emmc). A user partition two boot partitions
> > > and up to four general pupose partitions.
> > > ---
> > >  include/mci.h | 5 ++++-
> > >  1 file changed, 4 insertions(+), 1 deletion(-)
> > 
> > Your patch lacks a Signed-off-by: line. Please respond with such a line.
> > 
> > Otherwise ok, thanks for fixing this. I additionally created a patch to
> > check for the array boundaries.
> > 
> > Sascha
> > 
> > -- 
> > Pengutronix e.K.                           |                             |
> > Steuerwalder Str. 21                       | http://www.pengutronix.de/  |
> > 31137 Hildesheim, Germany                  | Phone: +49-5121-206917-0    |
> > Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

> From e5121cb2ae2a2d4294cafb93ec30abf6b7bcd0c1 Mon Sep 17 00:00:00 2001
> From: Florian Otte <fotte@uos.de>
> Date: Mon, 2 Sep 2024 11:27:47 +0200
> Subject: [PATCH] FIX: buffer overflow on MCI-partition enumeration
> 
> Memory for up to 6 partitions is reserved, however there can be up to 7
> partitions on an mci storage (e.g. emmc). A user partition two boot partitions
> and up to four general pupose partitions.
> 
> Signed-off-by: Florian.Otte <fotte@uos.de>
> ---
>  include/mci.h | 5 ++++-
>  1 file changed, 4 insertions(+), 1 deletion(-)
> 
> diff --git a/include/mci.h b/include/mci.h
> index 3bf1455a40..cd01e2f992 100644
> --- a/include/mci.h
> +++ b/include/mci.h
> @@ -600,7 +600,10 @@ struct mci_host {
>  
>  #define MMC_NUM_BOOT_PARTITION	2
>  #define MMC_NUM_GP_PARTITION	4
> -#define MMC_NUM_PHY_PARTITION	6
> +#define MMC_NUM_USER_PARTITION	1
> +#define MMC_NUM_PHY_PARTITION	(MMC_NUM_BOOT_PARTITION + \
> +                                 MMC_NUM_GP_PARTITION + \
> +                                 MMC_NUM_USER_PARTITION)
>  
>  struct mci_part {
>  	struct block_device	blk;		/**< the blockdevice for the card */
> -- 
> 2.39.2
> 
> 


-- 
Pengutronix e.K.                           |                             |
Steuerwalder Str. 21                       | http://www.pengutronix.de/  |
31137 Hildesheim, Germany                  | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

Re: Bufferoverflow on eMMC partition handling

[Sascha Hauer]

On Mon, 02 Sep 2024 11:37:56 +0200, Florian Otte wrote:
> Memory for up to 6 partitions is reserved, however there can be up to 7
> partitions on an mci storage (e.g. emmc). A user partition two boot partitions
> and up to four general pupose partitions.
> 
> 

Applied, thanks!

[1/1] Bufferoverflow on eMMC partition handling
      https://git.pengutronix.de/cgit/barebox/commit/?id=631f2de801e4 (link may not be stable)

Best regards,
-- 
Sascha Hauer <s.hauer@pengutronix.de>

Bufferoverflow on eMMC partition handling

[Florian Otte]

Hi Everyone.

I tried to use all general purpose partitions on an eMMC storage device and ran into some trouble. In ./include/mci.h the number of partitions is limited to 6, but there might be 7 partitions. This results in a buffer overflow or access out of bound and causes a nasty bootloop when all general purpose-partitions are used. I created a simple patch and appended it to this mail.

Kind regards
fotte