Received: by 10.223.176.5 with SMTP id f5csp1420365wra; Fri, 9 Feb 2018 19:51:18 -0800 (PST) X-Google-Smtp-Source: AH8x224clKgox1A/QFPekE/QqKIGurm1GWk7Gwa5WLbMmZpj8N4YSVCY996Nd1lfqf4tN+JD1MTM X-Received: by 2002:a17:902:6b89:: with SMTP id p9-v6mr4537365plk.377.1518234678077; Fri, 09 Feb 2018 19:51:18 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1518234678; cv=none; d=google.com; s=arc-20160816; b=xkaOKzZyONLzF1HdV4LYiamcqI9Rg+lxGA7EYQj66fmjTrq3oF7NLJ4v6EqqRlHUXT vnq2NdCPfs/9GwGlLIVH8NSZv6A74zggTpII3A9s1acGJDXdqz0vIJDP7BjQrBuCMtRS MheIQcXM7trUcZ6KDoWtiKrnIQxQAE6w6Z5zTleCqPMDTis2wf3/tQoUYSPMJjPXeErQ 4K3eRvpBhhsmEkCCSe8WmzcNeaZ8LnZ0Cw4B0POMAX0C64kpIyASi5Hoz88SpfnqwNNh yaUwEEE0b2VeiSMvlJ2RjNnNsTEgSLUaANij5HdG3o/aYaHFV3aXDQWF+HObBZ4PhEWK W/Vg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:message-id:date:subject:cc:to:from :arc-authentication-results; bh=JnYFE0JZxqifzsXMqgUH0YSjorWhttpFyrVTEkfgPZk=; b=fH4bAx/+Juo1YQTOZUKG/ROkUKmPHchMDkXAuf3BGcyOOWaF0fUeoKVGwc8zTifWw/ DU4afEp2BSdbI5n3P4HYk+yaIcBYN6c351JVO/qm5IwnpGTkCuB6Zs5vpzMVvso5Eibw L92KtEofQcJkTHjqwjgizJpgxleY9Lok1Jse5oYc6VRSjxkhPKbr7BUSFH9Q5UFHySGr 4Sm+uggx0SglBrwLFLMfNw+xP+Hg6rncC4ueOKpnU5oKqJAlFtcrIuGh0ivCTOOW+NaP FWDKIIIf5jal1m3QAm+zqeUs7cWayXIloxBjNM/q9x2brGkF2b03jWV8XCsxoix6TnVN irMg== 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; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=ibm.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id e4-v6si2499750pln.655.2018.02.09.19.51.01; Fri, 09 Feb 2018 19:51:18 -0800 (PST) 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; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=ibm.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751029AbeBJDtg (ORCPT + 99 others); Fri, 9 Feb 2018 22:49:36 -0500 Received: from mx0b-001b2d01.pphosted.com ([148.163.158.5]:60808 "EHLO mx0a-001b2d01.pphosted.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1750832AbeBJDte (ORCPT ); Fri, 9 Feb 2018 22:49:34 -0500 Received: from pps.filterd (m0098413.ppops.net [127.0.0.1]) by mx0b-001b2d01.pphosted.com (8.16.0.22/8.16.0.22) with SMTP id w1A3mhWH134318 for ; Fri, 9 Feb 2018 22:49:34 -0500 Received: from e19.ny.us.ibm.com (e19.ny.us.ibm.com [129.33.205.209]) by mx0b-001b2d01.pphosted.com with ESMTP id 2g1gtpqbae-1 (version=TLSv1.2 cipher=AES256-SHA bits=256 verify=NOT) for ; Fri, 09 Feb 2018 22:49:34 -0500 Received: from localhost by e19.ny.us.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Fri, 9 Feb 2018 22:49:33 -0500 Received: from b01cxnp22036.gho.pok.ibm.com (9.57.198.26) by e19.ny.us.ibm.com (146.89.104.206) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Fri, 9 Feb 2018 22:49:29 -0500 Received: from b01ledav005.gho.pok.ibm.com (b01ledav005.gho.pok.ibm.com [9.57.199.110]) by b01cxnp22036.gho.pok.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id w1A3nT2d47644674; Sat, 10 Feb 2018 03:49:29 GMT Received: from b01ledav005.gho.pok.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 30F88AE03C; Fri, 9 Feb 2018 22:50:49 -0500 (EST) Received: from suka-w540.usor.ibm.com (unknown [9.70.94.25]) by b01ledav005.gho.pok.ibm.com (Postfix) with ESMTP id 8555FAE034; Fri, 9 Feb 2018 22:50:48 -0500 (EST) From: Sukadev Bhattiprolu To: Michael Ellerman Cc: Benjamin Herrenschmidt , mikey@neuling.org, hbabu@us.ibm.com, linuxppc-dev@ozlabs.org, Subject: [PATCH RESEND 1/4] powerpc/vas: Fix order of cleanup in debugfs dir Date: Fri, 9 Feb 2018 19:49:24 -0800 X-Mailer: git-send-email 2.7.4 X-TM-AS-GCONF: 00 x-cbid: 18021003-0056-0000-0000-000004188E93 X-IBM-SpamModules-Scores: X-IBM-SpamModules-Versions: BY=3.00008507; HX=3.00000241; KW=3.00000007; PH=3.00000004; SC=3.00000251; SDB=6.00987497; UDB=6.00501244; IPR=6.00766855; BA=6.00005821; NDR=6.00000001; ZLA=6.00000005; ZF=6.00000009; ZB=6.00000000; ZP=6.00000000; ZH=6.00000000; ZU=6.00000002; MB=3.00019472; XFM=3.00000015; UTC=2018-02-10 03:49:31 X-IBM-AV-DETECTION: SAVI=unused REMOTE=unused XFE=unused x-cbparentid: 18021003-0057-0000-0000-000008500112 Message-Id: <1518234567-24869-1-git-send-email-sukadev@linux.vnet.ibm.com> X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10432:,, definitions=2018-02-10_01:,, signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 priorityscore=1501 malwarescore=0 suspectscore=2 phishscore=0 bulkscore=0 spamscore=0 clxscore=1011 lowpriorityscore=0 impostorscore=0 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1709140000 definitions=main-1802100047 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Fix the order of cleanup to ensure we free the name buffer in case of an error creating 'hvwc' or 'info' files. Signed-off-by: Sukadev Bhattiprolu --- arch/powerpc/platforms/powernv/vas-debug.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/arch/powerpc/platforms/powernv/vas-debug.c b/arch/powerpc/platforms/powernv/vas-debug.c index ca22f1e..b4de4c6 100644 --- a/arch/powerpc/platforms/powernv/vas-debug.c +++ b/arch/powerpc/platforms/powernv/vas-debug.c @@ -166,13 +166,13 @@ void vas_window_init_dbgdir(struct vas_window *window) return; -free_name: - kfree(window->dbgname); - window->dbgname = NULL; - remove_dir: debugfs_remove_recursive(window->dbgdir); window->dbgdir = NULL; + +free_name: + kfree(window->dbgname); + window->dbgname = NULL; } void vas_instance_init_dbgdir(struct vas_instance *vinst) -- 2.7.4