aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthew Wilcox <matthew@wil.cx>2007-12-03 12:10:24 -0500
committerMatthew Wilcox <matthew@wil.cx>2007-12-04 10:39:56 -0500
commit399154be2dcb6a58dbde9682162c38113cf3e40b (patch)
treee8f18356056729ef104db151703018d72e9ca929
parent2cae367e4854ff055c4f5e8aacd56b0eeec9f6cb (diff)
downloadkernel_samsung_smdk4412-399154be2dcb6a58dbde9682162c38113cf3e40b.zip
kernel_samsung_smdk4412-399154be2dcb6a58dbde9682162c38113cf3e40b.tar.gz
kernel_samsung_smdk4412-399154be2dcb6a58dbde9682162c38113cf3e40b.tar.bz2
dmapool: Validate parameters to dma_pool_create
Check that 'align' is a power of two, like the API specifies. Align 'size' to 'align' correctly -- the current code has an off-by-one. The ALIGN macro in kernel.h doesn't. Signed-off-by: Matthew Wilcox <willy@linux.intel.com> Acked-by: David S. Miller <davem@davemloft.net>
-rw-r--r--mm/dmapool.c15
1 files changed, 8 insertions, 7 deletions
diff --git a/mm/dmapool.c b/mm/dmapool.c
index b5ff9ce..744d541 100644
--- a/mm/dmapool.c
+++ b/mm/dmapool.c
@@ -106,17 +106,18 @@ struct dma_pool *dma_pool_create(const char *name, struct device *dev,
{
struct dma_pool *retval;
- if (align == 0)
+ if (align == 0) {
align = 1;
- if (size == 0)
+ } else if (align & (align - 1)) {
return NULL;
- else if (size < align)
- size = align;
- else if ((size % align) != 0) {
- size += align + 1;
- size &= ~(align - 1);
}
+ if (size == 0)
+ return NULL;
+
+ if ((size % align) != 0)
+ size = ALIGN(size, align);
+
if (allocation == 0) {
if (PAGE_SIZE < size)
allocation = size;