From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id F2F9CC04A68 for ; Sat, 30 Jul 2022 11:52:21 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233629AbiG3LtM (ORCPT ); Sat, 30 Jul 2022 07:49:12 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53250 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230135AbiG3LtK (ORCPT ); Sat, 30 Jul 2022 07:49:10 -0400 Received: from mailgw02.mediatek.com (unknown [210.61.82.184]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E426B25E83 for ; Sat, 30 Jul 2022 04:49:05 -0700 (PDT) X-UUID: d4e95e81f5004808b70140b5086c7ad3-20220730 X-CID-P-RULE: Release_Ham X-CID-O-INFO: VERSION:1.1.8,REQID:f9710841-b696-4ed5-8479-505822299514,OB:0,LO B:0,IP:0,URL:5,TC:0,Content:-5,EDM:0,RT:0,SF:0,FILE:0,RULE:Release_Ham,ACT ION:release,TS:0 X-CID-META: VersionHash:0f94e32,CLOUDID:1badd0cf-a6cf-4fb6-be1b-c60094821ca2,C OID:IGNORED,Recheck:0,SF:nil,TC:nil,Content:0,EDM:-3,IP:nil,URL:1,File:nil ,QS:nil,BEC:nil,COL:0 X-UUID: d4e95e81f5004808b70140b5086c7ad3-20220730 Received: from mtkmbs11n1.mediatek.inc [(172.21.101.185)] by mailgw02.mediatek.com (envelope-from ) (Generic MTA with TLSv1.2 ECDHE-RSA-AES256-GCM-SHA384 256/256) with ESMTP id 1945181272; Sat, 30 Jul 2022 19:49:02 +0800 Received: from mtkmbs11n2.mediatek.inc (172.21.101.187) by mtkmbs10n2.mediatek.inc (172.21.101.183) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.792.3; Sat, 30 Jul 2022 19:49:00 +0800 Received: from mbjsdccf07.mediatek.inc (10.15.20.246) by mtkmbs11n2.mediatek.inc (172.21.101.73) with Microsoft SMTP Server id 15.2.792.15 via Frontend Transport; Sat, 30 Jul 2022 19:48:59 +0800 From: To: Christoph Hellwig , Robin Murphy , "Marek Szyprowski" , Matthias Brugger , "open list:DMA MAPPING HELPERS" , open list , "moderated list:ARM/Mediatek SoC support" , "moderated list:ARM/Mediatek SoC support" CC: , Libo Kang , Ning Li , Yong Wu , Miles Chen , Yunfei Wang , jianjiao zeng Subject: [PATCH] dma-debug: Fix overflow issue in bucket_find_contain Date: Sat, 30 Jul 2022 19:41:45 +0800 Message-ID: <20220730114146.32669-1-yf.wang@mediatek.com> X-Mailer: git-send-email 2.18.0 MIME-Version: 1.0 Content-Type: text/plain X-MTK: N Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Yunfei Wang There are two issue: 1. If max_rang is set to 0xFFFF_FFFF, and __hash_bucket_find always returns NULL, the rang will be accumulated. When rang is accumulated to 0xFFFF_E000, after executing rang += (1 << HASH_FN_SHIFT) again, rang will overflow to 0, making it impossible to exit the while loop. 2. dev_addr reduce maybe overflow. So, add range and dev_addr check to avoid overflow. Signed-off-by: jianjiao zeng Signed-off-by: Yunfei Wang --- kernel/dma/debug.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/kernel/dma/debug.c b/kernel/dma/debug.c index ad731f7858c9..9d7d54cd4c63 100644 --- a/kernel/dma/debug.c +++ b/kernel/dma/debug.c @@ -352,6 +352,7 @@ static struct dma_debug_entry *bucket_find_contain(struct hash_bucket **bucket, unsigned int max_range = dma_get_max_seg_size(ref->dev); struct dma_debug_entry *entry, index = *ref; + unsigned int shift = (1 << HASH_FN_SHIFT); unsigned int range = 0; while (range <= max_range) { @@ -360,12 +361,15 @@ static struct dma_debug_entry *bucket_find_contain(struct hash_bucket **bucket, if (entry) return entry; + if (max_range - range < shift || index.dev_addr < shift) + return NULL; + /* * Nothing found, go back a hash bucket */ put_hash_bucket(*bucket, *flags); - range += (1 << HASH_FN_SHIFT); - index.dev_addr -= (1 << HASH_FN_SHIFT); + range += shift; + index.dev_addr -= shift; *bucket = get_hash_bucket(&index, flags); } -- 2.18.0 From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id EE9FBC04A68 for ; Sat, 30 Jul 2022 12:50:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:Message-ID:Date:Subject:CC :To:From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References: List-Owner; bh=jU1ND/nqt4cyLJjBmBLOWCbE3+X66v90syES7BiwhoA=; b=Xi+apCyvxpqvGL tYPJazdgIzyL+xESrYzqTH5MkgV15b2IlY+p3dIc5JVzwiT7443pWdkhsKhiZ6/vPMqsf7dGLouQQ a0kHwBegKSuK49Y7zXJn2OMVOW0B3ldvlpfAASEuefeUpPfKoWCpj4spPJ7IMJUyy7eJ7CI9lGm+I Z9TbaUWK2RychVDbxs2NQGzdZNrWqVNa88bUnvIbN3WWAqQpPC3A2LM+fm2uRNm/ws0hTyyxlGVjK XdBBNnGTBxgWFjCLEHxd6S6Je01OSfaeRwwjedoe2hBdx4qT2yp0ehVy/GvmYjZA1aP/gT92WI4cH rEwl7R9h8MbZX7ZL/fRA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1oHluC-000eyR-2r; Sat, 30 Jul 2022 12:49:20 +0000 Received: from mailgw01.mediatek.com ([216.200.240.184]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1oHlu5-000etS-85; Sat, 30 Jul 2022 12:49:16 +0000 X-UUID: 0733cd2b41f14e4e981ad96617edebe4-20220730 X-CID-P-RULE: Release_Ham X-CID-O-INFO: VERSION:1.1.8,REQID:cc5f9a5e-b062-4e91-994a-f6c1fc7ca3f9,OB:0,LO B:0,IP:0,URL:5,TC:0,Content:-5,EDM:0,RT:0,SF:0,FILE:0,RULE:Release_Ham,ACT ION:release,TS:0 X-CID-META: VersionHash:0f94e32,CLOUDID:3293c1d0-841b-4e95-ad42-8f86e18f54fc,C OID:IGNORED,Recheck:0,SF:nil,TC:nil,Content:0,EDM:-3,IP:nil,URL:1,File:nil ,QS:nil,BEC:nil,COL:0 X-UUID: 0733cd2b41f14e4e981ad96617edebe4-20220730 Received: from mtkmbs11n1.mediatek.inc [(172.21.101.185)] by mailgw01.mediatek.com (envelope-from ) (musrelay.mediatek.com ESMTP with TLSv1.2 ECDHE-RSA-AES256-GCM-SHA384 256/256) with ESMTP id 1043909512; Sat, 30 Jul 2022 05:49:05 -0700 Received: from mtkmbs11n2.mediatek.inc (172.21.101.187) by mtkmbs10n2.mediatek.inc (172.21.101.183) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.792.3; Sat, 30 Jul 2022 19:49:00 +0800 Received: from mbjsdccf07.mediatek.inc (10.15.20.246) by mtkmbs11n2.mediatek.inc (172.21.101.73) with Microsoft SMTP Server id 15.2.792.15 via Frontend Transport; Sat, 30 Jul 2022 19:48:59 +0800 From: To: Christoph Hellwig , Robin Murphy , "Marek Szyprowski" , Matthias Brugger , "open list:DMA MAPPING HELPERS" , open list , "moderated list:ARM/Mediatek SoC support" , "moderated list:ARM/Mediatek SoC support" CC: , Libo Kang , Ning Li , Yong Wu , Miles Chen , Yunfei Wang , jianjiao zeng Subject: [PATCH] dma-debug: Fix overflow issue in bucket_find_contain Date: Sat, 30 Jul 2022 19:41:45 +0800 Message-ID: <20220730114146.32669-1-yf.wang@mediatek.com> X-Mailer: git-send-email 2.18.0 MIME-Version: 1.0 X-MTK: N X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220730_054913_298651_9E6324F2 X-CRM114-Status: GOOD ( 13.48 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org From: Yunfei Wang There are two issue: 1. If max_rang is set to 0xFFFF_FFFF, and __hash_bucket_find always returns NULL, the rang will be accumulated. When rang is accumulated to 0xFFFF_E000, after executing rang += (1 << HASH_FN_SHIFT) again, rang will overflow to 0, making it impossible to exit the while loop. 2. dev_addr reduce maybe overflow. So, add range and dev_addr check to avoid overflow. Signed-off-by: jianjiao zeng Signed-off-by: Yunfei Wang --- kernel/dma/debug.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/kernel/dma/debug.c b/kernel/dma/debug.c index ad731f7858c9..9d7d54cd4c63 100644 --- a/kernel/dma/debug.c +++ b/kernel/dma/debug.c @@ -352,6 +352,7 @@ static struct dma_debug_entry *bucket_find_contain(struct hash_bucket **bucket, unsigned int max_range = dma_get_max_seg_size(ref->dev); struct dma_debug_entry *entry, index = *ref; + unsigned int shift = (1 << HASH_FN_SHIFT); unsigned int range = 0; while (range <= max_range) { @@ -360,12 +361,15 @@ static struct dma_debug_entry *bucket_find_contain(struct hash_bucket **bucket, if (entry) return entry; + if (max_range - range < shift || index.dev_addr < shift) + return NULL; + /* * Nothing found, go back a hash bucket */ put_hash_bucket(*bucket, *flags); - range += (1 << HASH_FN_SHIFT); - index.dev_addr -= (1 << HASH_FN_SHIFT); + range += shift; + index.dev_addr -= shift; *bucket = get_hash_bucket(&index, flags); } -- 2.18.0 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel