Received: by 10.223.185.116 with SMTP id b49csp4182830wrg; Mon, 26 Feb 2018 12:43:36 -0800 (PST) X-Google-Smtp-Source: AH8x226NcfYfEO54eepi2FM6PJHW8gid8OlBpB7OxVd7335+fOQ+sLtaHxYoyVQSymELUx92vTp8 X-Received: by 10.101.100.213 with SMTP id t21mr9409367pgv.19.1519677816730; Mon, 26 Feb 2018 12:43:36 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1519677816; cv=none; d=google.com; s=arc-20160816; b=BX4QOJ3/i9JiOtaDpG9voV6SPfojzmcMgUiVXaRC3H1rstvLOfeidRYGuGyeRrNDQV zlokMjrrnPsmdLwjTbyrtnDPR7PM0FPjQKoSW/x5fy56jPHtqdRBXXnK0LzsbmRCwvnW KJUzH2VO6dr2+0079WdudhO0UC5kuB1UIvPqcXXMIgElLwAf9YWsjmGZu608AFj5TJMH 5pjTK2ulfxjG6BvNRDoaDEh0QHNoY18AmcUCUI2KLrnmDiBbDrtpt+7Ks17SppD3fC2J ZkV1KqG8yBF9EXKYuEakJ6AHZEv+TkOL9S7iZ0TmyQ23mZDRxfIv/URLPMvudRd3Vn0u Q3Jg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:mime-version:user-agent:references :in-reply-to:message-id:date:subject:cc:to:from :arc-authentication-results; bh=fc8SEl8SlLLcE5rC1jStBgJLbqh0LoLbz/t9WOQ1UyM=; b=shWts3Uju6vGzjiT5T1SUks3rPkygk6zyfTVGgHZcTxmkPmwZwAHZsI4nApvW82UUK 3yCB3jZJwAk81QWX3bQRVuHjXVcyvKQVNlfiK8K7aSr1bYQtpq3zMvU7NS2DGH85rDja 0puKMuaSIQZypK4NAgzN+akKdzNmP9GPdmnL6d5sl4Zez9lAGf4ejISmRo6X9JEMBP6l m0vZ+CuDZxkSfxdVs8fxTqyKqSQvafRAsq+5Yrwj8n9Tagqm6MUq9p+tTvKdqlN6nnGT hGt2ib1npeilwA0ioGTkDVyMjvQ0w5KqOrqDtD0O7pCbvf+1esvi5xU75omSkKtnljJA 5kMg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id u3-v6si7354653plz.494.2018.02.26.12.43.20; Mon, 26 Feb 2018 12:43:36 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753807AbeBZUmH (ORCPT + 99 others); Mon, 26 Feb 2018 15:42:07 -0500 Received: from mail.linuxfoundation.org ([140.211.169.12]:36042 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753558AbeBZU04 (ORCPT ); Mon, 26 Feb 2018 15:26:56 -0500 Received: from localhost (clnet-b04-243.ikbnet.co.at [83.175.124.243]) by mail.linuxfoundation.org (Postfix) with ESMTPSA id 30D1EBD5; Mon, 26 Feb 2018 20:26:55 +0000 (UTC) From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Stefan Windfeldt-Prytz , Jonathan Cameron Subject: [PATCH 4.15 24/64] iio: buffer: check if a buffer has been set up when poll is called Date: Mon, 26 Feb 2018 21:22:01 +0100 Message-Id: <20180226202154.498076659@linuxfoundation.org> X-Mailer: git-send-email 2.16.2 In-Reply-To: <20180226202153.453363333@linuxfoundation.org> References: <20180226202153.453363333@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 4.15-stable review patch. If anyone has any objections, please let me know. ------------------ From: Stefan Windfeldt-Prytz commit 4cd140bda6494543f1c1b0ccceceaa44b676eef6 upstream. If no iio buffer has been set up and poll is called return 0. Without this check there will be a null pointer dereference when calling poll on a iio driver without an iio buffer. Cc: stable@vger.kernel.org Signed-off-by: Stefan Windfeldt-Prytz Signed-off-by: Jonathan Cameron Signed-off-by: Greg Kroah-Hartman --- drivers/iio/industrialio-buffer.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/drivers/iio/industrialio-buffer.c +++ b/drivers/iio/industrialio-buffer.c @@ -175,7 +175,7 @@ unsigned int iio_buffer_poll(struct file struct iio_dev *indio_dev = filp->private_data; struct iio_buffer *rb = indio_dev->buffer; - if (!indio_dev->info) + if (!indio_dev->info || rb == NULL) return 0; poll_wait(filp, &rb->pollq, wait);