From patchwork Fri Dec 30 08:31:00 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Miaoqian Lin X-Patchwork-Id: 37611 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4e01:0:0:0:0:0 with SMTP id p1csp2791642wrt; Fri, 30 Dec 2022 00:41:48 -0800 (PST) X-Google-Smtp-Source: AMrXdXtRRY9PtqBiEgkGbhB0GX1g0cwN/O/aXAfjOFqWrpbF8YFReFaK2Mr0ttJibay5zJ5D/LQp X-Received: by 2002:a05:6a20:a59c:b0:a2:17a6:3e86 with SMTP id bc28-20020a056a20a59c00b000a217a63e86mr38318905pzb.55.1672389708501; Fri, 30 Dec 2022 00:41:48 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1672389708; cv=none; d=google.com; s=arc-20160816; b=Or7HqyumKIwJxL0Zg6wGr3NvWx2b8b75dlBzO+jshB6u1V4aIq08vBbQ/yaPcVevV5 myvGpBnEq4J/L9Bag1oCK23ZWdKNMBvSwZQTD/+9H1dfTeCWn6dCeneL9rAYBLmp3rPq GuCz3amX7w7VRhUF5fIn71FsKsuVobX6hZP04EV2Of5JuUXP1FxxkbEw9leHfqzWmLqu EnuOYnnPDiS5uC7zRp8kFGyvvp6xrwLlNsmfzCubpjJ65b8F/NkYG8LXajojCC2xDME0 0ggN+HsSFnBDqhrXigmYe32bRzWwQB8IwZ8fSTkbx59F11kTaSOh49veE3+bGrGyfziB A3fg== 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 :message-id:date:subject:cc:to:from:dkim-signature; bh=HPSc5CLczFof6Az09YQrNvJzlEU7+w21O5dXtl4mqyk=; b=Tr3hzpZjTHuug3GZcUiVDnTabuNkfzhc1mkju1Whza+BWLnwmkUIPmH75TrPIp+jND sqFjHcnL7IQqW85YDg9YaYDQkTymMOPl53K7fYuN9/GREGYxNJ1lPRo/gUakskGD787z zy4EUiDzXNnPyqgCDhTM1GwmQn78IxoEZx25Soqd4Bc7jZiNVcJqo21QEvfm4DRsLblc 2fpnT4GUwnkOCNGRgTvFbKHvaP6wATlw8IQtgknIJDDpa6ybkuVro4iNaXOzBMOW6nIj 4PUw/5c62ZYnYDPnDNOlAgRHRxw4RMHVZxGWsBBc77LSWYf+FbYUlZv+a8ik4I0wRzjC zvIQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20210112 header.b=lMGhHsMv; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id p34-20020a634f62000000b00477f5addc5dsi21643794pgl.487.2022.12.30.00.41.36; Fri, 30 Dec 2022 00:41:48 -0800 (PST) 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; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20210112 header.b=lMGhHsMv; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234830AbiL3Ibg (ORCPT + 99 others); Fri, 30 Dec 2022 03:31:36 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48602 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234529AbiL3Ibd (ORCPT ); Fri, 30 Dec 2022 03:31:33 -0500 Received: from mail-pf1-x42f.google.com (mail-pf1-x42f.google.com [IPv6:2607:f8b0:4864:20::42f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3CF52F4B for ; Fri, 30 Dec 2022 00:31:32 -0800 (PST) Received: by mail-pf1-x42f.google.com with SMTP id 18so1894997pfx.7 for ; Fri, 30 Dec 2022 00:31:32 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=HPSc5CLczFof6Az09YQrNvJzlEU7+w21O5dXtl4mqyk=; b=lMGhHsMvJXqUL1WfSWtNrtoqQ6vbQ8zSMbNi4ZfLr6yGd+iI9hh2xm4OY8u6H0Go1a CRiG/cfzwsPXQBIKH0SNonLyEto/TmbUZtxEFKTtqIYL66ODBGy0t4WXObCEICe3kDGR 8YRC4yRX/fhYyCflh9NNuUvujL/14pnsIISl0GQerrQRob8bRGlyVcutFiYh9C8KUjdL VbiLNF1sse3ZJoGI/Wvw+ZNu4HUap0FfEfHaBX1uNsAkyuEZSVgQ80sj1Q3YLo7rgnLo xZ2pxM4v2cGvbNPgTPF/11XWj/vW70W8z/kP3EnBjVJB+hw4e4VGS+OM3TbIkUvvuOIF EvEQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=HPSc5CLczFof6Az09YQrNvJzlEU7+w21O5dXtl4mqyk=; b=deP1tfBWXKjTe5XEeHZjQYbtEyC+Fa4Z35egUHtBcLydi7hvR24vnRfF91XdPgI5E/ k7cOc88J/KQw68ZRQNlfQeGvW5QWfb5aHj0x+c99ICaaNGAZAMJYuFhOgypqmGpstZ9D b7OaYEm8637Qknwe05Wfp9clU9uMzSeIo4PkkHyQe38XDzJZhNnkEHf325sFHvabpWeJ eEWuCoWiypwMg7GmJFVRz6YYsG1kgzufGhk9PtblRYYjyhgwUVZKLym2afWsDDVnbSt8 cMZ9ZkpsHIqjjGq33nC3zoH4ECHbC4XuC3TVeMTt06VxkJqdVQcOC5cpDSImbh1DI4+j EocA== X-Gm-Message-State: AFqh2kplSRi1lhcArbFSAunysYbS73qkiBxz46+DdCLDJ8I+K4g8HCqG ZPiVTKcsJEFQ77OH3rowFc0= X-Received: by 2002:a62:404:0:b0:581:91d1:3cc4 with SMTP id 4-20020a620404000000b0058191d13cc4mr8260380pfe.7.1672389091733; Fri, 30 Dec 2022 00:31:31 -0800 (PST) Received: from localhost.localdomain ([202.120.234.246]) by smtp.googlemail.com with ESMTPSA id 68-20020a621947000000b00580e679dcf2sm10182227pfz.157.2022.12.30.00.31.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 30 Dec 2022 00:31:31 -0800 (PST) From: Miaoqian Lin To: Joerg Roedel , Will Deacon , Robin Murphy , Lu Baolu , Kevin Tian , Eric Auger , Jason Gunthorpe , iommu@lists.linux.dev, linux-kernel@vger.kernel.org Cc: linmq006@gmail.com Subject: [PATCH] iommu: Fix refcount leak in iommu_device_claim_dma_owner Date: Fri, 30 Dec 2022 12:31:00 +0400 Message-Id: <20221230083100.1489569-1-linmq006@gmail.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 X-Spam-Status: No, score=-1.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_ENVFROM_END_DIGIT, FREEMAIL_FROM,RCVD_IN_DNSWL_NONE,SPF_HELO_NONE,SPF_PASS 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: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1753627711205597314?= X-GMAIL-MSGID: =?utf-8?q?1753627711205597314?= iommu_group_get() returns the group with the reference incremented. Move iommu_group_get() after owner check to fix the refcount leak. Fixes: 89395ccedbc1 ("iommu: Add device-centric DMA ownership interfaces") Signed-off-by: Miaoqian Lin Reviewed-by: Lu Baolu --- drivers/iommu/iommu.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/drivers/iommu/iommu.c b/drivers/iommu/iommu.c index de91dd88705b..3a7dd8b61fab 100644 --- a/drivers/iommu/iommu.c +++ b/drivers/iommu/iommu.c @@ -3185,14 +3185,16 @@ EXPORT_SYMBOL_GPL(iommu_group_claim_dma_owner); */ int iommu_device_claim_dma_owner(struct device *dev, void *owner) { - struct iommu_group *group = iommu_group_get(dev); + struct iommu_group *group = NULL; int ret = 0; - if (!group) - return -ENODEV; if (WARN_ON(!owner)) return -EINVAL; + group = iommu_group_get(dev); + if (!group) + return -ENODEV; + mutex_lock(&group->mutex); if (group->owner_cnt) { if (group->owner != owner) {