Index: linux-2.6.21-rc2/mm/slub.c
===================================================================
--- linux-2.6.21-rc2.orig/mm/slub.c	2007-02-28 17:25:08.000000000 -0800
+++ linux-2.6.21-rc2/mm/slub.c	2007-02-28 17:29:35.000000000 -0800
@@ -335,8 +335,11 @@ static int check_object(struct kmem_cach
 	/* Offset of first byte after free pointer */
 	unsigned long off = s->inuse;
 
-	if (s->offset)
+	if (s->offset) {
 		off += sizeof(void *);
+		if (s->flags & SLAB_STORE_USER)
+			off += 2 * sizeof(void *);
+	}
 
 	/* Single object slabs do not get policed */
 	if (s->objects == 1)