Received: by 10.223.185.116 with SMTP id b49csp4194707wrg; Mon, 26 Feb 2018 12:58:59 -0800 (PST) X-Google-Smtp-Source: AH8x224k7fDNeUuqt9ekGhWP5foU9Dk8yxd1dSVtfgWv+qYMG8J3jCfl47A/F+pGjZVSV1BKF5pG X-Received: by 10.101.80.6 with SMTP id f6mr9330448pgo.272.1519678739245; Mon, 26 Feb 2018 12:58:59 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1519678739; cv=none; d=google.com; s=arc-20160816; b=vOMMt2KttE0GKFMzT5PWfD814f7DXc1O2H8xlt7w8Up3sQWKZBjpkaoqw7VvadbwnL VLZTgNKOZeoFxyPcKQjjfttX8yjlDuK1TCRGAHXQ9IBx6gIdBr4l7Fw7rhNojPwHBkwT gTckCvjRSVlTdrsoXPIHWUmIIK9WCIhsujMlNJIoFfEc2a9ea6u49BoYq0Ksz5za/Qwq WEeWnksH9VPrsnnTmnmo+1sOjBgyZr8u/VWqGIDaQ3yKSm9dGYIq0nnKkOipM2F89hAd 1bkk+sUCXqCX5czmoXkavl3Icoa5mmn45jmhVmPOjRQSIK6acuxIXiUUQuxbh6NRUuK5 YRDg== 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=CNc5RtQf+jf9V6AALc/Xiti2eexPaIHh0fS9xxF+itE=; b=qPdn8IEuTTjl9Xok/2eSg7ny9KZy5TKAcfRiXIesA+u00jbFRTordptSnv7ncAu0xA 3pXqlP5OnC1XLe5Ujd+QYNHecQLfYR7wnNgNB0pGI0fISoLkO7YjvfYjW/vN+BEYYZEp O0Jb0Bz4bkNkm8NvNyXPhdaA9cQjFu0h8eTn3lwXf4OtYRtxSA1mNiE6Oz1IffI0Avr8 r6sQhv11hRPtqgmVv7VYE3dNp6m0G2BWtgVcAofscumSPIGFYVNMCSpE04F0QuFyFdrU wwqUYbuWBZBM2KdExmeoqz5G0B8d4zc3AUiF+1fDCM9lpRW4/IVkGaVnyoRkAV7oiW2P l8/g== 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 w8si5885375pgt.182.2018.02.26.12.58.42; Mon, 26 Feb 2018 12:58:59 -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 S1752621AbeBZU6B (ORCPT + 99 others); Mon, 26 Feb 2018 15:58:01 -0500 Received: from mail.linuxfoundation.org ([140.211.169.12]:34514 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752534AbeBZUWs (ORCPT ); Mon, 26 Feb 2018 15:22:48 -0500 Received: from localhost (clnet-b04-243.ikbnet.co.at [83.175.124.243]) by mail.linuxfoundation.org (Postfix) with ESMTPSA id A9538ECB; Mon, 26 Feb 2018 20:22:46 +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.9 08/39] iio: buffer: check if a buffer has been set up when poll is called Date: Mon, 26 Feb 2018 21:20:29 +0100 Message-Id: <20180226201644.041990353@linuxfoundation.org> X-Mailer: git-send-email 2.16.2 In-Reply-To: <20180226201643.660109883@linuxfoundation.org> References: <20180226201643.660109883@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.9-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 @@ -174,7 +174,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);