From patchwork Tue Jun 14 19:06:16 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tim Gardner X-Patchwork-Id: 1643393 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=canonical.com header.i=@canonical.com header.a=rsa-sha256 header.s=20210705 header.b=K66HD03+; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.ubuntu.com (client-ip=91.189.94.19; helo=huckleberry.canonical.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=) Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4LMybh2ZWWz9vFN for ; Wed, 15 Jun 2022 05:06:56 +1000 (AEST) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1o1BsG-0007gh-Az; Tue, 14 Jun 2022 19:06:48 +0000 Received: from smtp-relay-internal-0.internal ([10.131.114.225] helo=smtp-relay-internal-0.canonical.com) by huckleberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1o1Bs4-0007MP-7K for kernel-team@lists.ubuntu.com; Tue, 14 Jun 2022 19:06:36 +0000 Received: from mail-pl1-f200.google.com (mail-pl1-f200.google.com [209.85.214.200]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-internal-0.canonical.com (Postfix) with ESMTPS id 149BF3F1A3 for ; Tue, 14 Jun 2022 19:06:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1655233594; bh=ZYktx3FctldOxaNMSkNLy2DdUJZaRfaEJ0oytM/kBMM=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=K66HD03+QgCWMCkgmt4lyjASpPVAWPY1460TSBpL8Fa7BTibDMdKLhlNk1AweTVVP OD78kl2NQusrFhSsFhPMu2dEtM7yAw4cSC/FxuHBGqjkKB8Xy/PD666R06srTFGBGT LbuSgk80XEzwkaVce0PCBTBADeWT/+1gsysVn00Ak02hu0JCK4bqjFlCLI9cOT7tSb CQzNBs+p1HBB6GwoxfWPIKvgsr4MOH6eLJljVw/rQJlg6JJ4UvtNTTlgg6HgQhZRym YFZK7n/45YpxYwrxZO1/PMEuAQgrq7MBU/SivQ0YVvPK2JmF930RGEBFfn+Yk9/7Vs 6qzQhdLJ2s99Q== Received: by mail-pl1-f200.google.com with SMTP id p2-20020a170902e74200b00164081f682cso5252848plf.16 for ; Tue, 14 Jun 2022 12:06:34 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=ZYktx3FctldOxaNMSkNLy2DdUJZaRfaEJ0oytM/kBMM=; b=D7dmkuzCUZ+BYOYbtTXgQL0qlWHCiVNrvSATvHNengdkkas9+rtLHogPwffHt0/9EU sGwXu5kX0ssCQs2EQI0U+0umQMSIlvntGZsKr5LghptoeYGNhW/jzJjGDvc34PSYGV8h OLideqsoY/emWlm0enQW9L3e+tkZkSxN7YiD6WFrnZwZof7zPtx9PPMjgKfymuwM/bv+ Jf6IrTGIFhNUQe0bU7/rPo/1vvJOaOIB2a5kLilvA5uctC6JbEMCvx9LOlfSDMuEHk06 0aIYl/GDx7NEpg3KW4rQgkJO2992alPTvUInM/jMyY/qxC8npjLEQNazhRjfUnSnoJdp eWBQ== X-Gm-Message-State: AOAM531qDxzWB55dw0DQ28DI+G6EqJWY6nxJoMscfKHkkyBlbFMDARtU B0QhmkndvifwCycjkw+fTy344bN05eS+wO7fO8uu3CpcaJ7CtWpeOXgA3M9aB7cCbOpHIwrxLde zQ6d+kIGEVu76xw0y3wrpcnFTKuYThbkgRq0M+lz1ZA== X-Received: by 2002:a05:6a00:4211:b0:51c:45e:532b with SMTP id cd17-20020a056a00421100b0051c045e532bmr6023680pfb.10.1655233593317; Tue, 14 Jun 2022 12:06:33 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyZgVdpz1KixTQXs1q/6dVEbZ28zdb+4PwLscr/y4mCIT3RzbyQGcJUharmWLm2qjhMS7KG/g== X-Received: by 2002:a05:6a00:4211:b0:51c:45e:532b with SMTP id cd17-20020a056a00421100b0051c045e532bmr6023656pfb.10.1655233592974; Tue, 14 Jun 2022 12:06:32 -0700 (PDT) Received: from localhost.localdomain ([69.163.84.166]) by smtp.gmail.com with ESMTPSA id c15-20020a62f84f000000b0051ba97b788bsm2293090pfm.27.2022.06.14.12.06.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 14 Jun 2022 12:06:32 -0700 (PDT) From: Tim Gardner To: kernel-team@lists.ubuntu.com Subject: [PATCH 11/13] VMCI: Check exclusive_vectors when freeing interrupt 1 Date: Tue, 14 Jun 2022 13:06:16 -0600 Message-Id: <20220614190618.15053-12-tim.gardner@canonical.com> X-Mailer: git-send-email 2.36.1 In-Reply-To: <20220614190618.15053-1-tim.gardner@canonical.com> References: <20220614190618.15053-1-tim.gardner@canonical.com> MIME-Version: 1.0 X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" From: Vishnu Dasa BugLink: https://bugs.launchpad.net/bugs/1978145 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 Reviewed-by: Bryan Tan Reviewed-by: Rajesh Jalisatgi Signed-off-by: Vishnu Dasa Link: https://lore.kernel.org/r/20220318055843.30606-1-vdasa@vmware.com Signed-off-by: Greg Kroah-Hartman (cherry picked from commit 5df0e734b8c39598effe0f17e5bd8ff7748a0693) Signed-off-by: Tim Gardner --- 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 3fcbf07517ae..a226d638d11c 100644 --- a/drivers/misc/vmw_vmci/vmci_guest.c +++ b/drivers/misc/vmw_vmci/vmci_guest.c @@ -864,7 +864,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);