linux-kernel - [PATCH v2] mm: cma: fix CMA aligned offset calculation

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>] [thread-next>] [day] [month] [year] [list]

Message-ID: <1424821185-16956-1-git-send-email-dpetigara@broadcom.com>
Date:	Tue, 24 Feb 2015 15:39:45 -0800
From:	Danesh Petigara <dpetigara@...adcom.com>
To:	<akpm@...ux-foundation.org>
CC:	<m.szyprowski@...sung.com>, <mina86@...a86.com>,
	<iamjoonsoo.kim@....com>, <aneesh.kumar@...ux.vnet.ibm.com>,
	<laurent.pinchart+renesas@...asonboard.com>,
	<gregory.0xf0@...il.com>, <linux-mm@...ck.org>,
	<linux-kernel@...r.kernel.org>,
	Danesh Petigara <dpetigara@...adcom.com>,
	<stable@...r.kernel.org>
Subject: [PATCH v2] mm: cma: fix CMA aligned offset calculation

The CMA aligned offset calculation is incorrect for
non-zero order_per_bit values.

For example, if cma->order_per_bit=1, cma->base_pfn=
0x2f800000 and align_order=12, the function returns
a value of 0x17c00 instead of 0x400.

This patch fixes the CMA aligned offset calculation.

Cc: stable@...r.kernel.org
Signed-off-by: Danesh Petigara <dpetigara@...adcom.com>
Reviewed-by: Gregory Fong <gregory.0xf0@...il.com>
Acked-by: Michal Nazarewicz <mina86@...a86.com>
---
Changes since v1:
	- moved comment out of function
	- removed unused 'alignment' variable

v1: https://lkml.org/lkml/2015/2/24/598

 mm/cma.c | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/mm/cma.c b/mm/cma.c
index 75016fd..68ecb7a 100644
--- a/mm/cma.c
+++ b/mm/cma.c
@@ -64,15 +64,17 @@ static unsigned long cma_bitmap_aligned_mask(struct cma *cma, int align_order)
 	return (1UL << (align_order - cma->order_per_bit)) - 1;
 }
 
+/*
+ * Find a PFN aligned to the specified order and return an offset represented in
+ * order_per_bits.
+ */
 static unsigned long cma_bitmap_aligned_offset(struct cma *cma, int align_order)
 {
-	unsigned int alignment;
-
 	if (align_order <= cma->order_per_bit)
 		return 0;
-	alignment = 1UL << (align_order - cma->order_per_bit);
-	return ALIGN(cma->base_pfn, alignment) -
-		(cma->base_pfn >> cma->order_per_bit);
+
+	return (ALIGN(cma->base_pfn, (1UL << align_order))
+		- cma->base_pfn) >> cma->order_per_bit;
 }
 
 static unsigned long cma_bitmap_maxno(struct cma *cma)
-- 
1.9.1

--
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/