]> git.baikalelectronics.ru Git - kernel.git/commitdiff
bonding: fix error checking in bond_debug_reregister()
authorQi Zheng <zhengqi.arch@bytedance.com>
Thu, 2 Feb 2023 09:32:55 +0000 (17:32 +0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 22 Feb 2023 11:50:31 +0000 (12:50 +0100)
[ Upstream commit cbe83191d40d8925b7a99969d037d2a0caf69294 ]

Since commit 846632d286c9 ("debugfs: return error values,
not NULL") changed return value of debugfs_rename() in
error cases from %NULL to %ERR_PTR(-ERROR), we should
also check error values instead of NULL.

Fixes: 846632d286c9 ("debugfs: return error values, not NULL")
Signed-off-by: Qi Zheng <zhengqi.arch@bytedance.com>
Acked-by: Jay Vosburgh <jay.vosburgh@canonical.com>
Link: https://lore.kernel.org/r/20230202093256.32458-1-zhengqi.arch@bytedance.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/net/bonding/bond_debugfs.c

index f3f86ef68ae0ce9c126d2e66108e6124a7190e01..8b6cf2bf9025abca4aac49dd0392b4144148cc08 100644 (file)
@@ -76,7 +76,7 @@ void bond_debug_reregister(struct bonding *bond)
 
        d = debugfs_rename(bonding_debug_root, bond->debug_dir,
                           bonding_debug_root, bond->dev->name);
-       if (d) {
+       if (!IS_ERR(d)) {
                bond->debug_dir = d;
        } else {
                netdev_warn(bond->dev, "failed to reregister, so just unregister old one\n");