]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
RDMA/hns: Solve the overflow of the calc_pg_sz()
authorJiaran Zhang <zhangjiaran@huawei.com>
Sat, 19 Sep 2020 10:03:19 +0000 (18:03 +0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 29 Oct 2020 09:07:58 +0000 (10:07 +0100)
[ Upstream commit 768202a0825d447de785e87ff1ea1d3c86a71727 ]

calc_pg_sz() may gets a data calculation overflow if the PAGE_SIZE is 64 KB
and hop_num is 2. It is because that all variables involved in calculation
are defined in type of int. So change the type of bt_chunk_size,
buf_chunk_size and obj_per_chunk_default to u64.

Fixes: ba6bb7e97421 ("RDMA/hns: Add interfaces to get pf capabilities from firmware")
Link: https://lore.kernel.org/r/1600509802-44382-6-git-send-email-liweihang@huawei.com
Signed-off-by: Jiaran Zhang <zhangjiaran@huawei.com>
Signed-off-by: Weihang Li <liweihang@huawei.com>
Signed-off-by: Jason Gunthorpe <jgg@nvidia.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/infiniband/hw/hns/hns_roce_hw_v2.c

index 0f995aa23b9a9f8ed24a2f179fcc749b6897047e..fdd9605c67630ce6eba931c96aebc885d11862b9 100644 (file)
@@ -1770,9 +1770,9 @@ static void calc_pg_sz(int obj_num, int obj_size, int hop_num, int ctx_bt_num,
                       int *buf_page_size, int *bt_page_size, u32 hem_type)
 {
        u64 obj_per_chunk;
-       int bt_chunk_size = 1 << PAGE_SHIFT;
-       int buf_chunk_size = 1 << PAGE_SHIFT;
-       int obj_per_chunk_default = buf_chunk_size / obj_size;
+       u64 bt_chunk_size = PAGE_SIZE;
+       u64 buf_chunk_size = PAGE_SIZE;
+       u64 obj_per_chunk_default = buf_chunk_size / obj_size;
 
        *buf_page_size = 0;
        *bt_page_size = 0;