From patchwork Mon Oct 24 11:32:05 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 9472 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp480454wru; Mon, 24 Oct 2022 07:21:02 -0700 (PDT) X-Google-Smtp-Source: AMsMyM79K5ReVliPYtNp2aA5fmaEXWt5Bq718Sw8DR+x9csDTAac2vDnJB1RJTyv8VBegP/X3gjb X-Received: by 2002:a17:907:80a:b0:783:2585:5d73 with SMTP id wv10-20020a170907080a00b0078325855d73mr27991553ejb.642.1666621262541; Mon, 24 Oct 2022 07:21:02 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666621262; cv=none; d=google.com; s=arc-20160816; b=E5Ah3qirJhpTA5pQErTZE0yaT0wqd1D5kcw7cHmlW1Ar1adVBI4yLbyJdpouh99tf+ pAnxzY5x7xWXvEsKfXYuaXTESPcoeX+NLhJPP2KWL0PaE1MN0SZJHnJ8mx3Rbg2MMUzt iSAxiDq03JdAlJ920Jzg8rBTDXTNGZawoZbdlsEubL/m8hcngZSNAQ/he/rJqazdOXH9 p0M056WtBK45o6mFBdb4KSHim2Hkc/qiMA+mzbP6rce47wL7XuRDQY9vOHPdCzHQ02vJ GDmu22A9EOqfl3xzUA0wAdKDS1SMdqdOvc5wDkdDOs6v+eTGTzwmEr0Pz/rtTsND+zcI ly/A== 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=Re463ur1U2wiu9FBcNtMjBkF7WpIaychu4lKxQTsQLs=; b=RL9dG816rtohAMBDGzlNhuQsyDO+K6OE7uWC3SaioS7HubHsXMfKjAid/KJJNTipFR FgtEI9tZfbJzJwV0d8jIyMaHcDi8EalJA/IgBteT9hSzPqr8I6blAcrDjSRDmumx1l9I BVxBBQzaUpmyVdLaPTfQfexUBbuwJ+KJhpc2Suk/E8mv8lKFnkQzrCJr8cD3AM+NV04T wyPa0iT+odem/ZD4ZXmNhdRZ13kIPVNUunBchpq4rRorjf6T57XHGY3kcTwRwttcxULH lcFOjEsCu+V/wTQvWwW90hkZGMkhn1ojiwG6B49zTTjmOuHCj/Qlw5szD+Mbeohn3vo1 /mJw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=dBERYhHv; 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=NONE dis=NONE) header.from=linuxfoundation.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id k5-20020a170906578500b0078a19032c70si24815098ejq.334.2022.10.24.07.20.36; Mon, 24 Oct 2022 07:21:02 -0700 (PDT) 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=@linuxfoundation.org header.s=korg header.b=dBERYhHv; 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=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232359AbiJXOMv (ORCPT + 99 others); Mon, 24 Oct 2022 10:12:51 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55276 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236985AbiJXOJq (ORCPT ); Mon, 24 Oct 2022 10:09:46 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 956717FF8D; Mon, 24 Oct 2022 05:51:55 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 1905A612E6; Mon, 24 Oct 2022 12:49:43 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 279B1C433C1; Mon, 24 Oct 2022 12:49:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1666615782; bh=AlKGxA5oHb1mhMs88++LuDXBhLryEnVpofotGpHubyE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=dBERYhHvUSTFu2cVgHI4radf/u1rfL67pQcIRD3rtX4uB6IClLhhyLZ/rLilGiUe4 33yxzWixW3wYaTUueWb4xFxGHjVBeCvORuM9pnt/WldU3gcxy96BXsUniqZp5fHTsT sZLazToEZzD2Tn1pfFurwYm2DcI1GJILxl3unUxA= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Dan Carpenter , Robin Murphy , Laurent Pinchart , Joerg Roedel , Sasha Levin Subject: [PATCH 5.15 381/530] iommu/omap: Fix buffer overflow in debugfs Date: Mon, 24 Oct 2022 13:32:05 +0200 Message-Id: <20221024113102.302480706@linuxfoundation.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221024113044.976326639@linuxfoundation.org> References: <20221024113044.976326639@linuxfoundation.org> User-Agent: quilt/0.67 MIME-Version: 1.0 X-Spam-Status: No, score=-7.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, 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?1747579057261225492?= X-GMAIL-MSGID: =?utf-8?q?1747579057261225492?= From: Dan Carpenter [ Upstream commit 184233a5202786b20220acd2d04ddf909ef18f29 ] There are two issues here: 1) The "len" variable needs to be checked before the very first write. Otherwise if omap2_iommu_dump_ctx() with "bytes" less than 32 it is a buffer overflow. 2) The snprintf() function returns the number of bytes that *would* have been copied if there were enough space. But we want to know the number of bytes which were *actually* copied so use scnprintf() instead. Fixes: bd4396f09a4a ("iommu/omap: Consolidate OMAP IOMMU modules") Signed-off-by: Dan Carpenter Reviewed-by: Robin Murphy Reviewed-by: Laurent Pinchart Link: https://lore.kernel.org/r/YuvYh1JbE3v+abd5@kili Signed-off-by: Joerg Roedel Signed-off-by: Sasha Levin --- drivers/iommu/omap-iommu-debug.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/iommu/omap-iommu-debug.c b/drivers/iommu/omap-iommu-debug.c index a99afb5d9011..259f65291d90 100644 --- a/drivers/iommu/omap-iommu-debug.c +++ b/drivers/iommu/omap-iommu-debug.c @@ -32,12 +32,12 @@ static inline bool is_omap_iommu_detached(struct omap_iommu *obj) ssize_t bytes; \ const char *str = "%20s: %08x\n"; \ const int maxcol = 32; \ - bytes = snprintf(p, maxcol, str, __stringify(name), \ + if (len < maxcol) \ + goto out; \ + bytes = scnprintf(p, maxcol, str, __stringify(name), \ iommu_read_reg(obj, MMU_##name)); \ p += bytes; \ len -= bytes; \ - if (len < maxcol) \ - goto out; \ } while (0) static ssize_t