linux-kernel - [PATCH] ocfs2:Use BUG_ON instead of if condition followed by BUG.

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Message-Id: <20211105014424.75372-1-zhang.mingyu@zte.com.cn>
Date:   Fri,  5 Nov 2021 01:44:24 +0000
From:   cgel.zte@...il.com
To:     mark@...heh.com
Cc:     jlbec@...lplan.org, joseph.qi@...ux.alibaba.com,
        ocfs2-devel@....oracle.com, linux-kernel@...r.kernel.org,
        Zhang Mingyu <zhang.mingyu@....com.cn>,
        Zeal Robot <zealci@....com.cn>
Subject: [PATCH] ocfs2:Use BUG_ON instead of if condition followed by BUG.

From: Zhang Mingyu <zhang.mingyu@....com.cn>

This issue was detected with the help of Coccinelle.

Reported-by: Zeal Robot <zealci@....com.cn>
Signed-off-by: Zhang Mingyu <zhang.mingyu@....com.cn>
---
 fs/ocfs2/journal.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/fs/ocfs2/journal.c b/fs/ocfs2/journal.c
index dbf9b9e97d74..1887a2708709 100644
--- a/fs/ocfs2/journal.c
+++ b/fs/ocfs2/journal.c
@@ -1669,8 +1669,7 @@ static int ocfs2_replay_journal(struct ocfs2_super *osb,
 	status = jbd2_journal_load(journal);
 	if (status < 0) {
 		mlog_errno(status);
-		if (!igrab(inode))
-			BUG();
+		BUG_ON(!igrab(inode));
 		jbd2_journal_destroy(journal);
 		goto done;
 	}
@@ -1699,8 +1698,7 @@ static int ocfs2_replay_journal(struct ocfs2_super *osb,
 	if (status < 0)
 		mlog_errno(status);
 
-	if (!igrab(inode))
-		BUG();
+	BUG_ON(!igrab(inode));
 
 	jbd2_journal_destroy(journal);
 
-- 
2.25.1