Received: by 2002:a05:6a10:206:0:0:0:0 with SMTP id 6csp2651559pxj; Mon, 14 Jun 2021 04:04:53 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzpwjn9fN6UoG59Y4WLI9DhPXKJngYfoQ8snsQHFx27iGio5Z1ZfCRrGCP/y3Orw8bXF/z2 X-Received: by 2002:a05:6402:10d7:: with SMTP id p23mr16133059edu.74.1623668692829; Mon, 14 Jun 2021 04:04:52 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1623668692; cv=none; d=google.com; s=arc-20160816; b=cvfkAda88Uy5MtngLrdc6do/7LLEJNv4JbeJmQ5mypBMg+cTAydPPzEjV3uZYmYKb5 wvBjApscYoKAOwHPkJncvlN2wf+qXUoiu7btp5DFcmbRbRUIZhyHIzuBsDC7DwLmii8o EnqRYpUSwGVbtha2oaFKBPx3VZUeKY/4V9rsTVRd1w0byORrQz+x1JRU4YmuNVpcpruB 0hmQeB9liOcssv6gV+WxR4HCIg5HIRaMf9aurKlYD5czSOEr1Ftbpo+m52lvqdQl+6t7 tcCjrB9BGNo7THnyyxOdwKKE53nTbfdcQ5BB/L6pSDxbdRloyftCTMLV6klE0BTQCUUu 7xPQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=ysVQ6CLY7vfIxVr6SQP3cQy+z4qALK/dPv+r9IVS5EE=; b=vfQdviGV6xbPjgOBQ5uSuNzK9zwRygFt1JXL098e0e66tXPEoWk8C6/abvo8L3hUMe vowCxncMTCiGl+ngyOCZDw6M0Z0BG1d9apCChCoeB7WhC/zy1SZ6oUv95nMv7X/XW2RL Z6VAq1iWiltLyzk7CR47qYUAQFHPrRLsMK9jJEWw4obEv7bc2RpsB9qsP9+WDZs3FPYD QmhMH9H9tZNbsDqy8Nfhu9OwutR5p1NW+nB8w+neXTr+BgynwABfDxywXKPPcAzoDU2M f2bD+DQevJ+ocoMY979c1y4phQK40jVkIIa9mgVh7YpTmy6oVv/GQUsi4Kbf2P6tPcR2 MAbA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=r9aJDnmm; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id m19si5466911edd.117.2021.06.14.04.04.30; Mon, 14 Jun 2021 04:04:52 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=r9aJDnmm; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234134AbhFNLC2 (ORCPT + 99 others); Mon, 14 Jun 2021 07:02:28 -0400 Received: from mail.kernel.org ([198.145.29.99]:59282 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234186AbhFNKxo (ORCPT ); Mon, 14 Jun 2021 06:53:44 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 20EED613FA; Mon, 14 Jun 2021 10:39:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1623667198; bh=ybWbKRT6SyVWjItDV8O6L3KrhsfiBNd/ktFe2SWzlMc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=r9aJDnmmZMl3EZfFvUHR5o1uIWOXvBpX2R/hF5mkvWYUbUlggdE4sAG5v75nehXEX jjiGR7rmwmwLwgnFcHTCGhNiJtimjY/pccYaD0xG1n70cX80CkqoXgwCIxusyFWamW SiIoO/X3Yr3v5yM6eZVZPB++9wqrPrH6AQYGSMBU= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Hulk Robot , John Garry , Yang Yingliang , "Martin K. Petersen" , Sasha Levin Subject: [PATCH 5.4 21/84] scsi: hisi_sas: Drop free_irq() of devm_request_irq() allocated irq Date: Mon, 14 Jun 2021 12:26:59 +0200 Message-Id: <20210614102647.076448603@linuxfoundation.org> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210614102646.341387537@linuxfoundation.org> References: <20210614102646.341387537@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Yang Yingliang [ Upstream commit 7907a021e4bbfa29cccacd2ba2dade894d9a7d4c ] irqs allocated with devm_request_irq() should not be freed using free_irq(). Doing so causes a dangling pointer and a subsequent double free. Link: https://lore.kernel.org/r/20210519130519.2661938-1-yangyingliang@huawei.com Reported-by: Hulk Robot Acked-by: John Garry Signed-off-by: Yang Yingliang Signed-off-by: Martin K. Petersen Signed-off-by: Sasha Levin --- drivers/scsi/hisi_sas/hisi_sas_v3_hw.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/scsi/hisi_sas/hisi_sas_v3_hw.c b/drivers/scsi/hisi_sas/hisi_sas_v3_hw.c index 723f51c822af..916447f3c607 100644 --- a/drivers/scsi/hisi_sas/hisi_sas_v3_hw.c +++ b/drivers/scsi/hisi_sas/hisi_sas_v3_hw.c @@ -3274,14 +3274,14 @@ hisi_sas_v3_destroy_irqs(struct pci_dev *pdev, struct hisi_hba *hisi_hba) { int i; - free_irq(pci_irq_vector(pdev, 1), hisi_hba); - free_irq(pci_irq_vector(pdev, 2), hisi_hba); - free_irq(pci_irq_vector(pdev, 11), hisi_hba); + devm_free_irq(&pdev->dev, pci_irq_vector(pdev, 1), hisi_hba); + devm_free_irq(&pdev->dev, pci_irq_vector(pdev, 2), hisi_hba); + devm_free_irq(&pdev->dev, pci_irq_vector(pdev, 11), hisi_hba); for (i = 0; i < hisi_hba->cq_nvecs; i++) { struct hisi_sas_cq *cq = &hisi_hba->cq[i]; int nr = hisi_sas_intr_conv ? 16 : 16 + i; - free_irq(pci_irq_vector(pdev, nr), cq); + devm_free_irq(&pdev->dev, pci_irq_vector(pdev, nr), cq); } pci_free_irq_vectors(pdev); } -- 2.30.2