From patchwork Wed May 27 14:28:14 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Takeshi Yoshimura X-Patchwork-Id: 6490351 Return-Path: X-Original-To: patchwork-linux-media@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id E948D9F1C1 for ; Wed, 27 May 2015 14:30:37 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id CDC6D206AF for ; Wed, 27 May 2015 14:30:32 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id E4502206A4 for ; Wed, 27 May 2015 14:30:28 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752152AbbE0Oa0 (ORCPT ); Wed, 27 May 2015 10:30:26 -0400 Received: from mail-pd0-f170.google.com ([209.85.192.170]:36575 "EHLO mail-pd0-f170.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751495AbbE0OaZ (ORCPT ); Wed, 27 May 2015 10:30:25 -0400 Received: by pdfh10 with SMTP id h10so17518330pdf.3 for ; Wed, 27 May 2015 07:30:25 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=EVDZxwE9dfZqYT5YsoXPS9qfbBWllkARmUio9uewpoM=; b=ctYkrZkTQuOS3WRQzHeUUMJ59U3NQMm/hl8e6S/HHnj0FyPbxXx/kSeEvjrJpyB1ce Hamo5kKNvb0RH0NO+yW+PcBvOqPegusMsh+3ag8SEBi0HUlJJIguamjVmv1Ozd2vksao 6Kw+E7NUPVaxzcLR6E7iMFSQDrNzERqayJsacJrQk5d5FX5yp9pg9Oo5tCf2mlSG/rCh Z2WFsyQVjL6Rb4RD9nK6NyE/RweIeWCF1vHHJdkBNlxwFzpzCvSc4ohBheWdKnX+fYph Pdl651jpi7CvgMBOicAqDbJwKh9xlRU0ZAx87Edo3uIIe1dkhtRp3vjlyfzHdlaWTW0X 7tOQ== X-Gm-Message-State: ALoCoQkUYEICGQQK9n1tnK1ugK3Ul6b9OZkmO8kLK+O42lrlS18tgO8qj9gLHK5mEZ2IredqmwPH X-Received: by 10.68.142.42 with SMTP id rt10mr59038253pbb.27.1432737025159; Wed, 27 May 2015 07:30:25 -0700 (PDT) Received: from vagrant-ubuntu-trusty.i.sslab.ics.keio.ac.jp (sslab-relay.ics.keio.ac.jp. [131.113.126.173]) by mx.google.com with ESMTPSA id k9sm16448210pdp.60.2015.05.27.07.30.21 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 27 May 2015 07:30:23 -0700 (PDT) From: Takeshi Yoshimura X-Google-Original-From: Takeshi Yoshimura , Markus Elfring , Christopher Reimer , Hans Verkuil , linux-media@vger.kernel.org Cc: linux-kernel@vger.kernel.org, Takeshi Yoshimura Subject: [PATCH 1/1] [media] ddbridge: Do not free_irq() if request_irq() failed Date: Wed, 27 May 2015 14:28:14 +0000 Message-Id: <1432736894-10368-1-git-send-email-yos@sslab.ics.keio.ac.jp> X-Mailer: git-send-email 2.1.0 Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Takeshi Yoshimura My static checker detected that free_irq() is called even after request_irq() failed in ddb_probe(). In this case, the kernel may try to free dev->pdev->irq although the IRQ is not assigned. This event rarely occurs, but always introduces a warning if it happens. "goto fail1" always results in disabling enabled MSI and releasing a requested IRQ. It seems like the former handling is necessary. So I added a conditional branch before the free_irq() (stat == 0 means request_irq() succeeds). Signed-off-by: Takeshi Yoshimura --- drivers/media/pci/ddbridge/ddbridge-core.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/media/pci/ddbridge/ddbridge-core.c b/drivers/media/pci/ddbridge/ddbridge-core.c index 9e3492e..0ac2dd3 100644 --- a/drivers/media/pci/ddbridge/ddbridge-core.c +++ b/drivers/media/pci/ddbridge/ddbridge-core.c @@ -1630,7 +1630,8 @@ fail1: printk(KERN_ERR "fail1\n"); if (dev->msi) pci_disable_msi(dev->pdev); - free_irq(dev->pdev->irq, dev); + if (stat == 0) + free_irq(dev->pdev->irq, dev); fail: printk(KERN_ERR "fail\n"); ddb_unmap(dev);