From f8a32ef6d325661e022dd10b11dcde359d89e8dd Mon Sep 17 00:00:00 2001 From: Cho KyongHo Date: Fri, 23 Nov 2018 17:21:22 +0900 Subject: [PATCH] [RAMEN9610-12171] android: ion: fix assigning shifted int to size_t This fixes SEC_BITSHIFT_MIGHT_OVERFLOW. Change-Id: If39bb9e4da6c9c6acdba25ec817933204c0a6801 Signed-off-by: Cho KyongHo --- drivers/staging/android/ion/ion_fdt_exynos.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/drivers/staging/android/ion/ion_fdt_exynos.c b/drivers/staging/android/ion/ion_fdt_exynos.c index b53d6c110d5c..2c946df5726b 100644 --- a/drivers/staging/android/ion/ion_fdt_exynos.c +++ b/drivers/staging/android/ion/ion_fdt_exynos.c @@ -55,8 +55,11 @@ static int __init exynos_ion_reserved_mem_setup(struct reserved_mem *rmem) prop = of_get_flat_dt_prop(rmem->fdt_node, "ion,alignment", &len); if (prop && (be32_to_cpu(prop[0]) >= PAGE_SIZE)) { alloc_align = be32_to_cpu(prop[0]); - if ((alloc_align & (alloc_align - 1)) != 0) - alloc_align = 1 << (get_order(alloc_align) + PAGE_SHIFT); + if ((alloc_align & (alloc_align - 1)) != 0) { + long order = get_order(alloc_align); + + alloc_align = 1UL << (order + PAGE_SHIFT); + } } prop = of_get_flat_dt_prop(rmem->fdt_node, "ion,heapname", &len); -- 2.20.1