diff options
| author | Huazhong Tan <tanhuazhong@huawei.com> | 2018-08-23 11:10:10 +0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2018-10-03 16:59:23 -0700 |
| commit | 2d4a7923868606a4252ba11b296a09baa3355aa5 (patch) | |
| tree | 4fedaeb2dfef8cbcf76ee98659b35be942e5b75c /drivers/net/ethernet | |
| parent | d96820d46bc315f669789e18d4aef76d3bc71cc0 (diff) | |
| download | linux-stable-2d4a7923868606a4252ba11b296a09baa3355aa5.tar.gz linux-stable-2d4a7923868606a4252ba11b296a09baa3355aa5.tar.bz2 linux-stable-2d4a7923868606a4252ba11b296a09baa3355aa5.zip | |
net: hns: fix length and page_offset overflow when CONFIG_ARM64_64K_PAGES
[ Upstream commit 3ed614dce3ca9912d22be215ff0f11104b69fe62 ]
When enable the config item "CONFIG_ARM64_64K_PAGES", the size of PAGE_SIZE
is 65536(64K). But the type of length and page_offset are u16, they will
overflow. So change them to u32.
Fixes: 6fe6611ff275 ("net: add Hisilicon Network Subsystem hnae framework support")
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>
Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/net/ethernet')
| -rw-r--r-- | drivers/net/ethernet/hisilicon/hns/hnae.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/ethernet/hisilicon/hns/hnae.h b/drivers/net/ethernet/hisilicon/hns/hnae.h index fa5b30f547f6..cad52bd331f7 100644 --- a/drivers/net/ethernet/hisilicon/hns/hnae.h +++ b/drivers/net/ethernet/hisilicon/hns/hnae.h @@ -220,10 +220,10 @@ struct hnae_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 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; |