All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH] fix stubdom memory corruption
@ 2009-04-14  9:27 Stefano Stabellini
  2009-04-14 12:28 ` Boris Derzhavets
  0 siblings, 1 reply; 13+ messages in thread
From: Stefano Stabellini @ 2009-04-14  9:27 UTC (permalink / raw)
  To: xen-devel

Hi all,
this patch fixes a memory corruption in blkfront that happens every time
we pass a sector aligned buffer (instead of a page aligned buffer) to
blkfront_aio.
To trigger the COW we have to write at least a byte to each page of the
buffer, but we must be careful not to overwrite useful content.

Signed-off-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com>

diff -r dbc4014882d0 extras/mini-os/blkfront.c
--- a/extras/mini-os/blkfront.c	Wed Apr 01 08:36:21 2009 +0100
+++ b/extras/mini-os/blkfront.c	Tue Apr 14 10:18:30 2009 +0100
@@ -317,19 +317,21 @@
     req->sector_number = aiocbp->aio_offset / dev->info.sector_size;
 
     for (j = 0; j < n; j++) {
+        req->seg[j].first_sect = 0;
+        req->seg[j].last_sect = PAGE_SIZE / dev->info.sector_size - 1;
+    }
+    req->seg[0].first_sect = ((uintptr_t)aiocbp->aio_buf & ~PAGE_MASK) / dev->info.sector_size;
+    req->seg[n-1].last_sect = (((uintptr_t)aiocbp->aio_buf + aiocbp->aio_nbytes - 1) & ~PAGE_MASK) / dev->info.sector_size;
+    for (j = 0; j < n; j++) {
 	uintptr_t data = start + j * PAGE_SIZE;
         if (!write) {
             /* Trigger CoW if needed */
-            *(char*)data = 0;
+            *(char*)(data + (req->seg[j].first_sect << 9)) = 0;
             barrier();
         }
 	aiocbp->gref[j] = req->seg[j].gref =
             gnttab_grant_access(dev->dom, virtual_to_mfn(data), write);
-	req->seg[j].first_sect = 0;
-	req->seg[j].last_sect = PAGE_SIZE / dev->info.sector_size - 1;
     }
-    req->seg[0].first_sect = ((uintptr_t)aiocbp->aio_buf & ~PAGE_MASK) / dev->info.sector_size;
-    req->seg[n-1].last_sect = (((uintptr_t)aiocbp->aio_buf + aiocbp->aio_nbytes - 1) & ~PAGE_MASK) / dev->info.sector_size;
 
     dev->ring.req_prod_pvt = i + 1;

^ permalink raw reply	[flat|nested] 13+ messages in thread

end of thread, other threads:[~2009-04-15 13:59 UTC | newest]

Thread overview: 13+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2009-04-14  9:27 [PATCH] fix stubdom memory corruption Stefano Stabellini
2009-04-14 12:28 ` Boris Derzhavets
2009-04-14 12:55   ` Stefano Stabellini
2009-04-14 13:01     ` Boris Derzhavets
2009-04-14 13:36       ` Boris Derzhavets
2009-04-15 13:37         ` Stefano Stabellini
2009-04-15 13:59           ` Boris Derzhavets
2009-04-14 13:40     ` Boris Derzhavets
2009-04-14 15:33       ` Stefano Stabellini
2009-04-14 18:36         ` Boris Derzhavets
2009-04-15  9:14           ` Stefano Stabellini
2009-04-15 11:21             ` Boris Derzhavets
2009-04-15 11:48               ` Pasi Kärkkäinen

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.