summaryrefslogtreecommitdiffstats
path: root/drivers/ntb
diff options
context:
space:
mode:
authorDave Jiang <dave.jiang@intel.com>2015-09-17 16:27:04 -0400
committerJon Mason <jdmason@kudzu.us>2015-11-08 16:11:21 -0500
commit04afde45e096201f8fd74c1db848a5d85d1aa57d (patch)
treeb26f609ea9c211e40de16c9d795edc01c38a0e3c /drivers/ntb
parent6a13feb9c82803e2b815eca72fa7a9f5561d7861 (diff)
NTB: Fix issue where we may be accessing NULL ptr
smatch detected an issue in the function ntb_transport_max_size() where we could be dereferencing a dma channel pointer when it is NULL. Reported-by: Dan Carpenter <dan.carpenter@oracle.com> Signed-off-by: Dave Jiang <dave.jiang@intel.com> Signed-off-by: Jon Mason <jdmason@kudzu.us>
Diffstat (limited to 'drivers/ntb')
-rw-r--r--drivers/ntb/ntb_transport.c17
1 files changed, 9 insertions, 8 deletions
diff --git a/drivers/ntb/ntb_transport.c b/drivers/ntb/ntb_transport.c
index 6e3ee907d186..3903dfc39975 100644
--- a/drivers/ntb/ntb_transport.c
+++ b/drivers/ntb/ntb_transport.c
@@ -1996,23 +1996,24 @@ EXPORT_SYMBOL_GPL(ntb_transport_qp_num);
1996 */ 1996 */
1997unsigned int ntb_transport_max_size(struct ntb_transport_qp *qp) 1997unsigned int ntb_transport_max_size(struct ntb_transport_qp *qp)
1998{ 1998{
1999 unsigned int max; 1999 unsigned int max_size;
2000 unsigned int copy_align; 2000 unsigned int copy_align;
2001 struct dma_chan *rx_chan, *tx_chan;
2001 2002
2002 if (!qp) 2003 if (!qp)
2003 return 0; 2004 return 0;
2004 2005
2005 if (!qp->tx_dma_chan && !qp->rx_dma_chan) 2006 rx_chan = qp->rx_dma_chan;
2006 return qp->tx_max_frame - sizeof(struct ntb_payload_header); 2007 tx_chan = qp->tx_dma_chan;
2007 2008
2008 copy_align = max(qp->tx_dma_chan->device->copy_align, 2009 copy_align = max(rx_chan ? rx_chan->device->copy_align : 0,
2009 qp->rx_dma_chan->device->copy_align); 2010 tx_chan ? tx_chan->device->copy_align : 0);
2010 2011
2011 /* If DMA engine usage is possible, try to find the max size for that */ 2012 /* If DMA engine usage is possible, try to find the max size for that */
2012 max = qp->tx_max_frame - sizeof(struct ntb_payload_header); 2013 max_size = qp->tx_max_frame - sizeof(struct ntb_payload_header);
2013 max -= max % (1 << copy_align); 2014 max_size = round_down(max_size, 1 << copy_align);
2014 2015
2015 return max; 2016 return max_size;
2016} 2017}
2017EXPORT_SYMBOL_GPL(ntb_transport_max_size); 2018EXPORT_SYMBOL_GPL(ntb_transport_max_size);
2018 2019