From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id DCD4DC76195 for ; Thu, 18 Jul 2019 03:16:32 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id A8DAC2053B for ; Thu, 18 Jul 2019 03:16:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1563419792; bh=6Gyqlx/g7z/7sSbh9rRsi50ThxMobClmjQs1x7td8MA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=ybh6xdbkcOIu+QxVp0M+XkeMLlsXVCivc0fRFGmeKb+gyjgS2ITsH61Ob/EcFGGnR TCBQ4bl6SP/57bOxgOSDULGrs7ubV3riwqWICRONZhxHO7bBypU95rHdEX+BApRg2v HhA5ZDRUbsOEI/a+dA6yYs46X7vRopbkJPv1YvD4= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2392007AbfGRDPV (ORCPT ); Wed, 17 Jul 2019 23:15:21 -0400 Received: from mail.kernel.org ([198.145.29.99]:52290 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2391998AbfGRDPT (ORCPT ); Wed, 17 Jul 2019 23:15:19 -0400 Received: from localhost (115.42.148.210.bf.2iij.net [210.148.42.115]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 8BCF921848; Thu, 18 Jul 2019 03:15:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1563419718; bh=6Gyqlx/g7z/7sSbh9rRsi50ThxMobClmjQs1x7td8MA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=IX12oUAEyfnpLQgZP4asVBDvTz9i1TnHfufAKQRDNs4VGdPP7uNdzfMiO5NZ0fR9o Yk4hTtbngfDE4wT2tdnOEUVYHmgg4DGbwx9gHFyD8AYoOSdiiPu6qpv7ldZ9seyn2D FuoCuQOTMx9VwaJ2w076XTIAew2Tkx/v8MN+AMcE= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Ian Abbott Subject: [PATCH 4.4 24/40] staging: comedi: amplc_pci230: fix null pointer deref on interrupt Date: Thu, 18 Jul 2019 12:02:20 +0900 Message-Id: <20190718030048.870317446@linuxfoundation.org> X-Mailer: git-send-email 2.22.0 In-Reply-To: <20190718030039.676518610@linuxfoundation.org> References: <20190718030039.676518610@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Ian Abbott commit 7379e6baeddf580d01feca650ec1ad508b6ea8ee upstream. The interrupt handler `pci230_interrupt()` causes a null pointer dereference for a PCI260 card. There is no analog output subdevice for a PCI260. The `dev->write_subdev` subdevice pointer and therefore the `s_ao` subdevice pointer variable will be `NULL` for a PCI260. The following call near the end of the interrupt handler results in the null pointer dereference for a PCI260: comedi_handle_events(dev, s_ao); Fix it by only calling the above function if `s_ao` is valid. Note that the other uses of `s_ao` in the calls `pci230_handle_ao_nofifo(dev, s_ao);` and `pci230_handle_ao_fifo(dev, s_ao);` will never be reached for a PCI260, so they are safe. Fixes: 39064f23284c ("staging: comedi: amplc_pci230: use comedi_handle_events()") Cc: # v3.19+ Signed-off-by: Ian Abbott Signed-off-by: Greg Kroah-Hartman --- drivers/staging/comedi/drivers/amplc_pci230.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) --- a/drivers/staging/comedi/drivers/amplc_pci230.c +++ b/drivers/staging/comedi/drivers/amplc_pci230.c @@ -2324,7 +2324,8 @@ static irqreturn_t pci230_interrupt(int devpriv->intr_running = false; spin_unlock_irqrestore(&devpriv->isr_spinlock, irqflags); - comedi_handle_events(dev, s_ao); + if (s_ao) + comedi_handle_events(dev, s_ao); comedi_handle_events(dev, s_ai); return IRQ_HANDLED;