linux-kernel - [PATCH 3.12 087/116] posix-clock: Fix return code on the poll method's error path

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: <bb83e03e5dcaf3352bec1e91ea25a11ed3a2bcea.1457082108.git.jslaby@suse.cz>
Date:	Fri,  4 Mar 2016 10:02:12 +0100
From:	Jiri Slaby <jslaby@...e.cz>
To:	stable@...r.kernel.org
Cc:	linux-kernel@...r.kernel.org,
	Richard Cochran <richardcochran@...il.com>,
	John Stultz <john.stultz@...aro.org>,
	Julia Lawall <julia.lawall@...6.fr>,
	Thomas Gleixner <tglx@...utronix.de>,
	Jiri Slaby <jslaby@...e.cz>
Subject: [PATCH 3.12 087/116] posix-clock: Fix return code on the poll method's error path

From: Richard Cochran <richardcochran@...il.com>

3.12-stable review patch.  If anyone has any objections, please let me know.

===============

commit 1b9f23727abb92c5e58f139e7d180befcaa06fe0 upstream.

The posix_clock_poll function is supposed to return a bit mask of
POLLxxx values.  However, in case the hardware has disappeared (due to
hot plugging for example) this code returns -ENODEV in a futile
attempt to throw an error at the file descriptor level.  The kernel's
file_operations interface does not accept such error codes from the
poll method.  Instead, this function aught to return POLLERR.

The value -ENODEV does, in fact, contain the POLLERR bit (and almost
all the other POLLxxx bits as well), but only by chance.  This patch
fixes code to return a proper bit mask.

Credit goes to Markus Elfring for pointing out the suspicious
signed/unsigned mismatch.

Reported-by: Markus Elfring <elfring@...rs.sourceforge.net>
igned-off-by: Richard Cochran <richardcochran@...il.com>
Cc: John Stultz <john.stultz@...aro.org>
Cc: Julia Lawall <julia.lawall@...6.fr>
Link: http://lkml.kernel.org/r/1450819198-17420-1-git-send-email-richardcochran@gmail.com
Signed-off-by: Thomas Gleixner <tglx@...utronix.de>
Signed-off-by: Jiri Slaby <jslaby@...e.cz>
---
 kernel/time/posix-clock.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/kernel/time/posix-clock.c b/kernel/time/posix-clock.c
index ce033c7aa2e8..9cff0ab82b63 100644
--- a/kernel/time/posix-clock.c
+++ b/kernel/time/posix-clock.c
@@ -69,10 +69,10 @@ static ssize_t posix_clock_read(struct file *fp, char __user *buf,
 static unsigned int posix_clock_poll(struct file *fp, poll_table *wait)
 {
 	struct posix_clock *clk = get_posix_clock(fp);
-	int result = 0;
+	unsigned int result = 0;

 	if (!clk)
-		return -ENODEV;
+		return POLLERR;

 	if (clk->ops.poll)
 		result = clk->ops.poll(clk, fp, wait);
-- 
2.7.2