kpriv/linux-hardened
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

[IB] mthca: fix wraparound handling in mthca_cq_clean()

Browse source 
Handle case where prod_index has wrapped around and become less than
cq->cons_index by checking that their difference as a signed int is
positive rather than comparing directly.

Signed-off-by: Roland Dreier <rolandd@cisco.com>
This commit is contained in:
Roland Dreier 2005-11-09 12:23:17 -08:00
parent 62abb8416f
commit 64044bcf75
1 changed files with 6 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
drivers/infiniband/hw/mthca/mthca_cq.c
View file

@ -258,7 +258,7 @@ void mthca_cq_clean(struct mthca_dev *dev, u32 cqn, u32 qpn,
{ {
struct mthca_cq *cq; struct mthca_cq *cq;
struct mthca_cqe *cqe; struct mthca_cqe *cqe;
int prod_index; u32 prod_index;
int nfreed = 0; int nfreed = 0;
spin_lock_irq(&dev->cq_table.lock); spin_lock_irq(&dev->cq_table.lock);
@ -293,19 +293,15 @@ void mthca_cq_clean(struct mthca_dev *dev, u32 cqn, u32 qpn,
* Now sweep backwards through the CQ, removing CQ entries * Now sweep backwards through the CQ, removing CQ entries
* that match our QP by copying older entries on top of them. * that match our QP by copying older entries on top of them.
*/ */
while (prod_index > cq->cons_index) { while ((int) --prod_index - (int) cq->cons_index >= 0) {
cqe = get_cqe(cq, (prod_index - 1) & cq->ibcq.cqe); cqe = get_cqe(cq, prod_index & cq->ibcq.cqe);
if (cqe->my_qpn == cpu_to_be32(qpn)) { if (cqe->my_qpn == cpu_to_be32(qpn)) {
if (srq) if (srq)
mthca_free_srq_wqe(srq, be32_to_cpu(cqe->wqe)); mthca_free_srq_wqe(srq, be32_to_cpu(cqe->wqe));
++nfreed; ++nfreed;
} } else if (nfreed)
else if (nfreed) memcpy(get_cqe(cq, (prod_index + nfreed) & cq->ibcq.cqe),
memcpy(get_cqe(cq, (prod_index - 1 + nfreed) & cqe, MTHCA_CQ_ENTRY_SIZE);
cq->ibcq.cqe),
cqe,
MTHCA_CQ_ENTRY_SIZE);
--prod_index;
} }
if (nfreed) { if (nfreed) {