linux-kernel - [PATCH] reiserfs: fix set but not used variable 'blkh'

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>] [day] [month] [year] [list]

Date:   Fri, 23 Aug 2019 17:42:36 +0800
From:   yu kuai <yukuai3@...wei.com>
To:     <reiserfs-devel@...r.kernel.org>, <linux-kernel@...r.kernel.org>
CC:     <zhengbin13@...wei.com>, <yukuai3@...uai.com>,
        <yi.zhang@...wei.com>
Subject: [PATCH] reiserfs: fix set but not used variable 'blkh'

Gcc '-Wunused-but-set-variable' warning: 
fs/reiserfs/prints.c:749:21: warning: variable blkh set but not used

Fix it by using blkh instead of regenerating it by B_BLK_HEAD(bh)

Reported-by: Hulk Robot <hulkci@...wei.com>
Signed-off-by: yu kuai <yukuai3@...wei.com>
---
 fs/reiserfs/prints.c | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/fs/reiserfs/prints.c b/fs/reiserfs/prints.c
index 9fed1c0..590d42b 100644
--- a/fs/reiserfs/prints.c
+++ b/fs/reiserfs/prints.c
@@ -749,15 +749,16 @@ static void check_internal_block_head(struct buffer_head *bh)
 	struct block_head *blkh;
 
 	blkh = B_BLK_HEAD(bh);
-	if (!(B_LEVEL(bh) > DISK_LEAF_NODE_LEVEL && B_LEVEL(bh) <= MAX_HEIGHT))
+	if (!(blkh_level(blkh) > DISK_LEAF_NODE_LEVEL &&
+		blkh_level(blkh) <= MAX_HEIGHT))
 		reiserfs_panic(NULL, "vs-6025", "invalid level %z", bh);
 
-	if (B_NR_ITEMS(bh) > (bh->b_size - BLKH_SIZE) / IH_SIZE)
+	if (blkh_nr_item(blkh) > (bh->b_size - BLKH_SIZE) / IH_SIZE)
 		reiserfs_panic(NULL, "vs-6030", "invalid item number %z", bh);
 
-	if (B_FREE_SPACE(bh) !=
-	    bh->b_size - BLKH_SIZE - KEY_SIZE * B_NR_ITEMS(bh) -
-	    DC_SIZE * (B_NR_ITEMS(bh) + 1))
+	if (blkh_free_space(p_blkh) !=
+	    bh->b_size - BLKH_SIZE - KEY_SIZE * blkh_nr_item(blkh) -
+	    DC_SIZE * (blkh_nr_item(blkh) + 1))
 		reiserfs_panic(NULL, "vs-6040", "invalid free space %z", bh);
 
 }
-- 
2.7.4