Received: by 10.223.185.116 with SMTP id b49csp4170083wrg; Mon, 26 Feb 2018 12:28:36 -0800 (PST) X-Google-Smtp-Source: AH8x225dwjnzQV0Zn+H6OOpzhyFccns8COVogGdXXnUgr1MbULDOH0dTHgRUTRMdn0U/3fuVdkky X-Received: by 2002:a17:902:5609:: with SMTP id h9-v6mr11713865pli.302.1519676916790; Mon, 26 Feb 2018 12:28:36 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1519676916; cv=none; d=google.com; s=arc-20160816; b=KLxrlViBxzFqeqTfjp837zmNqtSvcAISqtPhSTZ3EOBp0p40Vycfu1KgRLVHMmZlhy 8nQGxK/zYQxGfvFAwmysMV4wuWvckH3TJ5y7yv0/wqs3IPiClXMxroX5w4Rb0lh0Wcdm 7cKBoMMsfuBXNxbRbSByLPI4FQ+wCI0NeNDyIaIiq+pnLUfKrX6q3CNymgIbav+aiIPe MAaPICAXXCaX8gb7D5qagN5SeqyKfQCkzRj9/5O/AldHCjYPPuw19eVOPaMgVwG+DbTO Ku5zGu9KMPoaHm3rhnp+/l0pC9y25rOpFYfHJiT/QVKW+iU3V1DfEdBRa76R9aSpR1na kQKQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:mime-version:user-agent:references :in-reply-to:message-id:date:subject:cc:to:from :arc-authentication-results; bh=NCg12nAUEKT+YolnLil0OVHpUV7yKnHBm/VdSqxMgmM=; b=gJdiBAeWX1PpM3O3SEbtQ3jpHaYfajisU3HSRiKxOUHPqmStedmRPA1UBxTrFnmWXC 20vF7XyPvQipze/Z7ecRWCDPyDNZG5OpkGP7NCbaMvW39uiaf5CogGplwnN9KgGY37FL qF8Usod6IrCHNhfqUD/uiOv9WiypkJLC8oRSMmnyMENXp+l5EKGPahyOTBboEu/l6q8t LyJ0AbnCM4xWZPW34desydGchKXw2E1jcyrgGegCfSdvIrQh7KTGfQiBw4Hfw9EfZSzF /bJFceQaBT9JjKlVtuBH2zWcCU6taxItkPyvoaayIU6j9+xRey5Kw+wvjetoyseHqRBT ePWA== ARC-Authentication-Results: i=1; mx.google.com; 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 b5-v6si7023623plr.335.2018.02.26.12.28.20; Mon, 26 Feb 2018 12:28:36 -0800 (PST) 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; 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 S1753316AbeBZU0G (ORCPT + 99 others); Mon, 26 Feb 2018 15:26:06 -0500 Received: from mail.linuxfoundation.org ([140.211.169.12]:35632 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752355AbeBZU0E (ORCPT ); Mon, 26 Feb 2018 15:26:04 -0500 Received: from localhost (clnet-b04-243.ikbnet.co.at [83.175.124.243]) by mail.linuxfoundation.org (Postfix) with ESMTPSA id 5A345FE5; Mon, 26 Feb 2018 20:26:03 +0000 (UTC) From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Xin Long , syzbot+ddde1c7b7ff7442d7f2d@syzkaller.appspotmail.com, Florian Westphal , Paolo Abeni , Pablo Neira Ayuso , Krzysztof Piotr Oledzki Subject: [PATCH 4.15 01/64] netfilter: drop outermost socket lock in getsockopt() Date: Mon, 26 Feb 2018 21:21:38 +0100 Message-Id: <20180226202153.512855240@linuxfoundation.org> X-Mailer: git-send-email 2.16.2 In-Reply-To: <20180226202153.453363333@linuxfoundation.org> References: <20180226202153.453363333@linuxfoundation.org> User-Agent: quilt/0.65 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 4.15-stable review patch. If anyone has any objections, please let me know. ------------------ From: Paolo Abeni commit 01ea306f2ac2baff98d472da719193e738759d93 upstream. The Syzbot reported a possible deadlock in the netfilter area caused by rtnl lock, xt lock and socket lock being acquired with a different order on different code paths, leading to the following backtrace: Reviewed-by: Xin Long ====================================================== WARNING: possible circular locking dependency detected 4.15.0+ #301 Not tainted ------------------------------------------------------ syzkaller233489/4179 is trying to acquire lock: (rtnl_mutex){+.+.}, at: [<0000000048e996fd>] rtnl_lock+0x17/0x20 net/core/rtnetlink.c:74 but task is already holding lock: (&xt[i].mutex){+.+.}, at: [<00000000328553a2>] xt_find_table_lock+0x3e/0x3e0 net/netfilter/x_tables.c:1041 which lock already depends on the new lock. === Since commit 3f34cfae1230 ("netfilter: on sockopt() acquire sock lock only in the required scope"), we already acquire the socket lock in the innermost scope, where needed. In such commit I forgot to remove the outer-most socket lock from the getsockopt() path, this commit addresses the issues dropping it now. v1 -> v2: fix bad subj, added relavant 'fixes' tag Fixes: 22265a5c3c10 ("netfilter: xt_TEE: resolve oif using netdevice notifiers") Fixes: 202f59afd441 ("netfilter: ipt_CLUSTERIP: do not hold dev") Fixes: 3f34cfae1230 ("netfilter: on sockopt() acquire sock lock only in the required scope") Reported-by: syzbot+ddde1c7b7ff7442d7f2d@syzkaller.appspotmail.com Suggested-by: Florian Westphal Signed-off-by: Paolo Abeni Signed-off-by: Pablo Neira Ayuso Tested-by: Krzysztof Piotr Oledzki Signed-off-by: Greg Kroah-Hartman --- net/ipv4/ip_sockglue.c | 7 +------ net/ipv6/ipv6_sockglue.c | 10 ++-------- 2 files changed, 3 insertions(+), 14 deletions(-) --- a/net/ipv4/ip_sockglue.c +++ b/net/ipv4/ip_sockglue.c @@ -1563,10 +1563,7 @@ int ip_getsockopt(struct sock *sk, int l if (get_user(len, optlen)) return -EFAULT; - lock_sock(sk); - err = nf_getsockopt(sk, PF_INET, optname, optval, - &len); - release_sock(sk); + err = nf_getsockopt(sk, PF_INET, optname, optval, &len); if (err >= 0) err = put_user(len, optlen); return err; @@ -1598,9 +1595,7 @@ int compat_ip_getsockopt(struct sock *sk if (get_user(len, optlen)) return -EFAULT; - lock_sock(sk); err = compat_nf_getsockopt(sk, PF_INET, optname, optval, &len); - release_sock(sk); if (err >= 0) err = put_user(len, optlen); return err; --- a/net/ipv6/ipv6_sockglue.c +++ b/net/ipv6/ipv6_sockglue.c @@ -1367,10 +1367,7 @@ int ipv6_getsockopt(struct sock *sk, int if (get_user(len, optlen)) return -EFAULT; - lock_sock(sk); - err = nf_getsockopt(sk, PF_INET6, optname, optval, - &len); - release_sock(sk); + err = nf_getsockopt(sk, PF_INET6, optname, optval, &len); if (err >= 0) err = put_user(len, optlen); } @@ -1409,10 +1406,7 @@ int compat_ipv6_getsockopt(struct sock * if (get_user(len, optlen)) return -EFAULT; - lock_sock(sk); - err = compat_nf_getsockopt(sk, PF_INET6, - optname, optval, &len); - release_sock(sk); + err = compat_nf_getsockopt(sk, PF_INET6, optname, optval, &len); if (err >= 0) err = put_user(len, optlen); }