Received: by 2002:a6b:500f:0:0:0:0:0 with SMTP id e15csp4632325iob; Sun, 8 May 2022 19:58:15 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyIhyCKzeLGjpy2WkjEi4BiPExKhVa4DAI20FBrA93vyBB0Zqxh19f7krvN15JEwyhG+RRY X-Received: by 2002:a63:ce47:0:b0:3c6:77a0:d3be with SMTP id r7-20020a63ce47000000b003c677a0d3bemr7317786pgi.317.1652065095357; Sun, 08 May 2022 19:58:15 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1652065095; cv=none; d=google.com; s=arc-20160816; b=X0XnWaCXUeGporP4GQGDmC+EqwpuM8qfhtP/gx5fLjPCHkJAtdO9JJdYLX+ncLJQWG dsgdDDavL8UcAC9j0Fb9BlPyr7UyT8EEJjcBXFHzQgodtAzhRrncYRBGB7uZSOP6CFwL HaQowBXDoYZ54mtSeLWnREKTJfoac1Ql9icL++kLRMCkFCPita+IRWQljILILK+gTWbh 6VeHaHfCQg+Kn03wJJyQvZMfdhCXBr3HF7lTFODNeYhb+c+LGxtn2YVuHvDO6Be0SKzo 64VNMYn5eDasJSDFuJocrXfEX2maFj9tA22Nj+8RoCflpapt1wEKRFN89F8OH8Iqm7jo 4Scg== 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=w+SWt8f8LYbOlbEQUMHHRfJl7StqxvuBwQ25XuaiPvE=; b=MeAvVfn1Z01XkS2Lg5SQ/h2ZwLRU9mJMoHaZhfizQ2XV3gOMzJ2sTfyu1k0STCi77W cPRR0VCoExeoD6lyAet5t7gNqPlSu/D67VbNIh7b5JwNYGkaxrA4gL2ZoNZbwJBit7Qp zKzdEWsp5EUAHojiaFLL8Hn6rxc01CLuXXUQ6vLYsTg1vlscYH3vWZ/OqMNlc6IsNO30 InQ5X2Q0WjZ3n+daKMmE6aPYImDWUB5/AWRxzLulXurpi4PjetbfMo0xHAGXTowSAGIP ofk5m9+scox9EyFayrPqgKRZmYu043CoRwuWoOIIHXiEOsWaa8E36+kn97HMCALxpZyJ +7IA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=fwfOWJ41; spf=softfail (google.com: domain of transitioning linux-kernel-owner@vger.kernel.org does not designate 23.128.96.19 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 lindbergh.monkeyblade.net (lindbergh.monkeyblade.net. [23.128.96.19]) by mx.google.com with ESMTPS id q7-20020a631f47000000b003c282a340a8si12530184pgm.59.2022.05.08.19.58.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 08 May 2022 19:58:15 -0700 (PDT) Received-SPF: softfail (google.com: domain of transitioning linux-kernel-owner@vger.kernel.org does not designate 23.128.96.19 as permitted sender) client-ip=23.128.96.19; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=fwfOWJ41; spf=softfail (google.com: domain of transitioning linux-kernel-owner@vger.kernel.org does not designate 23.128.96.19 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id CFC468301E; Sun, 8 May 2022 19:57:07 -0700 (PDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1359326AbiEDRwF (ORCPT + 99 others); Wed, 4 May 2022 13:52:05 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58780 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1357459AbiEDRPD (ORCPT ); Wed, 4 May 2022 13:15:03 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [IPv6:2604:1380:4601:e00::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 04E2D54F85; Wed, 4 May 2022 09:58:37 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id E0B23B8279A; Wed, 4 May 2022 16:58:30 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 82217C385AF; Wed, 4 May 2022 16:58:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1651683509; bh=S9CG5PrKilja1DC3IfHXSacjvDyPgN6Ugi5V3mCrnCM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=fwfOWJ41ph5R3q58XU9rO5/I+rJEU3zXoP2+KLgp4GtMjQEvOd9U8oAMIOFtMASaJ DOJZ8OBqdY0p+RpQLwZ3lKJ5+0pZ5cLbgb/8/dc6ga2hisDf1z9LDgH4mCpK3oY7Wc Vmclr7M/2V1g4DwM5X4eDMi7oGNZvTB9eCN8lXIo= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Duoming Zhou , Paolo Abeni , Sasha Levin Subject: [PATCH 5.17 172/225] drivers: net: hippi: Fix deadlock in rr_close() Date: Wed, 4 May 2022 18:46:50 +0200 Message-Id: <20220504153125.594738261@linuxfoundation.org> X-Mailer: git-send-email 2.36.0 In-Reply-To: <20220504153110.096069935@linuxfoundation.org> References: <20220504153110.096069935@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-2.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RDNS_NONE,SPF_HELO_NONE,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Duoming Zhou [ Upstream commit bc6de2878429e85c1f1afaa566f7b5abb2243eef ] There is a deadlock in rr_close(), which is shown below: (Thread 1) | (Thread 2) | rr_open() rr_close() | add_timer() spin_lock_irqsave() //(1) | (wait a time) ... | rr_timer() del_timer_sync() | spin_lock_irqsave() //(2) (wait timer to stop) | ... We hold rrpriv->lock in position (1) of thread 1 and use del_timer_sync() to wait timer to stop, but timer handler also need rrpriv->lock in position (2) of thread 2. As a result, rr_close() will block forever. This patch extracts del_timer_sync() from the protection of spin_lock_irqsave(), which could let timer handler to obtain the needed lock. Signed-off-by: Duoming Zhou Link: https://lore.kernel.org/r/20220417125519.82618-1-duoming@zju.edu.cn Signed-off-by: Paolo Abeni Signed-off-by: Sasha Levin --- drivers/net/hippi/rrunner.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/net/hippi/rrunner.c b/drivers/net/hippi/rrunner.c index 16105292b140..74e845fa2e07 100644 --- a/drivers/net/hippi/rrunner.c +++ b/drivers/net/hippi/rrunner.c @@ -1355,7 +1355,9 @@ static int rr_close(struct net_device *dev) rrpriv->fw_running = 0; + spin_unlock_irqrestore(&rrpriv->lock, flags); del_timer_sync(&rrpriv->timer); + spin_lock_irqsave(&rrpriv->lock, flags); writel(0, ®s->TxPi); writel(0, ®s->IpRxPi); -- 2.35.1