linux-kernel - [GIT PULL] ioctl bkl pushdown fix

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 for Android: free password hash cracker in your pocket

[<prev] [next>] [day] [month] [year] [list]

Date:	Wed,  9 Jun 2010 01:33:52 +0200
From:	Frederic Weisbecker <fweisbec@...il.com>
To:	Linus Torvalds <torvalds@...ux-foundation.org>
Cc:	LKML <linux-kernel@...r.kernel.org>,
	Frederic Weisbecker <fweisbec@...il.com>,
	Geert Uytterhoeven <geert@...ux-m68k.org>,
	Arnd Bergmann <arnd@...db.de>
Subject: [GIT PULL] ioctl bkl pushdown fix

Linus,

Please pull the bkl/fixes branch that can be found at:

git://git.kernel.org/pub/scm/linux/kernel/git/frederic/random-tracing.git
	bkl/fixes

Thanks,
	Frederic
---

Arnd Bergmann (1):
      hp_sdc_rtc: fix broken ioctl conversion


 drivers/input/misc/hp_sdc_rtc.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

---
commit af0d5cb908f7f9adeb5d3d3dbef64c644bb6809c
Author: Arnd Bergmann <arnd@...db.de>
Date:   Sat Jun 5 22:52:21 2010 +0200

    hp_sdc_rtc: fix broken ioctl conversion
    
    Commit 55929332c92 "drivers: Push down BKL into various drivers"
    introduced a regression in hp_sdc_rtc, caused by a missing
    change of the .unlocked_ioctl pointer to the newly introduced
    function.
    
    Fixes:
    
    	drivers/input/misc/hp_sdc_rtc.c:681: warning: initialization from
    	incompatible pointer type
    	drivers/input/misc/hp_sdc_rtc.c:665: warning:
    	‘hp_sdc_rtc_unlocked_ioctl’ defined but not used
    
    Reported-by: Geert Uytterhoeven <geert@...ux-m68k.org>
    Signed-off-by: Arnd Bergmann <arnd@...db.de>
    Acked-by: Geert Uytterhoeven <geert@...ux-m68k.org>
    Signed-off-by: Frederic Weisbecker <fweisbec@...il.com>

diff --git a/drivers/input/misc/hp_sdc_rtc.c b/drivers/input/misc/hp_sdc_rtc.c
index e00a1cc..c190664 100644
--- a/drivers/input/misc/hp_sdc_rtc.c
+++ b/drivers/input/misc/hp_sdc_rtc.c
@@ -678,7 +678,7 @@ static const struct file_operations hp_sdc_rtc_fops = {
         .llseek =		no_llseek,
         .read =			hp_sdc_rtc_read,
         .poll =			hp_sdc_rtc_poll,
-        .unlocked_ioctl = 	hp_sdc_rtc_ioctl,
+        .unlocked_ioctl =	hp_sdc_rtc_unlocked_ioctl,
         .open =			hp_sdc_rtc_open,
         .fasync =		hp_sdc_rtc_fasync,
 };
--
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/