From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ozlabs.org (ozlabs.org [103.22.144.67]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 1500D1A170B for ; Wed, 8 Oct 2014 21:41:19 +1100 (EST) Received: from e23smtp05.au.ibm.com (e23smtp05.au.ibm.com [202.81.31.147]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id AF31A1400E2 for ; Wed, 8 Oct 2014 21:41:18 +1100 (EST) Received: from /spool/local by e23smtp05.au.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Wed, 8 Oct 2014 20:41:18 +1000 Content-Type: text/plain; charset=UTF-8 From: Ian Munsie To: greg , arnd , mpe , benh Subject: [PATCH] CXL: Fix afu_read() not doing finish_wait() on signal or non-blocking In-reply-to: <1412763264-sup-2737@delenn.ozlabs.ibm.com> References: <1412758505-23495-1-git-send-email-mikey@neuling.org> <1412758505-23495-14-git-send-email-mikey@neuling.org> <1412763264-sup-2737@delenn.ozlabs.ibm.com> Date: Wed, 08 Oct 2014 21:41:20 +1100 Message-Id: <1412764803-sup-6790@delenn.ozlabs.ibm.com> Cc: cbe-oss-dev , mikey , "Aneesh Kumar K.V" , linux-kernel , linuxppc-dev , jk , imunsie , anton List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , If afu_read() returned due to a signal or the AFU file descriptor being opened non-blocking it would not call finish_wait() before returning, which could lead to a crash later when something else wakes up the wait queue. This patch restructures the wait logic to ensure that the cleanup is done correctly. Signed-off-by: Ian Munsie --- drivers/misc/cxl/file.c | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/drivers/misc/cxl/file.c b/drivers/misc/cxl/file.c index 847b7e6..378b099 100644 --- a/drivers/misc/cxl/file.c +++ b/drivers/misc/cxl/file.c @@ -273,6 +273,7 @@ static ssize_t afu_read(struct file *file, char __user *buf, size_t count, struct cxl_context *ctx = file->private_data; struct cxl_event event; unsigned long flags; + int rc; DEFINE_WAIT(wait); if (count < CXL_READ_MIN_SIZE) @@ -285,13 +286,17 @@ static ssize_t afu_read(struct file *file, char __user *buf, size_t count, if (ctx_event_pending(ctx)) break; - spin_unlock_irqrestore(&ctx->lock, flags); - if (file->f_flags & O_NONBLOCK) - return -EAGAIN; + if (file->f_flags & O_NONBLOCK) { + rc = -EAGAIN; + goto out; + } - if (signal_pending(current)) - return -ERESTARTSYS; + if (signal_pending(current)) { + rc = -ERESTARTSYS; + goto out; + } + spin_unlock_irqrestore(&ctx->lock, flags); pr_devel("afu_read going to sleep...\n"); schedule(); pr_devel("afu_read woken up\n"); @@ -336,6 +341,11 @@ static ssize_t afu_read(struct file *file, char __user *buf, size_t count, if (copy_to_user(buf, &event, event.header.size)) return -EFAULT; return event.header.size; + +out: + finish_wait(&ctx->wq, &wait); + spin_unlock_irqrestore(&ctx->lock, flags); + return rc; } static const struct file_operations afu_fops = { -- 2.1.0