From patchwork Mon Oct 24 11:31:15 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 8498 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp404029wru; Mon, 24 Oct 2022 04:54:03 -0700 (PDT) X-Google-Smtp-Source: AMsMyM4G7Zez0sqUFR3k/wF1saZrCrTIkTqEoFiFK9fWi0XHH1Q1cRuwqlDv234vxdGJF5dudEfw X-Received: by 2002:a05:6a00:a21:b0:562:99d6:c30a with SMTP id p33-20020a056a000a2100b0056299d6c30amr31874185pfh.35.1666612432980; Mon, 24 Oct 2022 04:53:52 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666612432; cv=none; d=google.com; s=arc-20160816; b=B2B4/IHvoHtEviscy/aOC1FUpgvLMhUqeZjqeTbtL3YRwEZUtrfCKimz09+hUO8MMf 5S8JSTapiKQTqBA4t632koEj8/ZQ9oc0KIy3uZhs0vNoe6KfVgcbYIT8e4FOiZVoiH1+ VYbolVcftCdFaHNF6vdBvF6LYfItt91UBkTGAN4pkHBKmQmyv5pXUvJM7Ux1lluGHvdI XBUdj0nqHh7t1bne+AkKHTgZpQQmQHEl67shk/TzaFaqoIdsKpR60Ujv6XXojyRgz4MO H5oY9KKk8cnsuWojj09DmivqRlFvAPCIRdry4Fa25yPKtO5MCOEDYFoyw/3YvCTR9Kau dxcA== 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=WeHYePugxGs9gQOjoxAM3s7tFisdkeMS3AyP+ihM314=; b=BN9YKusNLyezuAEAqjpiHF3T+/kJ4VI+mBuv1xP0b1QPtuzXyXHZDZn95qAMmqrQbK 3nVVmjKz7JCET5rJdfk9R3Ed9rK0D0T5p7HVbPNcfcbBhbMiELpWputKKTeYbVC8wk4n KbOnk47dginP1UjWdoM6QfC0ju8BLbf1ASryuyn/24tw6//2zBTWRMy4cXlE7mgGhPou ce0mnJUx44Jo3CohT1FglODOkht4f84yAqulxUd/oJ4kGehk7t0UgAaMaq4I8jwbIcbA Br7HLmUhKfKz7opNLsJYwoNOSnyMj1lvPWJzBNpshXGfibI2VbddVBHcnGR+/uBAYXjD jK0w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=jZeVMXD8; 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 b2-20020a170902d40200b001868431ecdbsi7999690ple.20.2022.10.24.04.53.39; Mon, 24 Oct 2022 04:53:52 -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=jZeVMXD8; 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 S232099AbiJXLxT (ORCPT + 99 others); Mon, 24 Oct 2022 07:53:19 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49382 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231983AbiJXLwi (ORCPT ); Mon, 24 Oct 2022 07:52:38 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 17DBE317FF; Mon, 24 Oct 2022 04:44:54 -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 9533D61254; Mon, 24 Oct 2022 11:44:54 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id A8801C433D7; Mon, 24 Oct 2022 11:44:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1666611894; bh=oyLbuAvGHpzGiRHM5PDQER02O7OkAB/aDBnlGorzYC8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=jZeVMXD8XRxbi/RBUKpplb+0/fo89KLU060cu/45Ly77tNLyLdo00oB55ZNs2kyou yOflB4flZSBBGNvcGf0Dsybk3m20zHT3b1VgKZiIm1PYKfluK+pGyOkhzU7gY18ug4 Ny7M2WyUPDKwD+vc+pvKKNyPorajuee+ZvMYYYEg= 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 4.9 121/159] iommu/omap: Fix buffer overflow in debugfs Date: Mon, 24 Oct 2022 13:31:15 +0200 Message-Id: <20221024112953.918265596@linuxfoundation.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221024112949.358278806@linuxfoundation.org> References: <20221024112949.358278806@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?1747569798888974988?= X-GMAIL-MSGID: =?utf-8?q?1747569798888974988?= 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 cec33e90e399..a15c4d99b888 100644 --- a/drivers/iommu/omap-iommu-debug.c +++ b/drivers/iommu/omap-iommu-debug.c @@ -35,12 +35,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