net: fm10k: check size from dma region
Subsystems (3)
PATCH 1/1 net: fm10k: check size from dma region
Size is read from a dma region as input from device. Add sanity check of size before calling dma_sync_single_range_for_cpu with it.
This would prevent DMA-API warning: device driver tries to sync DMA memory it has not allocated.
--- drivers/net/ethernet/intel/fm10k/fm10k_main.c | 5 +++++ 1 file changed, 5 insertions(+)
drivers/net/ethernet/intel/fm10k/fm10k_main.c +5 -0
@@ -304,6 +304,11 @@ static struct sk_buff *fm10k_fetch_rx_buffer(struct fm10k_ring *rx_ring,struct fm10k_rx_buffer *rx_buffer;struct page *page; +if (unlikely (size >PAGE_SIZE )) { +dev_err (rx_ring->dev,"size %d exceeds PAGE_SIZE\n" , size); +return NULL ; + } + rx_buffer = &rx_ring->rx_buffer[rx_ring->next_to_clean]; page = rx_buffer->page;prefetchw (page);
Signature · 1 line
2.17.1
Quoted 19 lines · Zekun Shen
Size is read from a dma region as input from device. Add sanity check of size before calling
dma_sync_single_range_for_cpuwith it.This would prevent DMA-API warning: device driver tries to sync DMA memory it has not allocated.
Signed-off-by Zekun Shen <[email protected]>--- drivers/net/ethernet/intel/fm10k/fm10k_main.c | 5 +++++ 1 file changed, 5 insertions(+)drivers/net/ethernet/intel/fm10k/fm10k_main.c +0
-0@@ -304,6 +304,11 @@ static struct sk_buff *fm10k_fetch_rx_buffer(struct fm10k_ring *rx_ring,struct fm10k_rx_buffer *rx_buffer;
drivers/net/ethernet/intel/fm10k/fm10k_main.c static struct sk_buff *fm10k_fetch_rx_buffer(struct fm10k_ring *rx_ring, · line 314
Quoted 10 lines
drivers/net/ethernet/intel/fm10k/fm10k_main.c +5
-0struct page *page; +if (unlikely (size >PAGE_SIZE )) { +dev_err (rx_ring->dev,"size %d exceeds PAGE_SIZE\n" , size); +return NULL ; + } + rx_buffer = &rx_ring->rx_buffer[rx_ring->next_to_clean]; page = rx_buffer->page;prefetchw (page);
The upper limitation for the size should be 2K or FM10K_RX_BUFSZ, not PAGE_SIZE. Otherwise you are still capable of going out of bounds because the offset is used within the page to push the start of the region up by 2K.
If this is actually fixing the warning it makes me wonder if the code performing the check is broken itself since we would still be accessing outside of the accessible DMA range.
Quoted 4 lines · Alexander Duyck
The upper limitation for the size should be 2K or
FM10K_RX_BUFSZ, notPAGE_SIZE. Otherwise you are still capable of going out of bounds because the offset is used within the page to push the start of the region up by 2K.
PAGE_SIZE can drop the warning, as the dma allocated size is PAGE_SIZE.
Quoted 3 lines
If this is actually fixing the warning it makes me wonder if the code performing the check is broken itself since we would still be accessing outside of the accessible DMA range.
The unbounded size is only passed to fm10k_add_rx_frag, which expects and checks size to be less than FM10K_RX_HDR_LEN which is 256.
In this way, any boundary between 256 and 4K should work. I could address that with a second version.
Quoted 7 lines · Zekun Shen
Quoted 4 lines · Alexander Duyck
The upper limitation for the size should be 2K or
FM10K_RX_BUFSZ, notPAGE_SIZE. Otherwise you are still capable of going out of bounds because the offset is used within the page to push the start of the region up by 2K.
PAGE_SIZEcan drop the warning, as the dma allocated size isPAGE_SIZE.
Yes, but the point I was getting at is that if you are just going to squelch the warning, but leave the code broken then the warning isn't of any use and might as well be discarded. Either you limit the value to 2K which is what the hardware is expected to max out at anyway, or you just skip the warning and assume hardware will do the right thing. I'm not even sure this patch is worth the effort if it is just using some dummy value that is still broken and simply squelches the warning.
Could you provide more information about how you are encountering the error? Is this something you are seeing with an actual fm10k device, or is this something found via code review or static analysis?
Quoted 8 lines
Quoted 3 lines
If this is actually fixing the warning it makes me wonder if the code performing the check is broken itself since we would still be accessing outside of the accessible DMA range.
The unbounded size is only passed to
fm10k_add_rx_frag, which expects and checks size to be less thanFM10K_RX_HDR_LENwhich is 256.In this way, any boundary between 256 and 4K should work. I could address that with a second version.
I was referring to the code in the DMA-API that is generating the warning being broken, not the code itself. If you can tell me how you are getting to the warning it would be useful.
Anything over FM10K_RX_BUFSZ will break things. I think that is what you are missing. The driver splits a single 4K page into 2 pieces and then gives half off to the stack and uses the other half for the next receive. If you have a value over 2K you are going to be overwritting data in another buffer and/or attempting to access memory outside the DMA region. Both of which would likely cause significant issues and likely panic the system.
Quoted 18 lines · Alexander Duyck
Quoted 7 lines · Zekun Shen
Quoted 4 lines · Alexander Duyck
The upper limitation for the size should be 2K or
FM10K_RX_BUFSZ, notPAGE_SIZE. Otherwise you are still capable of going out of bounds because the offset is used within the page to push the start of the region up by 2K.
PAGE_SIZEcan drop the warning, as the dma allocated size isPAGE_SIZE.Yes, but the point I was getting at is that if you are just going to squelch the warning, but leave the code broken then the warning isn't of any use and might as well be discarded. Either you limit the value to 2K which is what the hardware is expected to max out at anyway, or you just skip the warning and assume hardware will do the right thing. I'm not even sure this patch is worth the effort if it is just using some dummy value that is still broken and simply squelches the warning.
Quoted 3 lines
Could you provide more information about how you are encountering the error? Is this something you are seeing with an actual fm10k device, or is this something found via code review or static analysis?
I did not see it on a real device. I got the warning through emulation and fuzzing, treating dma, mmio and interrupts as input vectors. My research is on the peripheral/driver boundary.
Quoted 14 lines
Quoted 9 lines
Quoted 4 lines
If this is actually fixing the warning it makes me wonder if the code performing the check is broken itself since we would still be accessing outside of the accessible DMA range.
The unbounded size is only passed to
fm10k_add_rx_frag, which expects and checks size to be less thanFM10K_RX_HDR_LENwhich is 256.In this way, any boundary between 256 and 4K should work. I could address that with a second version.
I was referring to the code in the DMA-API that is generating the warning being broken, not the code itself. If you can tell me how you are getting to the warning it would be useful.
Quoted 7 lines
Anything over
FM10K_RX_BUFSZwill break things. I think that is what you are missing. The driver splits a single 4K page into 2 pieces and then gives half off to the stack and uses the other half for the next receive. If you have a value over 2K you are going to be overwritting data in another buffer and/or attempting to access memory outside the DMA region. Both of which would likely cause significant issues and likely panic the system.
I agree. FM10K_RX_BUFSZ is the right boundary in that sense.