From: Huazhong Tan <tanhuazhong@huawei.com>

Date: Thu, 23 Aug 2018 11:37:15 +0800

Subject: net: hns3: fix page_offset overflow when CONFIG_ARM64_64K_PAGES

Patch-mainline: v4.19-rc2

Git-commit: 27a5959308559fa6afcaa4e6cd81d25bcb2dda7c

References: bsc#1104353 FATE#326415

When enable the config item "CONFIG_ARM64_64K_PAGES", the size of

PAGE_SIZE is 65536(64K). But the type of page_offset is u16, it will

overflow. So change it to u32, when "CONFIG_ARM64_64K_PAGES" enabled.

Fixes: 76ad4f0ee747 ("net: hns3: Add support of HNS3 Ethernet Driver for hip08 SoC")

Signed-off-by: Huazhong Tan <tanhuazhong@huawei.com>

Signed-off-by: Salil Mehta <salil.mehta@huawei.com>

Signed-off-by: David S. Miller <davem@davemloft.net>

Acked-by: Thomas Bogendoerfer <tbogendoerfer@suse.de>

---

 drivers/net/ethernet/hisilicon/hns3/hns3_enet.h |    6 +++---

 1 file changed, 3 insertions(+), 3 deletions(-)

--- a/drivers/net/ethernet/hisilicon/hns3/hns3_enet.h

+++ b/drivers/net/ethernet/hisilicon/hns3/hns3_enet.h

@@ -290,11 +290,11 @@ struct hns3_desc_cb {

 	/* priv data for the desc, e.g. skb when use with ip stack*/

 	void *priv;

-	u16 page_offset;

-	u16 reuse_flag;

-

+	u32 page_offset;

 	u32 length;     /* length of the buffer */

+	u16 reuse_flag;

+

        /* desc type, used by the ring user to mark the type of the priv data */

 	u16 type;

 };