NTB: Fix dereference before check

Allen Hubbe · jonmason · commit 30a4bb1e5a9d · 2015-08-09T16:32:22.000-04:00
Remove early dereference of a pointer that is checked later in the code.

Reported-by: Dan Carpenter &lt;dan.carpenter@oracle.com&gt;
Signed-off-by: Allen Hubbe &lt;Allen.Hubbe@emc.com&gt;
Signed-off-by: Jon Mason &lt;jdmason@kudzu.us&gt;
diff --git a/drivers/ntb/ntb_transport.c b/drivers/ntb/ntb_transport.c
@@ -1692,7 +1692,6 @@ EXPORT_SYMBOL_GPL(ntb_transport_create_queue);
  */
 void ntb_transport_free_queue(struct ntb_transport_qp *qp)
 {
-	struct ntb_transport_ctx *nt = qp->transport;
 	struct pci_dev *pdev;
 	struct ntb_queue_entry *entry;
 	u64 qp_bit;
@@ -1745,7 +1744,7 @@ void ntb_transport_free_queue(struct ntb_transport_qp *qp)
 	while ((entry = ntb_list_rm(&qp->ntb_tx_free_q_lock, &qp->tx_free_q)))
 		kfree(entry);
 
-	nt->qp_bitmap_free |= qp_bit;
+	qp->transport->qp_bitmap_free |= qp_bit;
 
 	dev_info(&pdev->dev, "NTB Transport QP %d freed\n", qp->qp_num);
 }

Original file line number	Diff line number	Diff line change
`@@ -1692,7 +1692,6 @@ EXPORT_SYMBOL_GPL(ntb_transport_create_queue);`
`1692`	`1692`	`*/`
`1693`	`1693`	`void ntb_transport_free_queue(struct ntb_transport_qp *qp)`
`1694`	`1694`	`{`
`1695`		`- struct ntb_transport_ctx *nt = qp->transport;`
`1696`	`1695`	`struct pci_dev *pdev;`
`1697`	`1696`	`struct ntb_queue_entry *entry;`
`1698`	`1697`	`u64 qp_bit;`
`@@ -1745,7 +1744,7 @@ void ntb_transport_free_queue(struct ntb_transport_qp *qp)`
`1745`	`1744`	`while ((entry = ntb_list_rm(&qp->ntb_tx_free_q_lock, &qp->tx_free_q)))`
`1746`	`1745`	`kfree(entry);`
`1747`	`1746`
`1748`		`- nt->qp_bitmap_free \|= qp_bit;`
	`1747`	`+ qp->transport->qp_bitmap_free \|= qp_bit;`
`1749`	`1748`
`1750`	`1749`	`dev_info(&pdev->dev, "NTB Transport QP %d freed\n", qp->qp_num);`
`1751`	`1750`	`}`