Attachment 250031 Details for Bug 369531 – suggested patch (against upstream mercurial repository).

[patch] suggested patch (against upstream mercurial repository).

fix (text/plain), 1.18 KB, created by Gerd Hoffmann on 2007-11-07 12:17:24 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Gerd Hoffmann

Created: 2007-11-07 12:17:24 UTC

Size: 1.18 KB

patch

obsolete

>diff -r c0b0974fb055 linux-2.6-xen-sparse/include/xen/blkif.h
>--- a/linux-2.6-xen-sparse/include/xen/blkif.h	Fri May 18 16:59:32 2007 +0100
>+++ b/linux-2.6-xen-sparse/include/xen/blkif.h	Wed Nov 07 12:59:58 2007 +0100
>@@ -72,25 +72,31 @@ enum blkif_protocol {
> 
> static void inline blkif_get_x86_32_req(blkif_request_t *dst, blkif_x86_32_request_t *src)
> {
>-	int i;
>+	int i, n = BLKIF_MAX_SEGMENTS_PER_REQUEST;
>+
> 	dst->operation = src->operation;
> 	dst->nr_segments = src->nr_segments;
> 	dst->handle = src->handle;
> 	dst->id = src->id;
> 	dst->sector_number = src->sector_number;
>-	for (i = 0; i < src->nr_segments; i++)
>+	if (n > src->nr_segments)
>+		n = src->nr_segments;
>+	for (i = 0; i < n; i++)
> 		dst->seg[i] = src->seg[i];
> }
> 
> static void inline blkif_get_x86_64_req(blkif_request_t *dst, blkif_x86_64_request_t *src)
> {
>-	int i;
>+	int i, n = BLKIF_MAX_SEGMENTS_PER_REQUEST;
>+
> 	dst->operation = src->operation;
> 	dst->nr_segments = src->nr_segments;
> 	dst->handle = src->handle;
> 	dst->id = src->id;
> 	dst->sector_number = src->sector_number;
>-	for (i = 0; i < src->nr_segments; i++)
>+	if (n > src->nr_segments)
>+		n = src->nr_segments;
>+	for (i = 0; i < n; i++)
> 		dst->seg[i] = src->seg[i];
> }
>

Actions: View | Diff

Attachments on bug 369531: 250031 | 250281