From patchwork Mon Oct 24 11:31:25 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 8813 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp431030wru; Mon, 24 Oct 2022 05:42:48 -0700 (PDT) X-Google-Smtp-Source: AMsMyM7WVhQhS/vNQDo4g+7+GRqYvdufpbm/lsqqpGPWVmDewtxsIJpmxwgJPDTnhUZwayumMR5Q X-Received: by 2002:a63:5507:0:b0:455:603a:fbd6 with SMTP id j7-20020a635507000000b00455603afbd6mr27831102pgb.360.1666615367935; Mon, 24 Oct 2022 05:42:47 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666615367; cv=none; d=google.com; s=arc-20160816; b=lxmqKCdyn0874a7erJ135pn6CW/JsGVJRSCWol7uF+F0OJ5Yi2ADCBW7w5DBv0EBhS +cs+5d5e+NiRp57o3+msN2mg3ga6rQfVfVkINvxDufgb73c0r1KREpiX7ersrQ9kOy+t SUN5fv+Ch9vROo2NcK3uSD0A325LeUvmYiZiABdXEZQD7JJ5lkaqolOAP6w4+mObfqaa eKCU/7iXrWVwAvmMoVfXEIpnGwb58SsWO0GpukDoj/78eaHgdkiOoaVJR7nGZzN4Tkto w0MveYNkk61+NI+ggx/vwujHyub88wyr4XWpIO1j9Mhqty4Jv3Oa1w0AZWvcXE97Cyte eaiQ== 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=NX3l1P7H5B1jKMveYRi8pp4KzdtsptVXdy++ScrTD3A=; b=hFM3ZjyzHJ7UpCWuovwTpuGu1QCvxgx3eHhxNiLf1XLdwrunFvfL5glx1pHlZvQgwd RQYaRbP93E3ypjGFHjItYgLwYYffpffh7L3jpP5EEYlxGT/MF1HeVHdeJUVNUifRhzYE SO3kQMiw8aHD+d0sCLCdBmgNNpkpYnkUJO4JSCNqib1KPlnjG98hMZAQxhCCVbae4aMX 0dI6DgKhBDA9bQP+SWL5NEilxGptFO0WPCMpe8FvYYnvw3Ewb3VaEMQGddKXl/zpC99t j2VC71IIxsbHHpna3O8M9NX1BidGdw8ct0fCGlPGIm1uMmCtfBhVSD7zEdi43EC+H1gE dsLg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=wyTZDyH6; 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 mz21-20020a17090b379500b00200ab48e149si7906230pjb.72.2022.10.24.05.42.33; Mon, 24 Oct 2022 05:42:47 -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=wyTZDyH6; 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 S233855AbiJXMbB (ORCPT + 99 others); Mon, 24 Oct 2022 08:31:01 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60610 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233870AbiJXM2b (ORCPT ); Mon, 24 Oct 2022 08:28:31 -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 D4AF386F9D; Mon, 24 Oct 2022 05:02:12 -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 117EA612BF; Mon, 24 Oct 2022 12:01:50 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 1B474C433C1; Mon, 24 Oct 2022 12:01:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1666612909; bh=ntOrOjNGLafpbrPL0IZcl4RkV1kMjXDeWbs/qhFGiXg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=wyTZDyH62gFc1Vda9kVD4hWKSCQy+IroJvSy77meEoAfHNHPGjk72Vqfg2DugOQVq cXbN+z/sl57KXMbcLStkgQj7PE5hloheZ1FKtY9m5t6RNcns9U2OpxHenIwZxSuh+c vv/WOWA39QxVxjeEZLsFW+Zsed3ARxN77K6ILXAM= 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.19 166/229] iommu/omap: Fix buffer overflow in debugfs Date: Mon, 24 Oct 2022 13:31:25 +0200 Message-Id: <20221024113004.450933795@linuxfoundation.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221024112959.085534368@linuxfoundation.org> References: <20221024112959.085534368@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?1747572876267332188?= X-GMAIL-MSGID: =?utf-8?q?1747572876267332188?= 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 5ce55fabc9d8..726702d01522 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