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=-10.6 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SIGNED_OFF_BY, 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 A0BB9C43387 for ; Mon, 7 Jan 2019 13:06:29 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 5D4C52089F for ; Mon, 7 Jan 2019 13:06:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1546866389; bh=NaIWgrWi7EkHiqOmLgEgQ2ra/IkAcgJHrTVUFKz/XUI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=TamQ2Nc4hJqegeVKh739ii7AeoYvzfSP/CXZ/076j5fJ/ehx8GQLnyvUZ5AqIPWI5 hXGjMRMl3YcYNa3sJWy9tqTo7U0Gl8L6T1qVK8dRThiWMSVFMxo7VCzpoyjENl/mLh AtGcVYmNErOa2FzneuaKWibzKA+3RuZVv2WDyCwo= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727418AbfAGNG2 (ORCPT ); Mon, 7 Jan 2019 08:06:28 -0500 Received: from mail.kernel.org ([198.145.29.99]:53806 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731115AbfAGNG0 (ORCPT ); Mon, 7 Jan 2019 08:06:26 -0500 Received: from localhost (5356596B.cm-6-7b.dynamic.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 BB40A217D4; Mon, 7 Jan 2019 13:06:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1546866385; bh=NaIWgrWi7EkHiqOmLgEgQ2ra/IkAcgJHrTVUFKz/XUI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=IqQxRwBxkuxKb00ce9G7XbKKDwEkP1tgfymARgGt8gyW406u52Y/sm9U3uWkcTlR9 83LvlXu/XjJ1Noj4zoqBCzOs9xF+CkskAVtgKcNhS1ynh1DqVKeYBrG2oMu1B5fQbG A3BAS2qbPOQ4P0S0c48iw97b9DsikwEpB9KEP4YE= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, syzbot+c56449ed3652e6720f30@syzkaller.appspotmail.com, Jon Maloy , Cong Wang , "David S. Miller" Subject: [PATCH 4.9 09/71] ipv6: explicitly initialize udp6_addr in udp_sock_create6() Date: Mon, 7 Jan 2019 13:32:38 +0100 Message-Id: <20190107105330.874291421@linuxfoundation.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190107105330.280153213@linuxfoundation.org> References: <20190107105330.280153213@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review X-Patchwork-Hint: ignore 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 4.9-stable review patch. If anyone has any objections, please let me know. ------------------ From: Cong Wang [ Upstream commit fb24274546310872eeeaf3d1d53799d8414aa0f2 ] syzbot reported the use of uninitialized udp6_addr::sin6_scope_id. We can just set ::sin6_scope_id to zero, as tunnels are unlikely to use an IPv6 address that needs a scope id and there is no interface to bind in this context. For net-next, it looks different as we have cfg->bind_ifindex there so we can probably call ipv6_iface_scope_id(). Same for ::sin6_flowinfo, tunnels don't use it. Fixes: 8024e02879dd ("udp: Add udp_sock_create for UDP tunnels to open listener socket") Reported-by: syzbot+c56449ed3652e6720f30@syzkaller.appspotmail.com Cc: Jon Maloy Signed-off-by: Cong Wang Signed-off-by: David S. Miller Signed-off-by: Greg Kroah-Hartman --- net/ipv6/ip6_udp_tunnel.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) --- a/net/ipv6/ip6_udp_tunnel.c +++ b/net/ipv6/ip6_udp_tunnel.c @@ -15,7 +15,7 @@ int udp_sock_create6(struct net *net, struct udp_port_cfg *cfg, struct socket **sockp) { - struct sockaddr_in6 udp6_addr; + struct sockaddr_in6 udp6_addr = {}; int err; struct socket *sock = NULL; @@ -42,6 +42,7 @@ int udp_sock_create6(struct net *net, st goto error; if (cfg->peer_udp_port) { + memset(&udp6_addr, 0, sizeof(udp6_addr)); udp6_addr.sin6_family = AF_INET6; memcpy(&udp6_addr.sin6_addr, &cfg->peer_ip6, sizeof(udp6_addr.sin6_addr));