Received: by 2002:a05:6a10:206:0:0:0:0 with SMTP id 6csp4705782pxj; Wed, 12 May 2021 11:19:05 -0700 (PDT) X-Google-Smtp-Source: ABdhPJy0MZ+uiJqGxGDqpikhvDKwg6LHEs5xQioHjoRxu/XUx8KGXwKw2Y3wo4l51z/ezWcKxpp4 X-Received: by 2002:a05:6402:3546:: with SMTP id f6mr45262872edd.267.1620843545712; Wed, 12 May 2021 11:19:05 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1620843545; cv=none; d=google.com; s=arc-20160816; b=nWVSjIkydHmcIt8m/zL5SzG35uZRCAlK++Cc4xPzFRYM6gB82vKHNFWlOkzPgGgoEl Ng66ACcD5DqhYhHGHlInV8fRwzxvKnExR50iVyj6OzQ8bWoILoXqq3qHRpVI1xSuEOKx 6XSsIbDTcOEQxjhcEfR/VpmrmdJd01ynIIUWrx5ix+lIpB6ChGAmC6Rk6VIYKHgiRKqY BfZ1D6sQ+9MEB3XJY0EzbPW7cSRrT9UcAagyn0uoUIDFDcNjPc56MSTpL3Utn3vXxMU7 cSxh1xI44Zpuj7FG2VAB9USJi8Xhwr40nu+dl40dKJfz/+swJvoPgpF+kpl/Y2AnqUy6 oXbg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=d6RkAB5qW8CGnM/01tDDZW0B+8JG0h9zI28XlVnAuOM=; b=mBOefj8GpEztVdIYEoFPFqGGz5SeTPt4GsEIG8YazjUvjopbrQs47BjqgeC7pNA1tW J29G/Rr0Rp+l5Zw0QRGaJy6sfdaD8LGdtxG5waEDUkufU3dnUzkcPU5si2e3Iya4IMq1 XQvwaPBEkpViBXQo23KAt1PfZ350wyl8er7YzCeGj2Fs1Y7qIfUllwzB/bUr8dC9Ihl7 F/MRJAVvLB3sDnUgFd/T8QDAEKmIk2axXgg4lcf/tT2laPgY5Ra7r8ZjO8gVhQWh92kg rWEEFuCejqhTPS8yK5vqvkp2RxPlKDjcFtUGhBmDFpMpp2Ocaj5WGOm3yBUPtsbDXuar 2Vkw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=AAF96L+M; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id i22si297914edq.81.2021.05.12.11.18.41; Wed, 12 May 2021 11:19:05 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=AAF96L+M; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1351785AbhELSB4 (ORCPT + 99 others); Wed, 12 May 2021 14:01:56 -0400 Received: from mail.kernel.org ([198.145.29.99]:43696 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S241132AbhELQ0a (ORCPT ); Wed, 12 May 2021 12:26:30 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 88A4F61DB3; Wed, 12 May 2021 15:49:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1620834593; bh=lU9g/vLzR9k4v9tgjNFbRt+hDmHRBN+0F3nPQiiKJ3Y=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=AAF96L+MRW1oN/2HaberryJgnuPcCttZiSuwWr+ngF7I7KBRJ+dSBuFHbO0bqSsVY fPP6fK35n3pYcl8TnsaBdAiJId/GBg+Ch67EDva/hrkSuf9XPrZPWGv0aWnnH90Bp2 peGlPcC3HYGm6RIiYoW/ftdjFVx083O4dpykgayw= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, syzbot+959223586843e69a2674@syzkaller.appspotmail.com, Xin Long , "David S. Miller" Subject: [PATCH 5.11 600/601] Revert "net/sctp: fix race condition in sctp_destroy_sock" Date: Wed, 12 May 2021 16:51:17 +0200 Message-Id: <20210512144847.616868540@linuxfoundation.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210512144827.811958675@linuxfoundation.org> References: <20210512144827.811958675@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Xin Long commit 01bfe5e8e428b475982a98a46cca5755726f3f7f upstream. This reverts commit b166a20b07382b8bc1dcee2a448715c9c2c81b5b. This one has to be reverted as it introduced a dead lock, as syzbot reported: CPU0 CPU1 ---- ---- lock(&net->sctp.addr_wq_lock); lock(slock-AF_INET6); lock(&net->sctp.addr_wq_lock); lock(slock-AF_INET6); CPU0 is the thread of sctp_addr_wq_timeout_handler(), and CPU1 is that of sctp_close(). The original issue this commit fixed will be fixed in the next patch. Reported-by: syzbot+959223586843e69a2674@syzkaller.appspotmail.com Signed-off-by: Xin Long Signed-off-by: David S. Miller Signed-off-by: Greg Kroah-Hartman --- net/sctp/socket.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) --- a/net/sctp/socket.c +++ b/net/sctp/socket.c @@ -1520,9 +1520,11 @@ static void sctp_close(struct sock *sk, /* Supposedly, no process has access to the socket, but * the net layers still may. + * Also, sctp_destroy_sock() needs to be called with addr_wq_lock + * held and that should be grabbed before socket lock. */ - local_bh_disable(); - bh_lock_sock(sk); + spin_lock_bh(&net->sctp.addr_wq_lock); + bh_lock_sock_nested(sk); /* Hold the sock, since sk_common_release() will put sock_put() * and we have just a little more cleanup. @@ -1531,7 +1533,7 @@ static void sctp_close(struct sock *sk, sk_common_release(sk); bh_unlock_sock(sk); - local_bh_enable(); + spin_unlock_bh(&net->sctp.addr_wq_lock); sock_put(sk); @@ -4991,6 +4993,9 @@ static int sctp_init_sock(struct sock *s sk_sockets_allocated_inc(sk); sock_prot_inuse_add(net, sk->sk_prot, 1); + /* Nothing can fail after this block, otherwise + * sctp_destroy_sock() will be called without addr_wq_lock held + */ if (net->sctp.default_auto_asconf) { spin_lock(&sock_net(sk)->sctp.addr_wq_lock); list_add_tail(&sp->auto_asconf_list, @@ -5025,9 +5030,7 @@ static void sctp_destroy_sock(struct soc if (sp->do_auto_asconf) { sp->do_auto_asconf = 0; - spin_lock_bh(&sock_net(sk)->sctp.addr_wq_lock); list_del(&sp->auto_asconf_list); - spin_unlock_bh(&sock_net(sk)->sctp.addr_wq_lock); } sctp_endpoint_free(sp->ep); local_bh_disable();