|
 |
4d7edd7 |
From: Prasad J Pandit <pjp@fedoraproject.org>
|
|
|
4d7edd7 |
Date: Wed, 12 Oct 2016 14:40:55 +0530
|
|
|
4d7edd7 |
Subject: [PATCH] net: rocker: set limit to DMA buffer size
|
|
|
4d7edd7 |
|
|
|
4d7edd7 |
Rocker network switch emulator has test registers to help debug
|
|
|
4d7edd7 |
DMA operations. While testing host DMA access, a buffer address
|
|
|
4d7edd7 |
is written to register 'TEST_DMA_ADDR' and its size is written to
|
|
|
4d7edd7 |
register 'TEST_DMA_SIZE'. When performing TEST_DMA_CTRL_INVERT
|
|
|
4d7edd7 |
test, if DMA buffer size was greater than 'INT_MAX', it leads to
|
|
|
4d7edd7 |
an invalid buffer access. Limit the DMA buffer size to avoid it.
|
|
|
4d7edd7 |
|
|
|
4d7edd7 |
Reported-by: Huawei PSIRT <psirt@huawei.com>
|
|
|
4d7edd7 |
Signed-off-by: Prasad J Pandit <pjp@fedoraproject.org>
|
|
|
4d7edd7 |
Reviewed-by: Jiri Pirko <jiri@mellanox.com>
|
|
|
4d7edd7 |
Signed-off-by: Jason Wang <jasowang@redhat.com>
|
|
|
4d7edd7 |
(cherry picked from commit 8caed3d564672e8bc6d2e4c6a35228afd01f4723)
|
|
|
4d7edd7 |
---
|
|
|
4d7edd7 |
hw/net/rocker/rocker.c | 2 +-
|
|
|
4d7edd7 |
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
4d7edd7 |
|
|
|
4d7edd7 |
diff --git a/hw/net/rocker/rocker.c b/hw/net/rocker/rocker.c
|
|
|
4d7edd7 |
index 30f2ce4..e9d215a 100644
|
|
|
4d7edd7 |
--- a/hw/net/rocker/rocker.c
|
|
|
4d7edd7 |
+++ b/hw/net/rocker/rocker.c
|
|
|
4d7edd7 |
@@ -860,7 +860,7 @@ static void rocker_io_writel(void *opaque, hwaddr addr, uint32_t val)
|
|
|
4d7edd7 |
rocker_msix_irq(r, val);
|
|
|
4d7edd7 |
break;
|
|
|
4d7edd7 |
case ROCKER_TEST_DMA_SIZE:
|
|
|
4d7edd7 |
- r->test_dma_size = val;
|
|
|
4d7edd7 |
+ r->test_dma_size = val & 0xFFFF;
|
|
|
4d7edd7 |
break;
|
|
|
4d7edd7 |
case ROCKER_TEST_DMA_ADDR + 4:
|
|
|
4d7edd7 |
r->test_dma_addr = ((uint64_t)val) << 32 | r->lower32;
|