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;
From:   Wang Ming <machel@vivo.com>
To:     Michael Ellerman <mpe@ellerman.id.au>,
        Nicholas Piggin <npiggin@gmail.com>,
        Christophe Leroy <christophe.leroy@csgroup.eu>,
        Andrew Donnellan <ajd@linux.ibm.com>,
        linuxppc-dev@lists.ozlabs.org, linux-kernel@vger.kernel.org
Cc:     opensource.kernel@vivo.com, Wang Ming <machel@vivo.com>
Subject: [PATCH v2] powerpc:platforms:Fix an NULL vs IS_ERR() bug for debugfs_create_dir()
Date:   Wed, 12 Jul 2023 10:52:35 +0800
Message-Id: <20230712025250.6512-1-machel@vivo.com>
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?ANI+PgFdbZefOKuCy4XJX5LeEeoUF/NUDtJEGOwBHmoosHr/tuThR92cbG3m?=
 =?us-ascii?Q?siil41ltTCM+SnzSnvkw0bJmSTrJn18wW62yuaHNJOkcFGtDuJiQ0e+OJ7W+?=
 =?us-ascii?Q?0/NZbVHTNZ1edlClsCD7KUhASkuZQ10lXUX1x4jqSMzJkqQH7HRRqx9r8Ka3?=
 =?us-ascii?Q?eGy5HJKG5rAudNGQsnDX53kbO2YVvRQTqU5yZ5zG01Uq9rjCHSb5P2jhdzjG?=
 =?us-ascii?Q?ixkdPQyzAPY27v9tNobrtUI+C9Z7n5rFQdifxZ4NYzXjUAqOxGaUOrKh+NUI?=
 =?us-ascii?Q?mR0AdGPZBV9WVVJItGcLJ8HV/cCTDhk/11rSWrFDccm2D/FTl0cqQZIuyCov?=
 =?us-ascii?Q?WGAvuW92N9GGSilySoNOGaXWD2gZ/Ewso9MhNE6czNVgLI6Veb/et2NoquC0?=
 =?us-ascii?Q?uUctKM8AUab6aJ7iqNLyTd+twWqZDiSQf6FXnwK2hEV2LabPZbST+GAqp9wF?=
 =?us-ascii?Q?gbw9yT+fBxqrnfsA2lkMBtqz2tkgxcvdl0PIpO/DkyE3TyUV5bnsXtPkCGwx?=
 =?us-ascii?Q?Hej3I5HO9RzwCbRWZMUpAQmXnkaNzz4z0++1QMpHgGS//23SyHEmK1R553k/?=
 =?us-ascii?Q?5lf8GETbG8HomRe7hfl/y/IQlaX/9Hn7xMAFMTJCP5w491HU4536NtWIVpA1?=
 =?us-ascii?Q?H01iu7e5NfKO8Mrvi41X6sxmPBBbcooVEeridBs85g0JbfJZfz5sKx2aYejX?=
 =?us-ascii?Q?5VZxb2+kyVwoBcsdDU3wedg3g6QEktTj4TmqQRMtUUKzzi7v8/whQwxN0yj5?=
 =?us-ascii?Q?nFmWVW0SVLH1gSgtuoy8lOBjOLFoxBovXwgMrJE0WVWBSTX01IS+WBcMAbSN?=
 =?us-ascii?Q?ah8O+T8F91JEGP3E+UKsmnLh1DgYP9E6XG65LIliDMjb9snbcura09uPxz7C?=
 =?us-ascii?Q?Srg5HuyG3y8eEItdpaPQhr48QVkH/M1M4e3iq5l1N7XuCkufgQA9JdK+jLeA?=
 =?us-ascii?Q?cUhkzJeYtRhSDQqvVN6JnUBk3cXslP4twH3UZyd24s+ICQ2+saqyMB2bT+y+?=
 =?us-ascii?Q?b4lzYN/0Z3dhzJrJmEtOIioZVCeflESKmY4J372tFlijQgq0MMOicjmmFGCI?=
 =?us-ascii?Q?JGsCPvXEnMuf1Fo/8IERZ96fLEO/qBLkRrNJSIjLo2J5gy1xGxFj53D1//rs?=
 =?us-ascii?Q?CG41RBEqdWrEJyORZ5cFAy+6Cz3Ha3TpMI+f36y5k5MFsj/cJVwZNDWhZl/7?=
 =?us-ascii?Q?5KmiOLiqxXsXFy9cFwRPdGXPDGKR70weGUIhPDA3Z/NMpRVT3bWS6rdNhJ6m?=
 =?us-ascii?Q?Q+m2fSS1cUDC6UoXYrLp0+q/AJpelFbBu6ALYbFAn+Cnj2hc25/mmubTPuVA?=
 =?us-ascii?Q?Sbq/6e9xq3wC8rVHrvtMH6eqqFqHq+0A9laIfmXzb+ctvuumvhU+QEgUc3+F?=
 =?us-ascii?Q?NakrSwXoKtMMNL/PNd58NNq4FrYrUR/MfA8IYmMP3owJDrOJoV9RCZFC4mzo?=
 =?us-ascii?Q?ORwvr6zU5uXBjHb1/BUVOCLMWRmG1aGfq66KJxqLBj0L3ccaZ/nwFDfqBrbP?=
 =?us-ascii?Q?xzbVuhvK3ISqi4rkCQCPnYkt6cSdCA7Q75qJ0qYHrbEsd3u+vUT+YY8KFay6?=
 =?us-ascii?Q?JC6E6CbHBMR2xikyFV4O527scoxSTcxdyfBKBtIS?=
X-OriginatorOrg: vivo.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 956633eb-2767-4ae2-3828-08db828340d9
X-MS-Exchange-CrossTenant-AuthSource: SG2PR06MB3743.apcprd06.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Jul 2023 02:54:04.8710
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 923e42dc-48d5-4cbe-b582-1a797a6412ed
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: lJzzC2fkUsddyOxT67RoZY+0WeP2poOfHrXcIyTNLO97MKJ5yrfjqifNERaBwhVqPJ7EV2CS9S0ub40p42IPPw==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: TYZPR06MB4094
X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED,
        DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_BLOCKED,
        RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,SPF_PASS,T_SCC_BODY_TEXT_LINE,
        URIBL_BLOCKED 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: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

The debugfs_create_dir() function returns error pointers.
It never returns NULL. Most incorrect error checks were fixed,
but the one in scom_debug_init() was forgotten, the other one in
scom_debug_init_one() was also forgotten.

Fix the remaining error check.

Signed-off-by: Wang Ming <machel@vivo.com>

Fixes: bfd2f0d49aef ("powerpc/powernv: Get rid of old scom_controller abstraction")
---
 arch/powerpc/platforms/powernv/opal-xscom.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/arch/powerpc/platforms/powernv/opal-xscom.c b/arch/powerpc/platforms/powernv/opal-xscom.c
index 6b4eed2ef4fa..262cd6fac907 100644
--- a/arch/powerpc/platforms/powernv/opal-xscom.c
+++ b/arch/powerpc/platforms/powernv/opal-xscom.c
@@ -168,7 +168,7 @@ static int scom_debug_init_one(struct dentry *root, struct device_node *dn,
 	ent->path.size = strlen((char *)ent->path.data);
 
 	dir = debugfs_create_dir(ent->name, root);
-	if (!dir) {
+	if (IS_ERR(dir)) {
 		kfree(ent->path.data);
 		kfree(ent);
 		return -1;
@@ -190,7 +190,7 @@ static int scom_debug_init(void)
 		return 0;
 
 	root = debugfs_create_dir("scom", arch_debugfs_dir);
-	if (!root)
+	if (IS_ERR(root))
 		return -1;
 
 	rc = 0;
-- 
2.25.1