From: Richard Cochran <richardcochran@gmail.com>
To: linux-kernel@vger.kernel.org
Cc: John Stultz <john.stultz@linaro.org>,
Julia Lawall <julia.lawall@lip6.fr>,
Markus Elfring <elfring@users.sourceforge.net>,
Thomas Gleixner <tglx@linutronix.de>,
kernel-janitors@vger.kernel.org
Subject: [PATCH] posix-clock: fix return code on the poll method's error path
Date: Tue, 22 Dec 2015 21:19:58 +0000 [thread overview]
Message-ID: <1450819198-17420-1-git-send-email-richardcochran@gmail.com> (raw)
In-Reply-To: <56766488.9050402@users.sourceforge.net>
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.
Signed-off-by: Richard Cochran <richardcochran@gmail.com>
---
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 ce033c7..9cff0ab 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.1.4
prev parent reply other threads:[~2015-12-22 21:19 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-12-20 8:19 [PATCH] posix-clock: Use an unsigned data type for a variable SF Markus Elfring
2015-12-20 11:09 ` Julia Lawall
2015-12-20 12:48 ` SF Markus Elfring
2015-12-20 12:51 ` Julia Lawall
2015-12-20 13:08 ` SF Markus Elfring
2015-12-20 20:09 ` Richard Cochran
2015-12-21 9:30 ` SF Markus Elfring
2015-12-21 10:12 ` Richard Cochran
2015-12-22 21:19 ` Richard Cochran [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1450819198-17420-1-git-send-email-richardcochran@gmail.com \
--to=richardcochran@gmail.com \
--cc=elfring@users.sourceforge.net \
--cc=john.stultz@linaro.org \
--cc=julia.lawall@lip6.fr \
--cc=kernel-janitors@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=tglx@linutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox