Received: by 2002:a17:90a:1609:0:0:0:0 with SMTP id n9csp846482pja; Wed, 1 Apr 2020 09:45:22 -0700 (PDT) X-Google-Smtp-Source: ADFU+vupm+eO3wHlx6MGowShccjHhyWGp/8VThs/G2XtZYaNnTnk6cTRIXM2Od/eir/aaJruGVTR X-Received: by 2002:a05:6830:1610:: with SMTP id g16mr17011702otr.358.1585759522633; Wed, 01 Apr 2020 09:45:22 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1585759522; cv=none; d=google.com; s=arc-20160816; b=qAuUZtdIhy0ztmtSsVZLNTDGWOv4oJWQ6ubSvEFKENL35gdRpVMaWe/xi85k8T07eG YqOkooQ7pPTqHlZADGjkflVhU7j/3om1CCtVgEWqz2m2ak1yVyvuAkZEQ+i35qZ2/IeQ 2pCthep9DNt4yK6lLXym0LWL8sda4NcqR3ISzZVx0DcEMN+2yfU4d7HMvYw0P3nmIUl2 do6CqKqnpS5cdd3OsTOamHR/pS/oIOlYlNtOh6L7vUSEzlOazveIj1GCUSCEBsChy8fb SvbeTM+Eja4ZGEws0djZmg81sMmkk1dlS1i/GaBwsMhWDLy0x3g0OLRtY3DULC9dkEKf chng== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=atxN197Ko3VhJ73jbrl1pxowoFdSdKtvBEy4+zDQJpo=; b=r9vZ1M92Oc9AP4OePRLDDKLDyM59lfpM6gk8OgUsKeQPz/4NSy80Em/S/asHr5Pbuw 54Clk73DoO1kj785tEBD+Uuu8f47MS8tKjArq8j3GtPnumNT/94rmLc0fehH/MPmGSRJ 2xdyxOaIU7t61NK6iZLyI/1NFAeQAWIRkFx1YW+6PWj14Z/BXb1FKeODvfh84Xo43IXW 5VqvuicXlLQpXy08nPpWIWjSMR9KuzUgW7rAkUOr7gH8UMarFKhMbgemXcO5xTjlhlQi VAC1aj+iv0eY3b8v/htp+fzgykUtl1lTXNA3lGElk7P8pkPbMMZagbW6uH8eqPq4+QPm pr7Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=2GuCZV9X; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id f136si1173952oig.9.2020.04.01.09.45.09; Wed, 01 Apr 2020 09:45:22 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=2GuCZV9X; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2389469AbgDAQn2 (ORCPT + 99 others); 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]); }