From patchwork Tue Mar 31 08:57:33 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Kroah-Hartman X-Patchwork-Id: 228695 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=3.0 tests=DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE, SPF_PASS, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id ED770C2D0EE for ; Tue, 31 Mar 2020 09:03:13 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id C3E8B2137B for ; Tue, 31 Mar 2020 09:03:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1585645393; bh=N+owriBuSW8TD8SbqXaAB46DfoDo5110Pd7r+uwbDb8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=im++BMVT/cX7G1sM5PrffDA6W6y6r7WKuxNAquqiPn2WSzgX4GQC3RSG13mn6KFGG NbjH1UoE4NB+6bDUEeSkzztmtFLbGTYWabLg5boQsKIPGQTMqluT+6EU75St/UuQt+ KiB9fDBMDVPrT7OyiEHw8ZQVxuojAvBYwO3MIJ4M= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730797AbgCaJDL (ORCPT ); Tue, 31 Mar 2020 05:03:11 -0400 Received: from mail.kernel.org ([198.145.29.99]:42866 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730161AbgCaJDL (ORCPT ); Tue, 31 Mar 2020 05:03:11 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 253D22145D; Tue, 31 Mar 2020 09:03:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1585645390; bh=N+owriBuSW8TD8SbqXaAB46DfoDo5110Pd7r+uwbDb8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=FuSXUCQsyWFQcssTbgHyOzaVGkNw5MWJ+nMXwKod7w7K1Y/F1RjUJcV5dRxsjZW/e 8EDq8FB6huIAEj+xoXMDrFeOzd+En12T/sLVyuddPhnyEnYkc/G8gdWz4pLolCXC/i wMZvswiDDd67sFSeZKGEuDt0VepYRWh8MwieoHkI= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Taehee Yoo , "David S. Miller" Subject: [PATCH 5.5 039/170] vxlan: check return value of gro_cells_init() Date: Tue, 31 Mar 2020 10:57:33 +0200 Message-Id: <20200331085428.174267737@linuxfoundation.org> X-Mailer: git-send-email 2.26.0 In-Reply-To: <20200331085423.990189598@linuxfoundation.org> References: <20200331085423.990189598@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Taehee Yoo [ Upstream commit 384d91c267e621e0926062cfb3f20cb72dc16928 ] gro_cells_init() returns error if memory allocation is failed. But the vxlan module doesn't check the return value of gro_cells_init(). Fixes: 58ce31cca1ff ("vxlan: GRO support at tunnel layer")` Signed-off-by: Taehee Yoo Signed-off-by: David S. Miller Signed-off-by: Greg Kroah-Hartman --- drivers/net/vxlan.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) --- a/drivers/net/vxlan.c +++ b/drivers/net/vxlan.c @@ -2778,10 +2778,19 @@ static void vxlan_vs_add_dev(struct vxla /* Setup stats when device is created */ static int vxlan_init(struct net_device *dev) { + struct vxlan_dev *vxlan = netdev_priv(dev); + int err; + dev->tstats = netdev_alloc_pcpu_stats(struct pcpu_sw_netstats); if (!dev->tstats) return -ENOMEM; + err = gro_cells_init(&vxlan->gro_cells, dev); + if (err) { + free_percpu(dev->tstats); + return err; + } + return 0; } @@ -3042,8 +3051,6 @@ static void vxlan_setup(struct net_devic vxlan->dev = dev; - gro_cells_init(&vxlan->gro_cells, dev); - for (h = 0; h < FDB_HASH_SIZE; ++h) { spin_lock_init(&vxlan->hash_lock[h]); INIT_HLIST_HEAD(&vxlan->fdb_head[h]);