ixgbe: Don't allow user buffer count to exceed 256
Subsystems (2)
PATCH 1/1 ixgbe: Don't allow user buffer count to exceed 256
From: Robert Love <[email protected]>
If the user buffer count was 256 the shift would place a 1 in the offset region leading to errors. It also overwrites the uers buffer list. This patch makes sure that at most 256 user buffers are allowed for DDP and the buffer count is masked properly such that it doesn't overwrite the offset when shifting the bits.
---
drivers/net/ixgbe/ixgbe_fcoe.c | 18 ++++++++++-------- 1 files changed, 10 insertions(+), 8 deletions(-)
drivers/net/ixgbe/ixgbe_fcoe.c +10 -8
@@ -202,6 +202,15 @@ int ixgbe_fcoe_ddp_get(struct net_device *netdev, u16 xid, addr =sg_dma_address (sg); len =sg_dma_len (sg);while (len) { +/* max number of buffers allowed in one DDP context */ +if (j >=IXGBE_BUFFCNT_MAX ) { +netif_err (adapter, drv, adapter->netdev, +"xid=%x:%d,%d,%d:addr=%llx " +"not enough descriptors\n" , + xid, i, j, dmacount, (u64 )addr); + goto out_noddp_free; + } +/* get the offset of length of current buffer */ thisoff = addr & ((dma_addr_t )bufflen -1 ); thislen =min ((bufflen - thisoff), len);
@@ -227,20 +236,13 @@ int ixgbe_fcoe_ddp_get(struct net_device *netdev, u16 xid, len -= thislen; addr += thislen; j++; -/* max number of buffers allowed in one DDP context */ -if (j >IXGBE_BUFFCNT_MAX ) { -DPRINTK (DRV ,ERR ,"xid=%x:%d,%d,%d:addr=%llx " -"not enough descriptors\n" , - xid, i, j, dmacount, (u64 )addr); - goto out_noddp_free; - } } }/* only the last buffer may have non-full bufflen */ lastsize = thisoff + thislen; fcbuff = (IXGBE_FCBUFF_4KB <<IXGBE_FCBUFF_BUFFSIZE_SHIFT ); - fcbuff |= (j <<IXGBE_FCBUFF_BUFFCNT_SHIFT ); + fcbuff |= ((j &0xff ) <<IXGBE_FCBUFF_BUFFCNT_SHIFT ); fcbuff |= (firstoff <<IXGBE_FCBUFF_OFFSET_SHIFT ); fcbuff |= (IXGBE_FCBUFF_VALID );
From: Jeff Kirsher <[email protected]>
Date: Wed, 24 Mar 2010 13:02:04 -0700
Quoted 9 lines
From: Robert Love <[email protected]>
If the user buffer count was 256 the shift would place a 1 in the offset region leading to errors. It also overwrites the uers buffer list. This patch makes sure that at most 256 user buffers are allowed for DDP and the buffer count is masked properly such that it doesn't overwrite the offset when shifting the bits.
Quoted 4 lines
Signed-off-by Robert Love <[email protected]>Signed-off-by Yi Zou <[email protected]>Signed-off-by Frank Zhang <[email protected]>Signed-off-by Jeff Kirsher <[email protected]>
Applied.