linux-kernel - [PATCH] drbd: fix -Waddress warning

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]

Message-Id: <1328893433-28017-1-git-send-email-danny.kukawka@bisect.de>
Date:	Fri, 10 Feb 2012 18:03:53 +0100
From:	Danny Kukawka <danny.kukawka@...ect.de>
To:	drbd-dev@...ts.linbit.com
Cc:	Danny Kukawka <dkukawka@...e.de>, drbd-user@...ts.linbit.com,
	linux-kernel@...r.kernel.org, Philipp Reisner <phil@...bit.com>,
	Lars Ellenberg <lars@...bit.com>
Subject: [PATCH] drbd: fix -Waddress warning

Fix for:
drivers/block/drbd/drbd_main.c: In function ‘drbd_buildtag’:
drivers/block/drbd/drbd_main.c:4187:19: warning: the comparison will
 always evaluate as ‘true’ for the address of ‘__this_module’ will
 never be NULL [-Waddress]

Remove "THIS_MODULE != NULL" check since always true and move else 
block to #else.

Signed-off-by: Danny Kukawka <danny.kukawka@...ect.de>
---
 drivers/block/drbd/drbd_main.c |    7 +++----
 1 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/drivers/block/drbd/drbd_main.c b/drivers/block/drbd/drbd_main.c
index 211fc44..36a51ac 100644
--- a/drivers/block/drbd/drbd_main.c
+++ b/drivers/block/drbd/drbd_main.c
@@ -4184,11 +4184,10 @@ const char *drbd_buildtag(void)
 
 	if (buildtag[0] == 0) {
 #ifdef CONFIG_MODULES
-		if (THIS_MODULE != NULL)
-			sprintf(buildtag, "srcversion: %-24s", THIS_MODULE->srcversion);
-		else
+		sprintf(buildtag, "srcversion: %-24s", THIS_MODULE->srcversion);
+#else
+		buildtag[0] = 'b';
 #endif
-			buildtag[0] = 'b';
 	}
 
 	return buildtag;
-- 
1.7.7.3

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/