Attachment 713595 Details for Bug 922944 – patch

[patch] patch

mdadm-3.2.6-bitmapsafety.patch (text/plain), 1.05 KB, created by Lars Wijtemans on 2013-03-21 04:45:12 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Lars Wijtemans

Created: 2013-03-21 04:45:12 UTC

Size: 1.05 KB

patch

obsolete

>diff -uNrp mdadm-3.2.6.orig/super1.c mdadm-3.2.6.new/super1.c
>--- mdadm-3.2.6.orig/super1.c	2013-03-20 18:47:10.320097089 +0100
>+++ mdadm-3.2.6.new/super1.c	2013-03-21 05:30:26.985534794 +0100
>@@ -1082,6 +1082,12 @@ static unsigned long choose_bm_space(uns
> 	 * NOTE: result must be multiple of 4K else bad things happen
> 	 * on 4K-sector devices.
> 	 */
>+	/* When raid0 is created, this is called with devsize=0,
>+	 * however we still want some space for a bitmap because it
>+	 * might be converted to another level. Maybe this can be
>+	 * changed somewhere else.
>+	 */
>+	if (devsize == 0) return 4*2;
> 	if (devsize < 64*2) return 0;
> 	if (devsize - 64*2 >= 200*1024*1024*2)
> 		return 128*2;
>@@ -1633,6 +1639,9 @@ add_internal_bitmap1(struct supertype *s
> 		/* Limit to 128K of bitmap when chunk size not requested */
> 		room = 128*2;
> 
>+	/* enough room is not guaranteed */
>+	if ( room <= 0 || ((size_t) room * 512) <= sizeof(bitmap_super_t) )
>+		return 0;
> 	max_bits = (room * 512 - sizeof(bitmap_super_t)) * 8;
> 
> 	min_chunk = 4096; /* sub-page chunks don't work yet.. */

Actions: View | Diff

Attachments on bug 922944: 712230 | 713595