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=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 81394C282C3 for ; Thu, 24 Jan 2019 19:50:34 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 47ACA21726 for ; Thu, 24 Jan 2019 19:50:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1548359434; bh=KB0Qry3zHKk5woJK3YeBC20iwJrdfAzSoZyRK66jqSY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=wxepqbBcGn0AiBE6ZzJCpIrJ6V0nwkxRu4pVmnZ0vF+kS+LeAcivWPgYyrGEXTwnO ix19ea3/8j0yz+0RyPAXW2W+x82Qy/lgEiUwoaq8+4UHI+rLPFwRfmeOYhX0THhmTZ KqPZwFhEvDO3rqzKUkszAwjwk2m88mof9kxQqv84= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1733280AbfAXTka (ORCPT ); Thu, 24 Jan 2019 14:40:30 -0500 Received: from mail.kernel.org ([198.145.29.99]:40570 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1733259AbfAXTkZ (ORCPT ); Thu, 24 Jan 2019 14:40:25 -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 4A05E20663; Thu, 24 Jan 2019 19:40:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1548358824; bh=KB0Qry3zHKk5woJK3YeBC20iwJrdfAzSoZyRK66jqSY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=t6ZKKIA84jlf4kUV9MWtGsPTIZFHWZFPg05TKxLQCzhuXKNzX0G5mQTv9GNVtXYtQ LZbp4X1f+scp5zjZ0W8NNW/iYZLjJIxYdGwg0h1qC18wWp+meVKGt8PnQcgfOzvo/t i63O3cyO6dTwiUiwwl70D0YIIO1GQ3ql5jk4OMcI= 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.20 008/127] ipv6: Take rcu_read_lock in __inet6_bind for mapped addresses Date: Thu, 24 Jan 2019 20:19:14 +0100 Message-Id: <20190124190212.447208032@linuxfoundation.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190124190211.984305387@linuxfoundation.org> References: <20190124190211.984305387@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.20-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 @@ -321,17 +321,20 @@ static int __inet6_bind(struct sock *sk, 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 (!inet_can_nonlocal_bind(net, inet) && v4addr != htonl(INADDR_ANY) && chk_addr_ret != RTN_LOCAL &&