linux-kernel - [PATCH] fix order calculation in dma_mark_declared_memory

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [day] [month] [year] [list]

Message-Id: <4891FA82.76E4.0078.0@novell.com>
Date:	Thu, 31 Jul 2008 16:46:42 +0100
From:	"Jan Beulich" <jbeulich@...ell.com>
To:	<linux-kernel@...r.kernel.org>
Cc:	"Ingo Molnar" <mingo@...e.hu>, <dbaryshkov@...il.com>,
	<James.Bottomley@...senPartnership.com>
Subject: [PATCH] fix order calculation in
	dma_mark_declared_memory_occupied()

get_order() takes byte-sized input, not a page-granular one.

Irrespective of this fix I'm inclined to believe that this doesn't work
right anyway - bitmap_allocate_region() has an implicit assumption of
'pos' being suitable for 'order', which this function doesn't seem to
enforce (and since it's being called with a byte-granular value there's
no reason to believe that the callers would make sure device_addr is
passed accordingly - it's also not documented that way).

Signed-off-by: Jan Beulich <jbeulich@...ell.com>
Cc: James E.J. Bottomley <James.Bottomley@...senPartnership.com>
Cc: Ingo Molnar <mingo@...e.hu>
Cc: Dmitry Baryshkov <dbaryshkov@...il.com>

---
 kernel/dma-coherent.c |    5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

--- linux-2.6.27-rc1/kernel/dma-coherent.c	2008-07-31 17:08:36.000000000 +0200
+++ 2.6.27-rc1-dma-mark-declared/kernel/dma-coherent.c	2008-07-31 14:35:59.000000000 +0200
@@ -77,15 +77,14 @@ void *dma_mark_declared_memory_occupied(
 {
 	struct dma_coherent_mem *mem = dev->dma_mem;
 	int pos, err;
-	int pages = (size + (device_addr & ~PAGE_MASK) + PAGE_SIZE - 1);

-	pages >>= PAGE_SHIFT;
+	size += device_addr & ~PAGE_MASK;

 	if (!mem)
 		return ERR_PTR(-EINVAL);

 	pos = (device_addr - mem->device_base) >> PAGE_SHIFT;
-	err = bitmap_allocate_region(mem->bitmap, pos, get_order(pages));
+	err = bitmap_allocate_region(mem->bitmap, pos, get_order(size));
 	if (err != 0)
 		return ERR_PTR(err);
 	return mem->virt_base + (pos << PAGE_SHIFT);

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/