linux-kernel - [PATCH] block: remove unnecessary NULL checks in bioset_integrity

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: <20171005180920.GA121296@debian>
Date:   Thu, 5 Oct 2017 14:09:20 -0400
From:   Tim Hansen <devtimhansen@...il.com>
To:     axboe@...nel.dk
Cc:     devtimhansen@...il.com, linux-block@...r.kernel.org,
        linux-kernel@...r.kernel.org, alexander.levin@....verizon.com
Subject: [PATCH] block: remove unnecessary NULL checks in
 bioset_integrity_free()

mempool_destroy() already checks for a NULL value being passed in, this eliminates duplicate checks.

This was caught by running make coccicheck M=block/ on linus' tree on commit 77ede3a014a32746002f7889211f0cecf4803163 (current head as of this patch).

Signed-off-by: Tim Hansen <devtimhansen@...il.com>
---
 block/bio-integrity.c | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/block/bio-integrity.c b/block/bio-integrity.c
index 5df3290..23b42e8 100644
--- a/block/bio-integrity.c
+++ b/block/bio-integrity.c
@@ -485,11 +485,8 @@ EXPORT_SYMBOL(bioset_integrity_create);
 
 void bioset_integrity_free(struct bio_set *bs)
 {
-	if (bs->bio_integrity_pool)
-		mempool_destroy(bs->bio_integrity_pool);
-
-	if (bs->bvec_integrity_pool)
-		mempool_destroy(bs->bvec_integrity_pool);
+	mempool_destroy(bs->bio_integrity_pool);
+	mempool_destroy(bs->bvec_integrity_pool);
 }
 EXPORT_SYMBOL(bioset_integrity_free);
 
-- 
2.1.4