From patchwork Wed Mar 1 13:47:55 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mikko Perttunen X-Patchwork-Id: 62902 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp3648055wrd; Wed, 1 Mar 2023 06:04:32 -0800 (PST) X-Google-Smtp-Source: AK7set8C3fU8vJOHtbIxWmvqixT+HNE3RP7HTnKkJqTXDicp/p503giWK00NPSrP1oX8R49tFdfk X-Received: by 2002:a05:6a21:3399:b0:b0:3329:c395 with SMTP id yy25-20020a056a21339900b000b03329c395mr6937476pzb.30.1677679472614; Wed, 01 Mar 2023 06:04:32 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1677679472; cv=none; d=google.com; s=arc-20160816; b=MJAYlBk3LWmk7kKqmfGpE5EpDb9eCxmuvElm9Srenkv3RpBc8WRM0veChTZbn2sced k2ozBf6PCO1p7/cjdvv8jlh7c6qjduak76WUBgmqA0FpthARFUK4ZhA/qUh83WZ2hllO 322Lv5a8xj2q8hsQbABHupSWHpZ59LxkAy3h1QIGCWQAtSMXzPWiCwzkS11ndr4SZKpl L6dF4ygMnS8m3w0pDVb8s/s+IKHRu3WRo+vPuQPt3PYwTHhv64HU2af4hnCzwtBxwjOV 8hjOWDWkA//PQ/iDUzzbjSTWyWdvedgIryzrmJgvzUvN+8DE8YpMjhhyhqHFST1v7/U2 J78g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from:dkim-signature; bh=iXxQGSxv4hSb0jR/Gu5QY74yz6G5/W/SnN5dKKpvlGk=; b=JgQq9436INV5xGVpguqjw0oklqS2bzDBHq5cYIuZVXIfV+NAltLbwc/7CfiAMOh0iI UnXNTlOnUb5kYlyUg3729EcRiH8/8AHcKykEvdlyI+DhsSqxEa7wzBoqxTUV9qNFvmt5 zn3Yx87G6NcAYZIjfPHJJB2v48Q1LzuZOXeDAzIHs1MowbkFKcTZCLC4au8cNWYnAHUr 3Lq+eJA9z3xnCZZ/A+RKTuRmAHyTFVDrlfWB7aLCkAG8FNRIe9FeSsfjYo010dgC9q4L kecNERr63rbbwOoZg/esrkLQo1mJ3g1CEWb2br8b+nhpC2SOCv+o6pY+zd9EqRfcFyIP 8pwA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@kapsi.fi header.s=20161220 header.b=AgYILYsV; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=kapsi.fi Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id z20-20020aa79494000000b005a68d1461aesi12178945pfk.293.2023.03.01.06.04.09; Wed, 01 Mar 2023 06:04:32 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=fail header.i=@kapsi.fi header.s=20161220 header.b=AgYILYsV; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=kapsi.fi Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229912AbjCANsN (ORCPT + 99 others); Wed, 1 Mar 2023 08:48:13 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39928 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229572AbjCANsK (ORCPT ); Wed, 1 Mar 2023 08:48:10 -0500 Received: from mail.kapsi.fi (mail.kapsi.fi [IPv6:2001:67c:1be8::25]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 93B1ACA32; Wed, 1 Mar 2023 05:48:09 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=kapsi.fi; s=20161220; h=Content-Transfer-Encoding:MIME-Version:Message-Id:Date:Subject: Cc:To:From:Sender:Reply-To:Content-Type:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: In-Reply-To:References:List-Id:List-Help:List-Unsubscribe:List-Subscribe: List-Post:List-Owner:List-Archive; bh=iXxQGSxv4hSb0jR/Gu5QY74yz6G5/W/SnN5dKKpvlGk=; b=AgYILYsVpk2HPSQXJRfhwhBacb d29RWYsFztUHNOx/RZE7My2WcL7cQ+qR4kRkumYGL+V4SAADM7pH5qSIrLg+XZyiViLuOvaL73G1V 0AGWw5y9IKKmZaT4FyydObOyYN/tughaxOcpUlaHy94HYeZVPC15tu7SrVjRhDv/okrcZfzycJc6R RDcngSNWzhHt8cjMeo1+HKDA6U8XLje74+qudrcFD0iTl+wEAEJ779SzbndB5PFqozvgSmDoyhnaM +gnchBmWPzuZFZ0AltAP5iy+Biq/KnDb24pNiHvUTdfKMPMNVpyvPFD+Ab0vY0vE/8sCOyIFTNkvp rII3OZig==; Received: from 91-158-25-70.elisa-laajakaista.fi ([91.158.25.70] helo=toshino.localdomain) by mail.kapsi.fi with esmtpsa (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1pXMoQ-00Dvjx-K0; Wed, 01 Mar 2023 15:48:06 +0200 From: Mikko Perttunen To: Thierry Reding , Jonathan Hunter Cc: Mikko Perttunen , linux-tegra@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 1/2] firmware: tegra: bpmp: Fix error paths in debugfs Date: Wed, 1 Mar 2023 15:47:55 +0200 Message-Id: <20230301134756.999169-1-cyndis@kapsi.fi> X-Mailer: git-send-email 2.39.2 MIME-Version: 1.0 X-SA-Exim-Connect-IP: 91.158.25.70 X-SA-Exim-Mail-From: cyndis@kapsi.fi X-SA-Exim-Scanned: No (on mail.kapsi.fi); SAEximRunCond expanded to false X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1759174430307242233?= X-GMAIL-MSGID: =?utf-8?q?1759174430307242233?= From: Mikko Perttunen Some error paths in mrq_debug_read and bpmp_debug_show would overwrite the return error code with a subsequent call to mrq_debug_close. Change the code to only change the error code if there was no prior error. Signed-off-by: Mikko Perttunen --- drivers/firmware/tegra/bpmp-debugfs.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/drivers/firmware/tegra/bpmp-debugfs.c b/drivers/firmware/tegra/bpmp-debugfs.c index 3ca2b5d9e66f..6dfe3d34109e 100644 --- a/drivers/firmware/tegra/bpmp-debugfs.c +++ b/drivers/firmware/tegra/bpmp-debugfs.c @@ -193,7 +193,7 @@ static int mrq_debug_read(struct tegra_bpmp *bpmp, const char *name, }, }; u32 fd = 0, len = 0; - int remaining, err; + int remaining, err, close_err; mutex_lock(&bpmp_debug_lock); err = mrq_debug_open(bpmp, name, &fd, &len, 0); @@ -231,7 +231,9 @@ static int mrq_debug_read(struct tegra_bpmp *bpmp, const char *name, *nbytes = len; close: - err = mrq_debug_close(bpmp, fd); + close_err = mrq_debug_close(bpmp, fd); + if (!err) + err = close_err; out: mutex_unlock(&bpmp_debug_lock); return err; @@ -319,7 +321,7 @@ static int bpmp_debug_show(struct seq_file *m, void *p) }, }; u32 fd = 0, len = 0; - int remaining, err; + int remaining, err, close_err; filename = get_filename(bpmp, file, fnamebuf, sizeof(fnamebuf)); if (!filename) @@ -353,7 +355,9 @@ static int bpmp_debug_show(struct seq_file *m, void *p) } close: - err = mrq_debug_close(bpmp, fd); + close_err = mrq_debug_close(bpmp, fd); + if (!err) + err = close_err; out: mutex_unlock(&bpmp_debug_lock); return err; From patchwork Wed Mar 1 13:47:56 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mikko Perttunen X-Patchwork-Id: 62901 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp3645815wrd; Wed, 1 Mar 2023 06:01:32 -0800 (PST) X-Google-Smtp-Source: AK7set/weVUQGW7LN7BUzuNuD3xo+ALY911Y1T7DmIx4GVuM1F3Y7c+bxLNr+pBuWXVQede+oRTj X-Received: by 2002:a17:90a:190:b0:234:19a1:8690 with SMTP id 16-20020a17090a019000b0023419a18690mr7490809pjc.26.1677679291556; Wed, 01 Mar 2023 06:01:31 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1677679291; cv=none; d=google.com; s=arc-20160816; b=yhCoxkisLWeboyNDvlHvR4itFvbNj+40UasAHvvIGmTzDULQ3p34cg8X+Nd2yyk4BE WDhYLu3YPpCaf4TgZxnfPUyvTun5OB/lmy0eIn5UV8QxRozu6yqj2w3QBuwGNrnd6TTM OXPYuyb8hSiZkKtvwreMp0Ke85NUNgYjrtbNPdbyWpqO5TFQvs7DxULINO10G6sEznt9 Pmav+ZK+iONOfWakw5cvwSifxnmDiMEThID/ltDLXPf7bFMPHtnGT57uGV7iVq7BhVdd XylHEdHpCfDl68hyFsq/QHpzbqDb4S8hXxSufAmSQFdsq9V2YGlpNClsc74TfwHJqmpg 8AhQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=Kd+nymaq2tPM+K80HnMXKwoP04WoIX8FOTWHoWNUJg8=; b=WuSVDbKPyvdIuyZvVsIKTm0vvuWxbtNNKTDRBEpCWRE37Br1ISSvegIYNpSiCIyFJz 5Usns94a9uOHFvVtVX1UO0sWPlFr1Z9KAJ7kzDuWJzog2B0mI5rfZrwt0+yiRpiZpCWA m7RuIk85Ku+y6bXc8mLZyYZwkT8ysIY9yeO8rmuGzlmiQO+aYtk59iz2Dg8L/XUR+qL8 m8dnlO5S9cLRufqflPkeo0QkR2+QMHvD7xr90sd4W6KimQrcycmXTMqoeNGt1cyTpe9/ nMxAnhB+Cqjtw/yTGrH0MGr9M7iK3kqEZOS3fsleEmvso8qdtYWpllySWQ52qIfXQrt9 8nRQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@kapsi.fi header.s=20161220 header.b="z+VMdF4/"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=kapsi.fi Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id h8-20020a17090a9c0800b0023676bd55d1si13348620pjp.94.2023.03.01.06.01.09; Wed, 01 Mar 2023 06:01:31 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=fail header.i=@kapsi.fi header.s=20161220 header.b="z+VMdF4/"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=kapsi.fi Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229862AbjCANsM (ORCPT + 99 others); Wed, 1 Mar 2023 08:48:12 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39930 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229518AbjCANsK (ORCPT ); Wed, 1 Mar 2023 08:48:10 -0500 Received: from mail.kapsi.fi (mail.kapsi.fi [IPv6:2001:67c:1be8::25]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 93B8FCC2A; Wed, 1 Mar 2023 05:48:09 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=kapsi.fi; s=20161220; h=Content-Transfer-Encoding:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To:Content-Type:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Id:List-Help:List-Unsubscribe:List-Subscribe: List-Post:List-Owner:List-Archive; bh=Kd+nymaq2tPM+K80HnMXKwoP04WoIX8FOTWHoWNUJg8=; b=z+VMdF4/cpEtwZTVo9sHtzTRwf cvxdF6MCFRAkiDP6qMSnlHEPUG4Zb21Wuzbnqrx1uA8W/efKbmiP6LfIIiebdLOsoEtq+eGLG9JOc RtsbQZJsLJEZd2ndDQGkw6Um2/iLRH0Scsg9ebIZ6cvBI/Gj45zSNXGFQYAIhJFRpaS+TfO9HVcjJ dsM19AO359GBT9fu0ML/97xO33TLpSRw1rvaRPoqI4kDSfoQA6t1aRNrBBqXSsDnW65oxdnUgWeFZ 4kT6/9TDT9neSCF5KacPq/bWx54UwL9tI01nEmSv3ORKxj4RW0DpZPGg/BWwcXWSIlAaSNCrJ9XYZ 9v6eZIHQ==; Received: from 91-158-25-70.elisa-laajakaista.fi ([91.158.25.70] helo=toshino.localdomain) by mail.kapsi.fi with esmtpsa (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1pXMoQ-00Dvjx-Qs; Wed, 01 Mar 2023 15:48:06 +0200 From: Mikko Perttunen To: Thierry Reding , Jonathan Hunter Cc: Mikko Perttunen , linux-tegra@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 2/2] soc/tegra: bpmp: Actually free memory on error path Date: Wed, 1 Mar 2023 15:47:56 +0200 Message-Id: <20230301134756.999169-2-cyndis@kapsi.fi> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230301134756.999169-1-cyndis@kapsi.fi> References: <20230301134756.999169-1-cyndis@kapsi.fi> MIME-Version: 1.0 X-SA-Exim-Connect-IP: 91.158.25.70 X-SA-Exim-Mail-From: cyndis@kapsi.fi X-SA-Exim-Scanned: No (on mail.kapsi.fi); SAEximRunCond expanded to false X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1759174240881062144?= X-GMAIL-MSGID: =?utf-8?q?1759174240881062144?= From: Mikko Perttunen Within the error path, genpd->domains has not been set, so we need to pass the domains variable to kfree instead. Signed-off-by: Mikko Perttunen --- drivers/soc/tegra/powergate-bpmp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/soc/tegra/powergate-bpmp.c b/drivers/soc/tegra/powergate-bpmp.c index 8eaf50d0b6af..179ed895c279 100644 --- a/drivers/soc/tegra/powergate-bpmp.c +++ b/drivers/soc/tegra/powergate-bpmp.c @@ -286,7 +286,7 @@ static int tegra_bpmp_add_powergates(struct tegra_bpmp *bpmp, tegra_powergate_remove(powergate); } - kfree(genpd->domains); + kfree(domains); return err; }