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=-12.6 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable 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 E62CFC388F9 for ; Tue, 27 Oct 2020 11:49:23 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 73F5922281 for ; Tue, 27 Oct 2020 11:49:23 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="fDFh/AAh" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2899565AbgJ0LtS (ORCPT ); Tue, 27 Oct 2020 07:49:18 -0400 Received: from mail-pg1-f193.google.com ([209.85.215.193]:43741 "EHLO mail-pg1-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2897248AbgJ0LtR (ORCPT ); Tue, 27 Oct 2020 07:49:17 -0400 Received: by mail-pg1-f193.google.com with SMTP id r10so629504pgb.10; Tue, 27 Oct 2020 04:49:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=rk5GCZpD9PCj2iyqscZfor3nW5DfrrFKBppKxz2Jmb0=; b=fDFh/AAhwP0W04FLbvoHj52pYu3vB3Z88L2TXS56y4zF+4xOHAxxmkIRfJethc5FYj aYgEOesBInYainijVgDBiBYJJBSBnZ7UF/h88bMqR/kKnVjI3WrwveoWPfFJfNXfL1nY ujVW5iPaAO7pM2IfA9Vgh/G7iMVaDVzTfNraWWpPNXB6sVq/OHchKlysFihzVO8DINpw RvdEBOl/qj7g1XIBHTy3dMxRU4+UTGlp+DWTTzmK50WVu9xFqDVjpTNCOk3j/A0vJUkD tksNVgKwwoG8fJM5TmUyymappf/dZLGWNoBht71b30tv+H6F46cHLPW7c7FkIbRgUS69 wXfA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=rk5GCZpD9PCj2iyqscZfor3nW5DfrrFKBppKxz2Jmb0=; b=oSMREhsSGspm+cG8AYuOmekMb9togGZmEwWw3ErzZRpnBFiit0Ic89AsoOWicYD7pk GoKxUUfkqXNkMqd6Q/EDHxt29RsSEu3WD6ZKF6Um40PyKar22vkjk3/UxaRADjMfGH72 xs4u7yJs7ajYARhJB+ahtKyxYnz+dQi6YDVLSZJ2qP3wPwH348mgC8Gr57+7fms/TmO5 jT9P8rtwve+Se565DW9ufflZWJK8xygFzWuF+iGsEtppDNVQU19YVxUIBuPtHhqqeFf0 LK+UFAIvrT9+uPE4UFcN95aAT1TM9y2dTHzRoetRA9l0wHb/m7aPLv0Hy168xnlyFfK3 GATw== X-Gm-Message-State: AOAM530sMLZV5MY9N6ZBYoWzSJhnbFVTPIgy+jTtS7Ehhe6YIQgsWDgy msUzeqM+I2ySqFaoi8oVTSQyc/lpZH+sxozu X-Google-Smtp-Source: ABdhPJxKev2KUWiebl9RTKYGaGqAMLRldMwQYqeZ6injRTwGOuZyeQ+1DBykfREtgV3hW3z4PgzmWw== X-Received: by 2002:a63:fc09:: with SMTP id j9mr1517574pgi.388.1603799356430; Tue, 27 Oct 2020 04:49:16 -0700 (PDT) Received: from lte-devbox.localdomain (KD106154098026.au-net.ne.jp. [106.154.98.26]) by smtp.googlemail.com with ESMTPSA id n19sm2082760pfu.24.2020.10.27.04.49.13 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 27 Oct 2020 04:49:15 -0700 (PDT) From: Masahiro Fujiwara To: Pablo Neira Ayuso , Harald Welte Cc: fujiwara.masahiro@gmail.com, "David S. Miller" , Jakub Kicinski , Andreas Schultz , osmocom-net-gprs@lists.osmocom.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v3 net] gtp: fix an use-before-init in gtp_newlink() Date: Tue, 27 Oct 2020 20:48:46 +0900 Message-Id: <20201027114846.3924-1-fujiwara.masahiro@gmail.com> X-Mailer: git-send-email 2.24.3 In-Reply-To: <20201026114633.1b2628ae@kicinski-fedora-PC1C0HJN.hsd1.ca.comcast.net> References: <20201026114633.1b2628ae@kicinski-fedora-PC1C0HJN.hsd1.ca.comcast.net> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org *_pdp_find() from gtp_encap_recv() would trigger a crash when a peer sends GTP packets while creating new GTP device. RIP: 0010:gtp1_pdp_find.isra.0+0x68/0x90 [gtp] Call Trace: gtp_encap_recv+0xc2/0x2e0 [gtp] ? gtp1_pdp_find.isra.0+0x90/0x90 [gtp] udp_queue_rcv_one_skb+0x1fe/0x530 udp_queue_rcv_skb+0x40/0x1b0 udp_unicast_rcv_skb.isra.0+0x78/0x90 __udp4_lib_rcv+0x5af/0xc70 udp_rcv+0x1a/0x20 ip_protocol_deliver_rcu+0xc5/0x1b0 ip_local_deliver_finish+0x48/0x50 ip_local_deliver+0xe5/0xf0 ? ip_protocol_deliver_rcu+0x1b0/0x1b0 gtp_encap_enable() should be called after gtp_hastable_new() otherwise *_pdp_find() will access the uninitialized hash table. Fixes: 1e3a3abd8b28 ("gtp: make GTP sockets in gtp_newlink optional") Signed-off-by: Masahiro Fujiwara --- v3: - Fix goto err label. drivers/net/gtp.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/drivers/net/gtp.c b/drivers/net/gtp.c index 8e47d0112e5d..10f910f8cbe5 100644 --- a/drivers/net/gtp.c +++ b/drivers/net/gtp.c @@ -663,10 +663,6 @@ static int gtp_newlink(struct net *src_net, struct net_device *dev, gtp = netdev_priv(dev); - err = gtp_encap_enable(gtp, data); - if (err < 0) - return err; - if (!data[IFLA_GTP_PDP_HASHSIZE]) { hashsize = 1024; } else { @@ -677,12 +673,16 @@ static int gtp_newlink(struct net *src_net, struct net_device *dev, err = gtp_hashtable_new(gtp, hashsize); if (err < 0) - goto out_encap; + return err; + + err = gtp_encap_enable(gtp, data); + if (err < 0) + goto out_hashtable; err = register_netdevice(dev); if (err < 0) { netdev_dbg(dev, "failed to register new netdev %d\n", err); - goto out_hashtable; + goto out_encap; } gn = net_generic(dev_net(dev), gtp_net_id); @@ -693,11 +693,11 @@ static int gtp_newlink(struct net *src_net, struct net_device *dev, return 0; +out_encap: + gtp_encap_disable(gtp); out_hashtable: kfree(gtp->addr_hash); kfree(gtp->tid_hash); -out_encap: - gtp_encap_disable(gtp); return err; } -- 2.24.3