| From fc5b220b2dcf8b512d9bd46fd17f82257e49bf89 Mon Sep 17 00:00:00 2001 |
| From: Bart Van Assche <bvanassche@acm.org> |
| Date: Wed, 23 Oct 2019 13:21:50 -0700 |
| Subject: scsi: target: cxgbit: Fix cxgbit_fw4_ack() |
| |
| From: Bart Van Assche <bvanassche@acm.org> |
| |
| commit fc5b220b2dcf8b512d9bd46fd17f82257e49bf89 upstream. |
| |
| Use the pointer 'p' after having tested that pointer instead of before. |
| |
| Fixes: 5cadafb236df ("target/cxgbit: Fix endianness annotations") |
| Cc: Varun Prakash <varun@chelsio.com> |
| Cc: Nicholas Bellinger <nab@linux-iscsi.org> |
| Cc: <stable@vger.kernel.org> |
| Link: https://lore.kernel.org/r/20191023202150.22173-1-bvanassche@acm.org |
| Reported-by: Dan Carpenter <dan.carpenter@oracle.com> |
| Signed-off-by: Bart Van Assche <bvanassche@acm.org> |
| Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| |
| --- |
| drivers/target/iscsi/cxgbit/cxgbit_cm.c | 3 ++- |
| 1 file changed, 2 insertions(+), 1 deletion(-) |
| |
| --- a/drivers/target/iscsi/cxgbit/cxgbit_cm.c |
| +++ b/drivers/target/iscsi/cxgbit/cxgbit_cm.c |
| @@ -1831,7 +1831,7 @@ static void cxgbit_fw4_ack(struct cxgbit |
| |
| while (credits) { |
| struct sk_buff *p = cxgbit_sock_peek_wr(csk); |
| - const u32 csum = (__force u32)p->csum; |
| + u32 csum; |
| |
| if (unlikely(!p)) { |
| pr_err("csk 0x%p,%u, cr %u,%u+%u, empty.\n", |
| @@ -1840,6 +1840,7 @@ static void cxgbit_fw4_ack(struct cxgbit |
| break; |
| } |
| |
| + csum = (__force u32)p->csum; |
| if (unlikely(credits < csum)) { |
| pr_warn("csk 0x%p,%u, cr %u,%u+%u, < %u.\n", |
| csk, csk->tid, |
