linux-kernel - Re: linux-next: Tree for Aug 3 (watchdog/menz69

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

Message-ID: <20180803164024.tfujwvz2s6ekvjpv@linux-x5ow.site>
Date:   Fri, 3 Aug 2018 18:40:24 +0200
From:   Johannes Thumshirn <jth@...nel.org>
To:     Randy Dunlap <rdunlap@...radead.org>,
        Wim Van Sebroeck <wim@...ux-watchdog.org>
Cc:     Stephen Rothwell <sfr@...b.auug.org.au>,
        Linux-Next Mailing List <linux-next@...r.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        linux-watchdog@...r.kernel.org
Subject: Re: linux-next: Tree for Aug 3 (watchdog/menz69_wdt.c)

On Fri, Aug 03, 2018 at 08:39:48AM -0700, Randy Dunlap wrote:
> On 08/03/2018 02:29 AM, Stephen Rothwell wrote:
> > Hi all,
> > 
> > Changes since 20180802:
> > 
> 
> Hi,
> 
> On i386 randconfig with COMPILE_TEST=y and MCB not enabled, I see:
> 
> drivers/watchdog/menz69_wdt.o: In function `men_z069_remove':
> menz69_wdt.c:(.text+0xa6): undefined reference to `mcb_release_mem'
> drivers/watchdog/menz69_wdt.o: In function `men_z069_probe':
> menz69_wdt.c:(.text+0xdb): undefined reference to `mcb_request_mem'
> menz69_wdt.c:(.text+0x14a): undefined reference to `mcb_release_mem'
> drivers/watchdog/menz69_wdt.o: In function `men_z069_driver_init':
> menz69_wdt.c:(.init.text+0x15): undefined reference to `__mcb_register_driver'
> drivers/watchdog/menz69_wdt.o: In function `men_z069_driver_exit':
> menz69_wdt.c:(.exit.text+0x9): undefined reference to `mcb_unregister_driver'
> 
> 
> The Kconfig for MENZ069_WATCHDOG says:
> config MENZ069_WATCHDOG
> 	tristate "MEN 16Z069 Watchdog"
> 	depends on MCB || COMPILE_TEST
> 	select WATCHDOG_CORE
> 
> Looks to me like the driver really depends on MCB, unless someone wants
> to add stubs in <linux/mcb.h>.

*doh* looks like a copy & paste error. Wim can you fold that one in
(or stage to your tree)?

>From ae045015849cd15fd180e20f44d364e7a37c39c6 Mon Sep 17 00:00:00 2001
From: Johannes Thumshirn <jthumshirn@...e.de>
Date: Fri, 3 Aug 2018 18:35:17 +0200
Subject: [PATCH] watchdog: fix dependencies  of menz69_wdt.o

Currently menz69_wdt.ko has a dependency on MCB or COMPILE_TEST. But
it actually needs symbols exported by MCB so the || COMPILE_TEST is
wrong.

Signed-off-by: Johannes Thumshirn <jthumshirn@...e.de>
Reported-by: Randy Dunlap <rdunlap@...radead.org>
---
 drivers/watchdog/Kconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig
index df55d65bbb1c..5ea8909a41f9 100644
--- a/drivers/watchdog/Kconfig
+++ b/drivers/watchdog/Kconfig
@@ -163,7 +163,7 @@ config MENF21BMC_WATCHDOG
 
 config MENZ069_WATCHDOG
 	tristate "MEN 16Z069 Watchdog"
-	depends on MCB || COMPILE_TEST
+	depends on MCB
 	select WATCHDOG_CORE
 	help
 	  Say Y here to include support for the MEN 16Z069 Watchdog.
-- 
2.16.4



-- 
Johannes Thumshirn                                          Storage
jthumshirn@...e.de                                +49 911 74053 689
SUSE LINUX GmbH, Maxfeldstr. 5, 90409 Nürnberg
GF: Felix Imendörffer, Jane Smithard, Graham Norton
HRB 21284 (AG Nürnberg)
Key fingerprint = EC38 9CAB C2C4 F25D 8600 D0D0 0393 969D 2D76 0850