From patchwork Thu Sep 14 09:08:39 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Cong Liu X-Patchwork-Id: 139452 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:172:b0:3f2:4152:657d with SMTP id h50csp216308vqi; Thu, 14 Sep 2023 02:16:46 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFXMJQScYd0m6th9A9m4qJ/IamGasECKNSGYFpXvtqb7UGt1GVZS378sDYvb8Lg8ObEE4Ew X-Received: by 2002:a17:90b:1987:b0:26d:43f0:7ce4 with SMTP id mv7-20020a17090b198700b0026d43f07ce4mr4890308pjb.8.1694683005885; Thu, 14 Sep 2023 02:16:45 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1694683005; cv=none; d=google.com; s=arc-20160816; b=oIv1oyrwwoC9IACmB5lN0EM6MVRqKotp8+/NWt7fwAmsNe1wqMTvK7j631LDZBid+R Z2hSqPO79/7bKJIfmTjZYFNlkkGwAqnjrCR0eBG5lvcLlO6icCmz2rkfGkyTJNEPwgNH oncl0Wi4jdkxUHpyHmjEDpcPNrK3JTz22/G6mnLcLJf+SFTRps0vYyJhvwy3PqJXFnGy I7pJxDbT4dmcHLTN37YklQwZz3gy868fxN2ZctJXK8ywQ6DrEoXBR++djx4Kw8XYxwzF 0Fob9CiiRVNI203g9TRxrgVJM7g6ckhzH1YkX0nmgh3tEZZmRt3HaRJqj8C1TnYW9XYd POeA== 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 :references:in-reply-to:message-id:date:subject:cc:to:from; bh=wXf0/6OEydVIXgWLtpd9c0CwC5eZ7WJaibuCJ7Ekm/o=; fh=CsqMg38+YF7bw6YzTLO4vBUY2LMAyXDz+KLk6/I+n3g=; b=Tvg5VVEuxq36+cwiITtPKStAtjw2/c1IDtC54UGRXFvmPjPdibaMdl1uoyEIRKZpD8 gn3fki42H2hAbY0N9NyvUzwgh2cVmIFWWl2NpcgJqcPv8/EDkauTHzP3fctYRcrgwZbT 1mnYwkjnyJ66VHvrsMZKMP+FcLPqTKCBu0ywZ2CAztqG8Eu/rnoYZnOgSZ6VGym2PksX 4FH9vbZWYq6ojQGTz7hVHxvKkuponeEHrmx+4yOLX0kgFjxCDgj4WER3Lx5oHQn2GXQA NjwQvrKWQeqSxCGFcQ0cWBLpxjZJ93dut6pQHIStpSI+JpNmazUbjWEHvkQKP2edvGeV tvSA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.31 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from morse.vger.email (morse.vger.email. [23.128.96.31]) by mx.google.com with ESMTPS id np8-20020a17090b4c4800b0026d178be5c4si1353965pjb.109.2023.09.14.02.16.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 14 Sep 2023 02:16:45 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.31 as permitted sender) client-ip=23.128.96.31; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.31 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by morse.vger.email (Postfix) with ESMTP id 19C508113439; Thu, 14 Sep 2023 02:10:12 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at morse.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237172AbjINJKB (ORCPT + 35 others); Thu, 14 Sep 2023 05:10:01 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54128 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237228AbjINJJk (ORCPT ); Thu, 14 Sep 2023 05:09:40 -0400 Received: from mailgw.kylinos.cn (mailgw.kylinos.cn [124.126.103.232]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0F8412139; Thu, 14 Sep 2023 02:09:01 -0700 (PDT) X-UUID: 1c10806fc6a2477797bbdc4a75863193-20230914 X-CID-O-RULE: Release_Ham X-CID-RULE: Release_Ham X-CID-O-INFO: VERSION:1.1.31,REQID:c6b0fdcc-ab64-4c5c-8592-8d6db75f07b6,IP:10, URL:0,TC:0,Content:0,EDM:0,RT:0,SF:-15,FILE:0,BULK:0,RULE:Release_Ham,ACTI ON:release,TS:-5 X-CID-INFO: VERSION:1.1.31,REQID:c6b0fdcc-ab64-4c5c-8592-8d6db75f07b6,IP:10,UR L:0,TC:0,Content:0,EDM:0,RT:0,SF:-15,FILE:0,BULK:0,RULE:Release_Ham,ACTION :release,TS:-5 X-CID-META: VersionHash:0ad78a4,CLOUDID:b2eaee13-4929-4845-9571-38c601e9c3c9,B ulkID:230914170851LIPAIP83,BulkQuantity:0,Recheck:0,SF:38|24|17|19|44|102, TC:nil,Content:0,EDM:-3,IP:-2,URL:0,File:nil,Bulk:nil,QS:nil,BEC:nil,COL:0 ,OSI:0,OSA:0,AV:0,LES:1,SPR:NO,DKR:0,DKP:0,BRR:0,BRE:0 X-CID-BVR: 0 X-CID-BAS: 0,_,0,_ X-CID-FACTOR: TF_CID_SPAM_FSI,TF_CID_SPAM_SNR,TF_CID_SPAM_FAS,TF_CID_SPAM_FSD X-UUID: 1c10806fc6a2477797bbdc4a75863193-20230914 X-User: liucong2@kylinos.cn Received: from localhost.localdomain [(116.128.244.171)] by mailgw (envelope-from ) (Generic MTA) with ESMTP id 901895803; Thu, 14 Sep 2023 17:08:50 +0800 From: Cong Liu To: jgg@ziepe.ca, Alex Williamson Cc: kvm@vger.kernel.org, linux-kernel@vger.kernel.org, liucong2@kylinos.cn Subject: [PATCH v2] vfio: Fix uninitialized symbol and potential dereferencing errors in vfio_combine_iova_ranges Date: Thu, 14 Sep 2023 17:08:39 +0800 Message-Id: <20230914090839.196314-1-liucong2@kylinos.cn> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (morse.vger.email [0.0.0.0]); Thu, 14 Sep 2023 02:10:12 -0700 (PDT) X-Spam-Status: No, score=-0.8 required=5.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,UNPARSEABLE_RELAY autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on morse.vger.email X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1777003927213728755 X-GMAIL-MSGID: 1777003927213728755 when compiling with smatch check, the following errors were encountered: drivers/vfio/vfio_main.c:957 vfio_combine_iova_ranges() error: uninitialized symbol 'last'. drivers/vfio/vfio_main.c:978 vfio_combine_iova_ranges() error: potentially dereferencing uninitialized 'comb_end'. drivers/vfio/vfio_main.c:978 vfio_combine_iova_ranges() error: potentially dereferencing uninitialized 'comb_start'. this patch fix these error. Signed-off-by: Cong Liu --- drivers/vfio/vfio_main.c | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/drivers/vfio/vfio_main.c b/drivers/vfio/vfio_main.c index 40732e8ed4c6..96d2f3030ebb 100644 --- a/drivers/vfio/vfio_main.c +++ b/drivers/vfio/vfio_main.c @@ -938,14 +938,17 @@ static int vfio_ioctl_device_feature_migration(struct vfio_device *device, void vfio_combine_iova_ranges(struct rb_root_cached *root, u32 cur_nodes, u32 req_nodes) { - struct interval_tree_node *prev, *curr, *comb_start, *comb_end; + struct interval_tree_node *prev, *curr; + struct interval_tree_node *comb_start = NULL, *comb_end = NULL; unsigned long min_gap, curr_gap; /* Special shortcut when a single range is required */ if (req_nodes == 1) { - unsigned long last; + unsigned long last = 0; comb_start = interval_tree_iter_first(root, 0, ULONG_MAX); + if (!comb_start) + return; curr = comb_start; while (curr) { last = curr->last; @@ -963,6 +966,10 @@ void vfio_combine_iova_ranges(struct rb_root_cached *root, u32 cur_nodes, prev = NULL; min_gap = ULONG_MAX; curr = interval_tree_iter_first(root, 0, ULONG_MAX); + if (!curr) { + /* No more ranges to combine */ + break; + } while (curr) { if (prev) { curr_gap = curr->start - prev->last; @@ -975,6 +982,10 @@ void vfio_combine_iova_ranges(struct rb_root_cached *root, u32 cur_nodes, prev = curr; curr = interval_tree_iter_next(curr, 0, ULONG_MAX); } + if (!comb_start || !comb_end) { + /* No more ranges to combine */ + break; + } comb_start->last = comb_end->last; interval_tree_remove(comb_end, root); cur_nodes--;