From: Johannes Thumshirn <jthumshirn@suse.de>
To: "Martin K . Petersen" <martin.petersen@oracle.com>
Cc: Linux Kernel Mailinglist <linux-kernel@vger.kernel.org>,
Linux SCSI Mailinglist <linux-scsi@vger.kernel.org>,
ard <ard@kwaak.net>, Johannes Thumshirn <jthumshirn@suse.de>
Subject: [PATCH 2/3] scsi: fcoe: drop frames in ELS LOGO error path
Date: Tue, 31 Jul 2018 15:46:02 +0200 [thread overview]
Message-ID: <20180731134603.20089-3-jthumshirn@suse.de> (raw)
In-Reply-To: <20180731134603.20089-1-jthumshirn@suse.de>
Drop the frames in the ELS LOGO error path instead of just returning
an error.
This fixes the following kmemleak report:
unreferenced object 0xffff880064cb1000 (size 424):
comm "kworker/0:2", pid 24, jiffies 4294904293 (age 68.504s)
hex dump (first 32 bytes):
00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................
00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................
backtrace:
[<(____ptrval____)>] _fc_frame_alloc+0x2c/0x180 [libfc]
[<(____ptrval____)>] fc_lport_enter_logo+0x106/0x360 [libfc]
[<(____ptrval____)>] fc_fabric_logoff+0x8c/0xc0 [libfc]
[<(____ptrval____)>] fcoe_if_destroy+0x79/0x3b0 [fcoe]
[<(____ptrval____)>] fcoe_destroy_work+0xd2/0x170 [fcoe]
[<(____ptrval____)>] process_one_work+0x7ff/0x1420
[<(____ptrval____)>] worker_thread+0x87/0xef0
[<(____ptrval____)>] kthread+0x2db/0x390
[<(____ptrval____)>] ret_from_fork+0x35/0x40
[<(____ptrval____)>] 0xffffffffffffffff
which can be triggered by issuing
echo eth0 > /sys/bus/fcoe/ctlr_destroy
Signed-off-by: Johannes Thumshirn <jthumshirn@suse.de>
---
drivers/scsi/fcoe/fcoe_ctlr.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/scsi/fcoe/fcoe_ctlr.c b/drivers/scsi/fcoe/fcoe_ctlr.c
index ceb35ebbeb8f..ffec695e0bfb 100644
--- a/drivers/scsi/fcoe/fcoe_ctlr.c
+++ b/drivers/scsi/fcoe/fcoe_ctlr.c
@@ -754,9 +754,9 @@ int fcoe_ctlr_els_send(struct fcoe_ctlr *fip, struct fc_lport *lport,
case ELS_LOGO:
if (fip->mode == FIP_MODE_VN2VN) {
if (fip->state != FIP_ST_VNMP_UP)
- return -EINVAL;
+ goto drop;
if (ntoh24(fh->fh_d_id) == FC_FID_FLOGI)
- return -EINVAL;
+ goto drop;
} else {
if (fip->state != FIP_ST_ENABLED)
return 0;
--
2.16.4
next prev parent reply other threads:[~2018-07-31 13:48 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-07-31 13:46 [PATCH 0/3] scsi: fcoe: memleak fixes Johannes Thumshirn
2018-07-31 13:46 ` [PATCH 1/3] fcoe: fix use-after-free in fcoe_ctlr_els_send Johannes Thumshirn
2018-08-01 6:30 ` Hannes Reinecke
2018-07-31 13:46 ` Johannes Thumshirn [this message]
2018-08-01 6:30 ` [PATCH 2/3] scsi: fcoe: drop frames in ELS LOGO error path Hannes Reinecke
2018-07-31 13:46 ` [PATCH 3/3] scsi: fcoe: clear FC_RP_STARTED flags when receiving a LOGO Johannes Thumshirn
2018-08-01 6:31 ` Hannes Reinecke
2018-08-06 9:25 ` [PATCH 0/3] scsi: fcoe: memleak fixes Johannes Thumshirn
2018-08-06 13:22 ` ard
2018-08-06 13:27 ` Johannes Thumshirn
2018-08-06 14:24 ` ard
2018-08-07 6:54 ` Johannes Thumshirn
2018-08-07 9:26 ` ard
2018-08-07 9:57 ` ard
2018-08-07 16:04 ` ard
2018-08-09 10:01 ` ard
2018-08-09 8:05 ` Johannes Thumshirn
2018-08-09 9:52 ` Martin K. Petersen
2018-08-09 9:56 ` Johannes Thumshirn
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180731134603.20089-3-jthumshirn@suse.de \
--to=jthumshirn@suse.de \
--cc=ard@kwaak.net \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-scsi@vger.kernel.org \
--cc=martin.petersen@oracle.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).