From patchwork Wed Jan 25 13:48:31 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Natalia Petrova X-Patchwork-Id: 48153 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp286931wrn; Wed, 25 Jan 2023 06:00:03 -0800 (PST) X-Google-Smtp-Source: AMrXdXuu0eh0SZ9LpyN2YV5yDLf9Q71qQsbUA6aURaEgJF434iEPWbTdZGyph964NY9ijZ+RdU2A X-Received: by 2002:a05:6a20:6922:b0:b6:99a4:66bd with SMTP id q34-20020a056a20692200b000b699a466bdmr46293368pzj.38.1674655203581; Wed, 25 Jan 2023 06:00:03 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1674655203; cv=none; d=google.com; s=arc-20160816; b=VKu5/1nf/2r3K6YGNnOVYwDhJY4s77pKsWCDsDCcj4jbRQQOdHg7cxm+k8jJN7DwNO CluR561PT3QHOraiGn9VqmhMSOL4H4jhfui9faRLC+29su7e9aGsjmupozMuupsxkmyw DBlzaM6OGaz8Rn2gqXAibw9mlYfg2Q5LKpHUJnf9v41cBRfAsZSzSR1K6Yshdbvwh98T CMjznnKUoD9JYp+S1b6rMdnJZ0jW9weMZeGRPQ8YGJGCn7BlHXO/pk0bYg331+vzScaY GWRbI2q1XqAPDWflcjFMvAMicuG9DUVda577yE6fLIFWJqykbBTyKsmCps9o66MsCOHr 3aDg== 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 :message-id:date:subject:cc:to:from; bh=eK2EgCUYds1tcWMN1wEjzeP3KuRveBMRgQESjdUJEwA=; b=ud7XvgLNb1Qic4MoYJIuyLdRmW35cj/shO+2x4vDAHDEByFditEqlVBCqqofB1ioMw wsHarwd6gBRy94H2UULUJe/+c7V42MAGb0f9H0QIX9EXtxOy7MYOtdwyQen+6Nm3Or3j uvkhgeRRDtd3Cs/nlCjsOH4S+fYaBPBG3MLGt4iqVNcGQI05FpdcXZ9V20KYgWn6LT6b cgLBGF2SsKVtmbGFI3LpaQzIPWloO3NhpyvC4wo4SFljw4KJoO70wjaUSGz/eTd0d4bc rSwqz24C8O7WGGaNT2eYe/0lKZg40uzvw2id8C3k0njsRXVB3NPfOlxpef4Ptgsscnwy HKTw== ARC-Authentication-Results: i=1; mx.google.com; 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 Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id m18-20020a637112000000b004cf058f7f1esi5894093pgc.683.2023.01.25.05.59.50; Wed, 25 Jan 2023 06:00:03 -0800 (PST) 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; 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 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234999AbjAYNup (ORCPT + 99 others); Wed, 25 Jan 2023 08:50:45 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43162 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229573AbjAYNuo (ORCPT ); Wed, 25 Jan 2023 08:50:44 -0500 X-Greylist: delayed 62 seconds by postgrey-1.37 at lindbergh.monkeyblade.net; Wed, 25 Jan 2023 05:50:41 PST Received: from exchange.fintech.ru (e10edge.fintech.ru [195.54.195.159]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 84509193CD; Wed, 25 Jan 2023 05:50:41 -0800 (PST) Received: from Ex16-01.fintech.ru (10.0.10.18) by exchange.fintech.ru (195.54.195.159) with Microsoft SMTP Server (TLS) id 14.3.498.0; Wed, 25 Jan 2023 16:48:35 +0300 Received: from KANASHIN1.fintech.ru (10.0.253.125) by Ex16-01.fintech.ru (10.0.10.18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2242.4; Wed, 25 Jan 2023 16:48:34 +0300 From: Natalia Petrova To: Manivannan Sadhasivam CC: Natalia Petrova , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , , , , Subject: [PATCH] net: qrtr: free memory on error path in radix_tree_insert() Date: Wed, 25 Jan 2023 16:48:31 +0300 Message-ID: <20230125134831.8090-1-n.petrova@fintech.ru> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 X-Originating-IP: [10.0.253.125] X-ClientProxiedBy: Ex16-01.fintech.ru (10.0.10.18) To Ex16-01.fintech.ru (10.0.10.18) X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,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?1756003254938788112?= X-GMAIL-MSGID: =?utf-8?q?1756003254938788112?= Function radix_tree_insert() returns errors if the node hasn't been initialized and added to the tree. "kfree(node)" and return value "NULL" of node_get() help to avoid using unclear node in other calls. Found by Linux Verification Center (linuxtesting.org) with SVACE. Fixes: 0c2204a4ad71 ("net: qrtr: Migrate nameservice to kernel from userspace") Signed-off-by: Natalia Petrova Reviewed-by: Simon Horman Reviewed-by: Manivannan Sadhasivam --- net/qrtr/ns.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/net/qrtr/ns.c b/net/qrtr/ns.c index 1990d496fcfc..e595079c2caf 100644 --- a/net/qrtr/ns.c +++ b/net/qrtr/ns.c @@ -83,7 +83,10 @@ static struct qrtr_node *node_get(unsigned int node_id) node->id = node_id; - radix_tree_insert(&nodes, node_id, node); + if (radix_tree_insert(&nodes, node_id, node)) { + kfree(node); + return NULL; + } return node; }