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 X-Spam-Level: X-Spam-Status: No, score=-6.8 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,URIBL_BLOCKED,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 EE868C2D0F0 for ; Wed, 1 Apr 2020 16:43:30 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 7BE8F20719 for ; Wed, 1 Apr 2020 16:43:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1585759410; bh=oLOFW+1+YpmZ/GdNPoMFJoF4xFvKbGjf2wFL4yaJxQY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=cBblWUEPIhY2SKd4qyg4JjksQHpcBmPk/suQv3XzDqYyE/WDMZhBkG0Wi1NT7tYws dE5OGr32siOzWpKNMoDrRP4nkc9XhA1WqvWHEETb0Jkke30vx1rlOA9YHgSEc5W/8f dZnIxMUbLiDGzmmlDp9v+RKUqda9R8bXv/kxcxqY= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2389412AbgDAQn2 (ORCPT ); Wed, 1 Apr 2020 12:43:28 -0400 Received: from mail.kernel.org ([198.145.29.99]:44236 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2389459AbgDAQn0 (ORCPT ); Wed, 1 Apr 2020 12:43:26 -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 98BD2206F8; Wed, 1 Apr 2020 16:43:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1585759406; bh=oLOFW+1+YpmZ/GdNPoMFJoF4xFvKbGjf2wFL4yaJxQY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=2GuCZV9X4OyhYrWo0rNvJ++YDrLXSjT9tiT6Q8EkAnumLlwKMLwFdVAQidoLxlqOW /OK89TaUFBaqR1ZxlE8sdXYBHyMW25/S2Z4IF8RKTl2hvMxAHjShde2yUzL7l4wZ+Y +A/hVNTLLp9Nm7LuVWSdrhw/4lnuYS+8CUdWjsXM= 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 4.14 069/148] vxlan: check return value of gro_cells_init() Date: Wed, 1 Apr 2020 18:17:41 +0200 Message-Id: <20200401161600.166994286@linuxfoundation.org> X-Mailer: git-send-email 2.26.0 In-Reply-To: <20200401161552.245876366@linuxfoundation.org> References: <20200401161552.245876366@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@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 @@ -2454,10 +2454,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; } @@ -2717,8 +2726,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) INIT_HLIST_HEAD(&vxlan->fdb_head[h]); }