From patchwork Tue Nov 1 15:26:03 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Johan Hovold X-Patchwork-Id: 689973 Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3t7b3t07sXz9t2N for ; Wed, 2 Nov 2016 02:38:34 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b=d+BQsolF; dkim-atps=neutral Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) by lists.ozlabs.org (Postfix) with ESMTP id 3t7b3s6CfGzDvHb for ; Wed, 2 Nov 2016 02:38:33 +1100 (AEDT) Authentication-Results: lists.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b=d+BQsolF; dkim-atps=neutral X-Original-To: linuxppc-dev@lists.ozlabs.org Delivered-To: linuxppc-dev@lists.ozlabs.org Received: from mail-lf0-x244.google.com (mail-lf0-x244.google.com [IPv6:2a00:1450:4010:c07::244]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 3t7Zp42JMNzDvHX for ; Wed, 2 Nov 2016 02:26:36 +1100 (AEDT) Authentication-Results: lists.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b=d+BQsolF; dkim-atps=neutral Received: by mail-lf0-x244.google.com with SMTP id p100so4603354lfg.2 for ; Tue, 01 Nov 2016 08:26:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=WihSVdbtnlm0Gs5wahlRUW8D9f/nM5mRpLM8fXXD1aQ=; b=d+BQsolFS1Kn9CBdOeoB/2xh73eLICLlY3QWDJ6aiUxGrZgALas8yf+WEZbiJV6scH CJdC62fkBNi9vsW5XP9PkjVpXrGfS9GnE23BP11FuHAWLwcIvwwRnIzlZWiU9r8tmn3D khEkMGFK7ab2CrYXpTHp50cMIo+pOlyyYqxWY05ZBnigFf94oDcmsDaM/yzyP6ATpPCI wgPiVg8zOjLe4ZYrLoSuHVX1XafblZ1TlJVaPkBiie6lw38aQwds6vJC1G11D/eTDvi1 hS9iFCe4JA15Z37V1f+CPmRw4yZbmUzdE5XaJ7aXJKMGzZ3TmjLdEHwR9spS0oIbWT/F yLcg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=WihSVdbtnlm0Gs5wahlRUW8D9f/nM5mRpLM8fXXD1aQ=; b=RC58ykRde+XOrnBYarVYjK89deJDSEd+eSf/styQccMvsjb7dfc7WChOqo5Wb6tBUk wGT81iyEpQFU9uLTsoyldAmN5j9i8xgtf/CkFydiYwVad00ZNtcJBEigLspijNepcrtL wcX9LiShpmsTl7SAy8IdyQLwgNETJuMo1Aa+zSQOd9ytdNdEFMAlAT1Q5UM43XhQpkpX fl3htAmEq+rf9jRiOP/YzUWLzqzu3QKxS4iZxklZFyiU7+oESAS9oQ/9X85uXIhU9Db9 e5rMOTCJ/uIyK2veAR/X8zNjNGi8uIoljbTMoKjwGUdpjiy7Ic69wNknfun6HuaGY/BF AieQ== X-Gm-Message-State: ABUngvd9taf+WA8OJAci/9Usx4fuNPm/03h4SMuF2f+uzdiBuYFe9tWiK2Qk6EvMpI5g8Q== X-Received: by 10.25.198.16 with SMTP id w16mr1919581lff.44.1478013992366; Tue, 01 Nov 2016 08:26:32 -0700 (PDT) Received: from xi.terra (c-04aadb54.07-184-6d6c6d4.cust.bredbandsbolaget.se. [84.219.170.4]) by smtp.gmail.com with ESMTPSA id 127sm3289548ljf.27.2016.11.01.08.26.31 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 01 Nov 2016 08:26:31 -0700 (PDT) Received: from johan by xi.terra with local (Exim 4.87) (envelope-from ) id 1c1axL-0007Ww-9U; Tue, 01 Nov 2016 16:26:31 +0100 From: Johan Hovold To: Benjamin Herrenschmidt , Paul Mackerras , Michael Ellerman Subject: [PATCH 4/4] powerpc/pci: fix device reference leaks Date: Tue, 1 Nov 2016 16:26:03 +0100 Message-Id: <1478013963-28871-4-git-send-email-johan@kernel.org> X-Mailer: git-send-email 2.7.3 In-Reply-To: <1478013963-28871-1-git-send-email-johan@kernel.org> References: <1478013963-28871-1-git-send-email-johan@kernel.org> X-Mailman-Approved-At: Wed, 02 Nov 2016 02:33:49 +1100 X-BeenThere: linuxppc-dev@lists.ozlabs.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: linuxppc-dev@lists.ozlabs.org, Johan Hovold Errors-To: linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org Sender: "Linuxppc-dev" Make sure to drop any device reference taken by vio_find_node() when adding and removing virtual I/O slots. Fixes: 5eeb8c63a38f ("[PATCH] PCI Hotplug: rpaphp: Move VIO...") Signed-off-by: Johan Hovold --- drivers/pci/hotplug/rpadlpar_core.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/drivers/pci/hotplug/rpadlpar_core.c b/drivers/pci/hotplug/rpadlpar_core.c index dc67f39779ec..c614ff7c3bc3 100644 --- a/drivers/pci/hotplug/rpadlpar_core.c +++ b/drivers/pci/hotplug/rpadlpar_core.c @@ -257,8 +257,13 @@ static int dlpar_add_phb(char *drc_name, struct device_node *dn) static int dlpar_add_vio_slot(char *drc_name, struct device_node *dn) { - if (vio_find_node(dn)) + struct vio_dev *vio_dev; + + vio_dev = vio_find_node(dn); + if (vio_dev) { + put_device(&vio_dev->dev); return -EINVAL; + } if (!vio_register_device_node(dn)) { printk(KERN_ERR @@ -334,6 +339,9 @@ static int dlpar_remove_vio_slot(char *drc_name, struct device_node *dn) return -EINVAL; vio_unregister_device(vio_dev); + + put_device(&vio_dev->dev); + return 0; }