Received: by 2002:ac0:a5a7:0:0:0:0:0 with SMTP id m36-v6csp5177188imm; Tue, 31 Jul 2018 06:49:32 -0700 (PDT) X-Google-Smtp-Source: AAOMgpeId5MJUdACzJZ0ez8wiQkiiiR57z8dfYkUsHo8Ns7fL/eaSN+NHCvaMA68Hx07XrghCgYO X-Received: by 2002:a17:902:3a3:: with SMTP id d32-v6mr20690674pld.294.1533044972114; Tue, 31 Jul 2018 06:49:32 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1533044972; cv=none; d=google.com; s=arc-20160816; b=iaCKY6dVS/z5xshATPrLosdJ6XUOfWxLNjWG5ZNlFRXJ57Ye+tiXVLESQZLTABtWyJ aZG147BVA2qGnp7BzR0kz26FmghTRLocF9/tcmGrozRoPTKBv6E/Pt8XPDkcdEczeY1R XY1PsAVliVPiPEOO0wmqWyOUu/cP0OFE406uVbVZyTj/JhZQzFIF2PNslHazvhpfRuO8 edEDGRBKI+MD0D/htL/J1Z93LszHXq4JqBe9fewo4muWnpBvvFAhZaTZBHdl6xng7luK qA7XPzWSo/poYYDCxDzDgKv8tR6cKXFJkJiWVmzOP5PoYMyDOp6Y3WMTlEOd+Prrp2k7 q/5Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:arc-authentication-results; bh=kPRe1NpFpmRqrjqLozVp9RlS686BFxT+rn/jdFiDqDg=; b=pzYcJl+60MrnRZBrXIYT/2+3YSxTxZtGBaBChmKQgg1v0cSmzT7e9Mi9rdkzdSxh0V HTTEFEboEBYh2DwiymwhB5O0zwCe97GjuKal1Ib/HRHFTW2HOh1PFvyPhmhNT/lQfZ02 Je424Ua2J61ucf25kVAipoktR7htVaTYRBYKl/6tOwg1TiJUzXf8/y5OgTox5Lh/fh7j Y8L3t8UCYpyEvl7Us2TqMNhJ2P0n4IN/wPoQ/yf4qVL2OExbLimUAuz6yOQYPCfeUxNt MH04/xALRJiV+KiNegUk+hxom/qHad7ghcchUFfrRmQ68hZ8NiaZkbEJHwv/FpcyRcPZ rPng== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id f7-v6si12200135plt.4.2018.07.31.06.49.17; Tue, 31 Jul 2018 06:49:32 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732406AbeGaP2h (ORCPT + 99 others); Tue, 31 Jul 2018 11:28:37 -0400 Received: from mx2.suse.de ([195.135.220.15]:41914 "EHLO mx1.suse.de" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1732377AbeGaP2h (ORCPT ); Tue, 31 Jul 2018 11:28:37 -0400 X-Virus-Scanned: by amavisd-new at test-mx.suse.de Received: from relay1.suse.de (unknown [195.135.220.254]) by mx1.suse.de (Postfix) with ESMTP id 2B262AE25; Tue, 31 Jul 2018 13:48:12 +0000 (UTC) From: Johannes Thumshirn To: "Martin K . Petersen" Cc: Linux Kernel Mailinglist , Linux SCSI Mailinglist , ard , Johannes Thumshirn Subject: [PATCH 2/3] scsi: fcoe: drop frames in ELS LOGO error path Date: Tue, 31 Jul 2018 15:46:02 +0200 Message-Id: <20180731134603.20089-3-jthumshirn@suse.de> X-Mailer: git-send-email 2.16.4 In-Reply-To: <20180731134603.20089-1-jthumshirn@suse.de> References: <20180731134603.20089-1-jthumshirn@suse.de> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 --- 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