1 files changed, 14 insertions, 1 deletions

diff --git a/mm/cma.c b/mm/cma.c
index 3340ef34c154..7fe0b8356775 100644
--- a/mm/cma.c
+++ b/mm/cma.c
@@ -278,6 +278,12 @@ int __init cma_declare_contiguous(phys_addr_t base,
          */
         alignment = max(alignment,  (phys_addr_t)PAGE_SIZE <<
                           max_t(unsigned long, MAX_ORDER - 1, pageblock_order));
+        if (fixed && base & (alignment - 1)) {
+                ret = -EINVAL;
+                pr_err("Region at %pa must be aligned to %pa bytes\n",
+                        &base, &alignment);
+                goto err;
+        }
         base = ALIGN(base, alignment);
         size = ALIGN(size, alignment);
         limit &= ~(alignment - 1);
@@ -308,6 +314,13 @@ int __init cma_declare_contiguous(phys_addr_t base,
         if (limit == 0 || limit > memblock_end)
                 limit = memblock_end;
 
+        if (base + size > limit) {
+                ret = -EINVAL;
+                pr_err("Size (%pa) of region at %pa exceeds limit (%pa)\n",
+                        &size, &base, &limit);
+                goto err;
+        }
+
         /* Reserve memory */
         if (fixed) {
                 if (memblock_is_region_reserved(base, size) ||
@@ -494,7 +507,7 @@ struct page *cma_alloc(struct cma *cma, size_t count, unsigned int align,
  * @pages: Allocated pages.
  * @count: Number of allocated pages.
  *
- * This function releases memory allocated by alloc_cma().
+ * This function releases memory allocated by cma_alloc().
  * It returns false when provided pages do not belong to contiguous area and
  * true otherwise.
  */