From patchwork Fri Aug 4 15:53:36 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fedor Pchelkin X-Patchwork-Id: 131269 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:44a:b0:3f2:4152:657d with SMTP id ez10csp415577vqb; Fri, 4 Aug 2023 10:29:09 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHBJaYvetXAtx4fng2ksrHH6HF9MkTrfT7NqRGYI9R5WpKky/m1h4ohHaBkhvheQ8HqR+aZ X-Received: by 2002:a05:6402:1b04:b0:523:f55:18de with SMTP id by4-20020a0564021b0400b005230f5518demr1908637edb.20.1691170149307; Fri, 04 Aug 2023 10:29:09 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1691170149; cv=none; d=google.com; s=arc-20160816; b=Hsu4D1UStjYm0YCDzOC4SOcEP+hYGBOK4m/HG/P27KB9c4rMQgm7RNxhOAbZRNRmuK k8h5nBQCb9Gb+LxgzBr7Afnarvl9iGCpADHeITGl3EdCIk60YkL49wD8DFVlUK7PRl76 KbIsTTLy4xwm3PWV44znBl4WIWeZx2ewcT4kNSGsnt70fEa1XYKT5a+tvHw5LsvttT9y Bukhq8UX2yc4/vHOJ2diOWvwH1is+Ptr0pStZ6Bzjl0DkXH/3y5HjCYOs2oYuoto/Xh0 lc1JrifWuXV0IPRfW0AGQ580zcrd04KE9bJCYSQFEVLP4Q0jdRswGU7C0O8rnfEY1TM9 897A== 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 :dkim-signature:dkim-filter; bh=YvUW9Cp+Mgnt3NWK0TLcArIpRQkO34R2ZFK4uY/nVAY=; fh=PAlupd8MwfOsbSAknrT0L/+GtzUZ6DXVv6O1ZjlACQ8=; b=UUM80kFMRCQRR/TRV85dZAII4dH4COsYGlQcESGMd6clyN6q4VV4D3ZVZa0hd4b43e U//pQdlKnrjvFQw74fGAj5CABr8lt/HBuH4L1yi9cArPrvVxW0sfznw2bDKJgtFBdmDs t1hpnt0xLszUfeXYuvotuA0jhxLjKX9cEe3srf7TmSKghV8XZKmHCrCa0p5SAd76JmoM UU2zhSCCP9IELvJ9nm7Sn9H91h9jkkj1inWKPwOmVrDOaalP5XGFNZDypbeevPStl1q+ cAd8ahqhQBN5Duti+OyKmCHQrOHJD4AOAex1KbxYo5kmjlVc6Q6rsF5F7v4wdde+mmeE XDtQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@ispras.ru header.s=default header.b=i3fmj5v0; 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=ispras.ru Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id y6-20020aa7d506000000b0051e168e63dasi1919326edq.450.2023.08.04.10.28.38; Fri, 04 Aug 2023 10:29:09 -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=@ispras.ru header.s=default header.b=i3fmj5v0; 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=ispras.ru Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231271AbjHDPyP (ORCPT + 99 others); Fri, 4 Aug 2023 11:54:15 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49506 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229723AbjHDPyN (ORCPT ); Fri, 4 Aug 2023 11:54:13 -0400 Received: from mail.ispras.ru (mail.ispras.ru [83.149.199.84]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id CC5BAB2; Fri, 4 Aug 2023 08:54:11 -0700 (PDT) Received: from localhost.localdomain (unknown [46.242.14.200]) by mail.ispras.ru (Postfix) with ESMTPSA id 599B740737A6; Fri, 4 Aug 2023 15:54:09 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 mail.ispras.ru 599B740737A6 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ispras.ru; s=default; t=1691164449; bh=YvUW9Cp+Mgnt3NWK0TLcArIpRQkO34R2ZFK4uY/nVAY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=i3fmj5v0XOM8fy738lUg5Z/9hLHpFdfPe6MKTPXqwVa9at2oGAbq7NWeNnCddU+qn 6tyEnnuur68eUKg99cSn5nsEiIIk4/59BJI4LXT6wZWxSRKzbNZV7PREX4D0y8ECS5 7Fx6ICbUXuKFNA1bB4mShBLs4XXLy7BZwLHPQkq8= From: Fedor Pchelkin To: Ido Schimmel Cc: Fedor Pchelkin , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Nikolay Aleksandrov , Roopa Prabhu , netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Alexey Khoroshilov , lvc-project@linuxtesting.org Subject: [PATCH net v2] drivers: vxlan: vnifilter: free percpu vni stats on error path Date: Fri, 4 Aug 2023 18:53:36 +0300 Message-ID: <20230804155337.18135-1-pchelkin@ispras.ru> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_BLOCKED, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED 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: INBOX X-GMAIL-THRID: 1773242651832995202 X-GMAIL-MSGID: 1773320430199314379 In case rhashtable_lookup_insert_fast() fails inside vxlan_vni_add(), the allocated percpu vni stats are not freed on the error path. Introduce vxlan_vni_free() which would work as a nice wrapper to free vxlan_vni_node resources properly. Found by Linux Verification Center (linuxtesting.org). Fixes: 4095e0e1328a ("drivers: vxlan: vnifilter: per vni stats") Suggested-by: Ido Schimmel Signed-off-by: Fedor Pchelkin --- v1->v2: per Ido Schimmel's suggestion, extract freeing vninode resources into a separate function vxlan_vni_free() and tag the patch as for 'net' drivers/net/vxlan/vxlan_vnifilter.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/drivers/net/vxlan/vxlan_vnifilter.c b/drivers/net/vxlan/vxlan_vnifilter.c index a3de081cda5e..c3ff30ab782e 100644 --- a/drivers/net/vxlan/vxlan_vnifilter.c +++ b/drivers/net/vxlan/vxlan_vnifilter.c @@ -713,6 +713,12 @@ static struct vxlan_vni_node *vxlan_vni_alloc(struct vxlan_dev *vxlan, return vninode; } +static void vxlan_vni_free(struct vxlan_vni_node *vninode) +{ + free_percpu(vninode->stats); + kfree(vninode); +} + static int vxlan_vni_add(struct vxlan_dev *vxlan, struct vxlan_vni_group *vg, u32 vni, union vxlan_addr *group, @@ -740,7 +746,7 @@ static int vxlan_vni_add(struct vxlan_dev *vxlan, &vninode->vnode, vxlan_vni_rht_params); if (err) { - kfree(vninode); + vxlan_vni_free(vninode); return err; } @@ -763,8 +769,7 @@ static void vxlan_vni_node_rcu_free(struct rcu_head *rcu) struct vxlan_vni_node *v; v = container_of(rcu, struct vxlan_vni_node, rcu); - free_percpu(v->stats); - kfree(v); + vxlan_vni_free(v); } static int vxlan_vni_del(struct vxlan_dev *vxlan,