Received: by 2002:ad5:4acb:0:0:0:0:0 with SMTP id n11csp3799204imw; Thu, 7 Jul 2022 07:49:47 -0700 (PDT) X-Google-Smtp-Source: AGRyM1uNuM0+QosH42PqMiEBVDdL5S7jq5w/VYUUY2sluGAvynx3jak4/NyA9IFRxsXSb+T6rrI3 X-Received: by 2002:a17:902:ea4f:b0:16a:cfc:7f49 with SMTP id r15-20020a170902ea4f00b0016a0cfc7f49mr51873094plg.135.1657205386787; Thu, 07 Jul 2022 07:49:46 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1657205386; cv=none; d=google.com; s=arc-20160816; b=KYfXoakGcH3KFpgIZ03X7X7JWOrSH5Sgei7MnVeZ9Nh3DldeGp613JsaOXpQLSRSQg QhmVrp30Wd0uwruxoq8vhGO7MfONkKUVF0rILPbX1bgo/WXPQY49ftJ3jWLLiQ9vp/o2 UjLpdC02AeAMIi+8ehJRwWpszAYDqokWoBPIleOLN8yTiP4nvM3JGV6a4Fx7nkePSMlN 9W33HXaZvuoyJ0h24Jq8zD7DW3NHqYua11UXUpSynwV3psjrYvRvQBEvWnVyqQjSF4z1 UDi70l05Kdau4CmvKx5KSROtPJc66lC8so2PPI80VkJcF7KOyHUA2dNlBlnOB4VGai07 5Leg== 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; bh=nwAXpOL46m0tzC0xwb3p7Of497BES2MyXYTIIJ0odg0=; b=yqz0JIqRouOOVmdj08RBSaVYw2OSvmKgoB8xrz965Q3btFLWjUnNd53vMQH8Zqec+V ZmUYkeqDsLCLDlXBkvA2h4wLQJ2CD8fljV9mh95jdhlaNSBnXXQGc+8vcnIHDv4UO4nY uykBbC1+qVTxFPilmklesOr3iKjB4kMSZivTtwtbGtbwaFeLDBdo9F6x1kfMI1EdA/lR /Vuf0lgUrD+RACEE6MynRo/0Prbiq3cFPknpFQPBIOdXhiE2B3vojLYAe9e0s8me6iDd 8Y9pneLR2wxrpcb0vmuvVhW+Gn1PgDiLabfWjLrcSAh7NGIobhCdV9QFisrWeQ8wRSSX ikbg== ARC-Authentication-Results: i=1; mx.google.com; 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=ispras.ru Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id o13-20020a17090a5b0d00b001ed1871bb53si32989611pji.2.2022.07.07.07.49.34; Thu, 07 Jul 2022 07:49:46 -0700 (PDT) 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; 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=ispras.ru Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235339AbiGGO1x (ORCPT + 99 others); Thu, 7 Jul 2022 10:27:53 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49852 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235054AbiGGO1s (ORCPT ); Thu, 7 Jul 2022 10:27:48 -0400 Received: from mail.ispras.ru (mail.ispras.ru [83.149.199.84]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id DAA1A2B256; Thu, 7 Jul 2022 07:27:47 -0700 (PDT) Received: from andrey-lpc.intra.ispras.ru (unknown [83.149.199.65]) by mail.ispras.ru (Postfix) with ESMTPS id 68A9940D4004; Thu, 7 Jul 2022 14:27:46 +0000 (UTC) From: Andrey Strachuk To: Jeff Mahoney Cc: Andrey Strachuk , reiserfs-devel@vger.kernel.org, linux-kernel@vger.kernel.org, ldv-project@linuxtesting.org Subject: [PATCH] reiserfs: removed useless condition from if Date: Thu, 7 Jul 2022 17:27:45 +0300 Message-Id: <20220707142745.14572-1-strochuk@ispras.ru> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,SPF_HELO_NONE, SPF_PASS,T_SCC_BODY_TEXT_LINE 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 At line 1001, bi is compared with NULL. 982 struct buffer_head *bh = bi->bi_bh; 983 int nr, free_space; 984 struct block_head *blkh; 985 struct item_head *ih; 986 int i; 987 int last_loc, unmoved_loc; 988 989 blkh = B_BLK_HEAD(bh); 990 nr = blkh_nr_item(blkh); 991 free_space = blkh_free_space(blkh); 992 993 /* check free space */ 994 RFALSE(free_space < paste_size, 995 "vs-10175: not enough free space: needed %d, available %d", 996 paste_size, free_space); 997 998 #ifdef CONFIG_REISERFS_CHECK 999 if (zeros_number > paste_size) { 1000 struct super_block *sb = NULL; 1001 if (bi && bi->tb) 1002 sb = bi->tb->tb_sb; 1003 print_cur_tb("10177"); 1004 reiserfs_panic(sb, "vs-10177", 1005 "zeros_number == %d, paste_size == %d", 1006 zeros_number, paste_size); 1007 } 1008 #endif /* CONFIG_REISERFS_CHECK */ However, it cannot be NULL because kernel crashes at line 982 otherwise. The patch removes useless comparison. Found by Linux Verification Center (linuxtesting.org) with SVACE. Signed-off-by: Andrey Strachuk Fixes: c3a9c2109f84 ("reiserfs: rework reiserfs_panic") --- fs/reiserfs/lbalance.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fs/reiserfs/lbalance.c b/fs/reiserfs/lbalance.c index 7f868569d4d0..0a530ea06d4e 100644 --- a/fs/reiserfs/lbalance.c +++ b/fs/reiserfs/lbalance.c @@ -998,7 +998,7 @@ void leaf_paste_in_buffer(struct buffer_info *bi, int affected_item_num, #ifdef CONFIG_REISERFS_CHECK if (zeros_number > paste_size) { struct super_block *sb = NULL; - if (bi && bi->tb) + if (bi->tb) sb = bi->tb->tb_sb; print_cur_tb("10177"); reiserfs_panic(sb, "vs-10177", -- 2.25.1