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=-7.1 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=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 E057EC282C3 for ; Thu, 24 Jan 2019 20:10:58 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 9DB41218A6 for ; Thu, 24 Jan 2019 20:10:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1548360658; bh=qH+V4Lv80oHO4NZkkAFB6BD+RLteVnZ4B/X6j0h5cTs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=oFeZClrCP6H+6eRJ8ASo3k65g7zoF+tBJpGsGUnFJgXXGZej552zYIVzKWQb7NGw+ 8CGORJP0GjG1B4SEDw56oL9E+LZ2NJpaO1oddxQPaeZ07TIa3ska5Jn4cILlsH5yvK XZpQM0KmAYCcNgHldS/OJyNGYiyqhw+uHOHq2N8s= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729798AbfAXT1V (ORCPT ); Thu, 24 Jan 2019 14:27:21 -0500 Received: from mail.kernel.org ([198.145.29.99]:53586 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730378AbfAXT1U (ORCPT ); Thu, 24 Jan 2019 14:27:20 -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 273A0218A6; Thu, 24 Jan 2019 19:27:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1548358039; bh=qH+V4Lv80oHO4NZkkAFB6BD+RLteVnZ4B/X6j0h5cTs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=AocEiRfnES6EnQGCAsox86YyNG5Tusw3uasXkcbZ8w3H/EUkKA1Z8BlJmNiEtlH1w vcXx7wvqPIaTBCGvzIVKz/MdDqi5v8208Fj2t78rnx9304NBYT06ZKrQl3epzHN1xu +RslrUAV7Nf54lWDloanp1mFlgxO91nmSYmF+t3U= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, David Ahern , "David S. Miller" Subject: [PATCH 4.4 075/104] ipv6: Take rcu_read_lock in __inet6_bind for mapped addresses Date: Thu, 24 Jan 2019 20:20:04 +0100 Message-Id: <20190124190203.758016713@linuxfoundation.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190124190154.968308875@linuxfoundation.org> References: <20190124190154.968308875@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: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org 4.4-stable review patch. If anyone has any objections, please let me know. ------------------ From: David Ahern [ Upstream commit d4a7e9bb74b5aaf07b89f6531c080b1130bdf019 ] I realized the last patch calls dev_get_by_index_rcu in a branch not holding the rcu lock. Add the calls to rcu_read_lock and rcu_read_unlock. Fixes: ec90ad334986 ("ipv6: Consider sk_bound_dev_if when binding a socket to a v4 mapped address") Signed-off-by: David Ahern Signed-off-by: David S. Miller Signed-off-by: Greg Kroah-Hartman --- net/ipv6/af_inet6.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) --- a/net/ipv6/af_inet6.c +++ b/net/ipv6/af_inet6.c @@ -303,17 +303,20 @@ int inet6_bind(struct socket *sock, stru goto out; } + rcu_read_lock(); if (sk->sk_bound_dev_if) { dev = dev_get_by_index_rcu(net, sk->sk_bound_dev_if); if (!dev) { err = -ENODEV; - goto out; + goto out_unlock; } } /* Reproduce AF_INET checks to make the bindings consistent */ v4addr = addr->sin6_addr.s6_addr32[3]; chk_addr_ret = inet_addr_type_dev_table(net, dev, v4addr); + rcu_read_unlock(); + if (!net->ipv4.sysctl_ip_nonlocal_bind && !(inet->freebind || inet->transparent) && v4addr != htonl(INADDR_ANY) &&