From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.0 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE, SPF_PASS,T_DKIMWL_WL_HIGH,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id ED49EC28EBD for ; Sun, 9 Jun 2019 17:08:47 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id BA185205F4 for ; Sun, 9 Jun 2019 17:08:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1560100127; bh=CGsfm0pjwW+BoITzq0cXBgUjb7RKs9sosgFqZJdzihk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=f9JcwkhOIxqXmkFcyq68BRxD5oRcy36qUF6bTotFN+NGuTVkIDv/5BsR9PbTJDfNp 05L6ihj5FnTilaSWYFUB6ytlOEzayPu7NfpL1XqKZYR7qhsk18BqaAPsJl+3Qb/xFB bvBIvj8sW+JMv4g8pb8Oq8dfWZMRyvZy3B9L6xs0= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2388288AbfFIRE5 (ORCPT ); Sun, 9 Jun 2019 13:04:57 -0400 Received: from mail.kernel.org ([198.145.29.99]:43882 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2388722AbfFIREx (ORCPT ); Sun, 9 Jun 2019 13:04:53 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 6957A204EC; Sun, 9 Jun 2019 17:04:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1560099892; bh=CGsfm0pjwW+BoITzq0cXBgUjb7RKs9sosgFqZJdzihk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=1GLMtMUQdn/4KKGWICaNIm5caJPe93pOQOa6lb5bPTChtdVySnuRH5RpHo38GtVJG QT63pDc2VgeWSS03VHvkZvAXB+9bJQ1wUYIapUS8GNEodo0jlaYgEQwNVSNLs8sdcN s8lWZDoAO5LIFACIC7ubnJUjDtKC2wZWxk3CdN64= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Steffen Maier , Jens Remus , Benjamin Block , "Martin K. Petersen" Subject: [PATCH 4.4 204/241] scsi: zfcp: fix missing zfcp_port reference put on -EBUSY from port_remove Date: Sun, 9 Jun 2019 18:42:26 +0200 Message-Id: <20190609164154.482235314@linuxfoundation.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190609164147.729157653@linuxfoundation.org> References: <20190609164147.729157653@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Steffen Maier commit d27e5e07f9c49bf2a6a4ef254ce531c1b4fb5a38 upstream. With this early return due to zfcp_unit child(ren), we don't use the zfcp_port reference from the earlier zfcp_get_port_by_wwpn() anymore and need to put it. Signed-off-by: Steffen Maier Fixes: d99b601b6338 ("[SCSI] zfcp: restore refcount check on port_remove") Cc: #3.7+ Reviewed-by: Jens Remus Reviewed-by: Benjamin Block Signed-off-by: Martin K. Petersen Signed-off-by: Greg Kroah-Hartman --- drivers/s390/scsi/zfcp_sysfs.c | 1 + 1 file changed, 1 insertion(+) --- a/drivers/s390/scsi/zfcp_sysfs.c +++ b/drivers/s390/scsi/zfcp_sysfs.c @@ -263,6 +263,7 @@ static ssize_t zfcp_sysfs_port_remove_st if (atomic_read(&port->units) > 0) { retval = -EBUSY; mutex_unlock(&zfcp_sysfs_port_units_mutex); + put_device(&port->dev); /* undo zfcp_get_port_by_wwpn() */ goto out; } /* port is about to be removed, so no more unit_add */