Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
From:   vdasa@vmware.com
To:     linux-kernel@vger.kernel.org,
        virtualization@lists.linux-foundation.org
Cc:     gregkh@linuxfoundation.org, pv-drivers@vmware.com,
        bryantan@vmware.com, rjalisatgi@vmware.com,
        Vishnu Dasa <vdasa@vmware.com>,
        Dan Carpenter <dan.carpenter@oracle.com>
Subject: [PATCH RESEND] VMCI: Check exclusive_vectors when freeing interrupt 1
Date:   Thu, 17 Mar 2022 22:58:43 -0700
Message-Id: <20220318055843.30606-1-vdasa@vmware.com>
Reply-To: vdasa@vmware.com
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?6MV6gw46DNlf7sPR2iXuU65v0wfiMldYolOsVxV7li/HlDa0nmZ7qCxZn1Y9?=
 =?us-ascii?Q?/I0y20SRizxVEVlbFG5i7igIRkeLWPuEZAqyvnFQGVEdgQuYUA7C170U9iis?=
 =?us-ascii?Q?lIs2p+oQ7/LhQ+EfL3JTJJ3XGpzxgLubCm7bQf+rYI0HlvQ0Wz+5oY9R8UDk?=
 =?us-ascii?Q?4dQ2bAnAQSAK5cjtQivmXx0LIVSEJ/2qWJ/7L+NvY7sDr9nrNcpbeSNgO1E3?=
 =?us-ascii?Q?9kflDMjAWgPyhcxM4bUFKrsG7lMjHM/E/OTorVaOMU7tMAZuiYKccwzfaGUp?=
 =?us-ascii?Q?2v89k+56Ucz6//FyNrvimwcZ+EzBA7sCdrASAtzOlRW2VeCtLI5Bjuyuo287?=
 =?us-ascii?Q?eLbdA17BTauVnSYD36vfd+/ep32vXq2XKvNhq8Nog4ZkXpeOIdV/7KV3zEOb?=
 =?us-ascii?Q?aQx+SVkFLZYefj8FpKFaBtSdZlID82lRagIioYGK+o9oJdBuyF/5tpmWa8vX?=
 =?us-ascii?Q?VmpqtTdV3tUDFGtPIHv9QClFkzvVNUrue8uPVQxd1AtH7+HvzeYkCTSd7rUu?=
 =?us-ascii?Q?jvrnATgSv9+Or39WxnZYAU4Tx0pjCnD34Oy52Chj2LSVgMu2oGiTDdFxvKYC?=
 =?us-ascii?Q?nw0Bz/f2joBSTqTOwkelbmkMjkNSPgLz0GjPHth5daNCYQERnqYCW/o6fWFu?=
 =?us-ascii?Q?19mvXBngvaPftEoS6i6Ir9Q7ExZisdhnyYVHe7OkiLhJEsCpWwl34HiJlfYZ?=
 =?us-ascii?Q?/mHNMYDmMLcUooZb7ef14uFUiq/gKcZ5OIzoaPHt8lplzQyzw7LhZZsn/io/?=
 =?us-ascii?Q?Zj/5PairQfz89SrG2GrRnqBieQgrWUrpg48iEDxPftC8B/DZ9Fu3Kx2XyMzc?=
 =?us-ascii?Q?x+0lM6+8om02jFLkfa2mK4xJ3zBA05Do2QG7sOMFqT1OwZGrbSW9OA5rnSmF?=
 =?us-ascii?Q?yEePXr0P3FEM5g+d/KArHVoAWDLvyhwiZ8S3EiAvixFdW8tZKZJhzFqYdm4E?=
 =?us-ascii?Q?yOtMnpQG6Tz2Bszrj+4tLiotqnbqvd1iMBL0ZWVwu2p6fFPAnE2dQa7N/gMP?=
 =?us-ascii?Q?+ydj6YLytThL0feZPdlGu7bmUtOX0Yv1a5/2A/Q3XCw4W6D1B0NeWO6r3eV8?=
 =?us-ascii?Q?fOcmQ2QEDEcDxLAtpXTv3AFiVZsqdgyuF/pAF8oDsdF8gHwSEDK/nJvdopL4?=
 =?us-ascii?Q?IgqwO53AD1Cw8kNKXOOAjFheTZVf80ouGFyRAgfC+R386atY5AywOA+LJUPq?=
 =?us-ascii?Q?bnJVIdCwc5Cb+I5MTMbCdZqI3/4HvBZ///5s2t8Aav17UEBzvzuh+RCU0x4D?=
 =?us-ascii?Q?P6aM5ds6PxBiOe6dRhJnnsswHGCSCdzr4dtGWzPGG4pqj+v+w/E4iqCUUln5?=
 =?us-ascii?Q?Kzq85mzY0J9j4GB5ZAPd1XmYK+WlCN99414qYmciJfx3+naJD3uzl/p0hVx9?=
 =?us-ascii?Q?gT8bm6e+ID8ZsX9VBOBbEKl/3LvC5vz5s21M/6u52oM1H+Vas+oKn0JYHj0B?=
 =?us-ascii?Q?4YKbnNyWOiWUWo0X8yrgn4iYXaIi+qpZ?=
X-OriginatorOrg: vmware.com
X-MS-Exchange-CrossTenant-Network-Message-Id: f7c9e37f-e8c8-45db-b3d7-08da08a469a0
X-MS-Exchange-CrossTenant-AuthSource: BYAPR05MB3960.namprd05.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Mar 2022 05:59:06.9425
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: b39138ca-3cee-4b4a-a4d6-cd83d9dd62f0
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: KoEqnC2ynirtPCGuZCovj7v4XXX0JVgUkxF2bOytBHvkv3izgeBAl4dahFP0PHqjHrc0O1mPEdFD6Ih2MAJqMw==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: BL0PR05MB4884
X-Spam-Status: No, score=-2.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH,
        DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FORGED_SPF_HELO,
        RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,SPF_NONE,
        T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on
        lindbergh.monkeyblade.net
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

From: Vishnu Dasa <vdasa@vmware.com>

free_irq() may be called to free an interrupt that was not
allocated.  Add missing 'if' statement to check for
exclusive_vectors when freeing interrupt 1.

Fixes: cc68f2177fcb ("VMCI: dma dg: register dummy IRQ handlers for DMA datagrams")
Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
Reviewed-by: Bryan Tan <bryantan@vmware.com>
Reviewed-by: Rajesh Jalisatgi <rjalisatgi@vmware.com>
Signed-off-by: Vishnu Dasa <vdasa@vmware.com>
---
 drivers/misc/vmw_vmci/vmci_guest.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/drivers/misc/vmw_vmci/vmci_guest.c b/drivers/misc/vmw_vmci/vmci_guest.c
index 6596a54daa88..57a6157209a1 100644
--- a/drivers/misc/vmw_vmci/vmci_guest.c
+++ b/drivers/misc/vmw_vmci/vmci_guest.c
@@ -862,7 +862,9 @@ static int vmci_guest_probe_device(struct pci_dev *pdev,
 	return 0;
 
 err_free_bm_irq:
-	free_irq(pci_irq_vector(pdev, 1), vmci_dev);
+	if (vmci_dev->exclusive_vectors)
+		free_irq(pci_irq_vector(pdev, 1), vmci_dev);
+
 err_free_irq:
 	free_irq(pci_irq_vector(pdev, 0), vmci_dev);
 	tasklet_kill(&vmci_dev->datagram_tasklet);
-- 
2.25.1