diff options
author | Johannes Thumshirn <jthumshirn@suse.de> | 2018-07-31 09:46:01 -0400 |
---|---|---|
committer | Martin K. Petersen <martin.petersen@oracle.com> | 2018-08-02 15:30:03 -0400 |
commit | 2d7d4fd35e6e15b47c13c70368da83add19f01e7 (patch) | |
tree | d5ee11e647116774edbf2cfc46182acfb3c12700 | |
parent | 15d258674b5c91b9c1ae11264624d5c0d0675e8f (diff) |
scsi: fcoe: fix use-after-free in fcoe_ctlr_els_send
KASAN reports a use-after-free in fcoe_ctlr_els_send() when we're sending a
LOGO and have FIP debugging enabled. This is because we're first freeing
the skb and then printing the frame's DID. But the DID is a member of the
FC frame header which in turn is the skb's payload.
Exchange the debug print and kfree_skb() calls so we're not touching the
freed data.
Signed-off-by: Johannes Thumshirn <jthumshirn@suse.de>
Reviewed-by: Hannes Reinecke <hare@suse.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
-rw-r--r-- | drivers/scsi/fcoe/fcoe_ctlr.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/scsi/fcoe/fcoe_ctlr.c b/drivers/scsi/fcoe/fcoe_ctlr.c index ea23c8dffc25..ceb35ebbeb8f 100644 --- a/drivers/scsi/fcoe/fcoe_ctlr.c +++ b/drivers/scsi/fcoe/fcoe_ctlr.c | |||
@@ -799,9 +799,9 @@ int fcoe_ctlr_els_send(struct fcoe_ctlr *fip, struct fc_lport *lport, | |||
799 | fip->send(fip, skb); | 799 | fip->send(fip, skb); |
800 | return -EINPROGRESS; | 800 | return -EINPROGRESS; |
801 | drop: | 801 | drop: |
802 | kfree_skb(skb); | ||
803 | LIBFCOE_FIP_DBG(fip, "drop els_send op %u d_id %x\n", | 802 | LIBFCOE_FIP_DBG(fip, "drop els_send op %u d_id %x\n", |
804 | op, ntoh24(fh->fh_d_id)); | 803 | op, ntoh24(fh->fh_d_id)); |
804 | kfree_skb(skb); | ||
805 | return -EINVAL; | 805 | return -EINVAL; |
806 | } | 806 | } |
807 | EXPORT_SYMBOL(fcoe_ctlr_els_send); | 807 | EXPORT_SYMBOL(fcoe_ctlr_els_send); |