misaligned memory access in cmdlinepart.c

[Timofei V. Bondarenko]

Vitaly Wool wrote:
> Hi Timofei,
> I guess you should use a mail client that doesn't expand tabs to spaces, 
> like sylpheed or pine.
> 
> Best regards,
>   Vitaly
> 
> Timofei V. Bondarenko wrote:
> 
>> JЖrn Engel wrote:
>>
>>> On Mon, 6 June 2005 20:49:01 +0400, Timofei V. Bondarenko wrote:
>>>
>>>> JЖrn Engel wrote:
>>>>
>>>>> Hmm.  Well, I just don't care enough, let's keep it.
>>>>>
>>>>> Can you test the current patch and see if it works for you?  Once
>>>>> you've confirmed that, I'll commit it.
>>>>
>>>> Yes. I've tested it on the uclinux-bf533.
>>>
>>>
>>> Doesn't apply with patch -p1.  Can you respin the patch against mtd
>>> cvs and make sure it does?  If in doubt, read:
>>> http://www.zip.com.au/~akpm/linux/patches/stuff/tpp.txt
>>
>> Ok, sorry for noise.
>> Is it good enough?

Ohh. That's not silly mail, that's poor me.


diff -u -p -r1.17 cmdlinepart.c
--- mtd/drivers/mtd/cmdlinepart.c	26 Nov 2004 11:18:47 -0000	1.17
+++ mtd/drivers/mtd/cmdlinepart.c	7 Jun 2005 08:02:00 -0000
@@ -239,7 +239,8 @@ static int mtdpart_setup_real(char *s)
  				&num_parts,	/* out: number of parts */
  				0,		/* first partition */
  				(unsigned char**)&this_mtd, /* out: extra mem */
-				mtd_id_len + 1 + sizeof(*this_mtd));
+				mtd_id_len + 1 + sizeof(*this_mtd) +
+				sizeof(void*)-1 /*alignment*/);
  		if(!parts)
  		{
  			/*
@@ -252,7 +253,10 @@ static int mtdpart_setup_real(char *s)
  			 return 0;
  		 }

-		/* enter results */	
+		/* align this_mtd */
+		this_mtd = (struct cmdline_mtd_partition *)
+		    ALIGN((unsigned long)this_mtd, sizeof(void*));
+		/* enter results */
  		this_mtd->parts = parts;
  		this_mtd->num_parts = num_parts;
  		this_mtd->mtd_id = (char*)(this_mtd + 1);