Received: by 2002:a05:7412:8d10:b0:f3:1519:9f41 with SMTP id bj16csp1615537rdb; Thu, 7 Dec 2023 04:29:14 -0800 (PST) X-Google-Smtp-Source: AGHT+IEYY6hHWrNei+6vTYp3AFgTDL5S6+VbSEggkfjlTupQ/0T4cJiw6QdZoERiwIIje7u4Hhis X-Received: by 2002:a05:6a21:6d86:b0:18f:ff44:87fd with SMTP id wl6-20020a056a216d8600b0018fff4487fdmr1260045pzb.62.1701952153840; Thu, 07 Dec 2023 04:29:13 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1701952153; cv=none; d=google.com; s=arc-20160816; b=dxtIdXZqNe+8rfe3cNIk7x+N7Hp4H+GRY0zmLzjQptp6aVF91Bi2g6zvzSERng1PqO G2jPRwuAljkdPaa17az+OvBpaJJkWOZUoA20mWe4g/XQ7jwNpOewJ5APMcQiW73NU4Y+ NiAfYGjvxG5ohhK/GJml1G74PQYqiyu4SSkpvMA2alYFWhJFvizZQvFZuYd3wYQ6L5gX Qc/NWYv/XTMi2hZQMe0OCSVC+0NbuW0luEWbUAeAHBEhmPduRAx3YGnzizqeHnMiF7+J /xSd8cbSwIOm+c8FxkBjmnab6o1/BXjqsBwWOFODPRENAU5A02lxVsszwIfbmJVy2GgK HSvg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:message-id:date:subject:cc:to:from :dkim-signature; bh=Lid62c13OA13UOuK4ZHFWJw8LQvMIM6OUlJkAmjS2aw=; fh=m4AgftYF7wCI/LpnzBfsOb0qoWNw7odDcx6P/is3tZk=; b=NPYkqIdVOjXLT57Rwtqw2kiaG5nT3OMZMxSK/QtNmadZanYFSV1kjHpLx8S1HZeFeU eXT/ZSGZkghZcVNd6L9mdgl2OFuzcV2zYWnLb14scZR5mEPwnR2oVRjhTNbJDkBJrm73 Ie36mlEE4cbLDYPjyCoLxItQlgaKwxzAo5c2LyZJ0dkV5Oj1zQWzp0gT8/xFaou/HMHY tFVP/dFKax/bsCUUlkhtfFOSVv2ii+AzVokrOO7eV4k/UD4A1Rz89UsLlf77p+fzsQd4 sGmHONcqS2fuYHXw97Z7R7YxYcVkBfwma89OjwpKjA/G6SvEtrYYMtrlgZzGIGvP3raE mEcg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20230601 header.b=R3pTQ2P7; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.31 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from morse.vger.email (morse.vger.email. [23.128.96.31]) by mx.google.com with ESMTPS id c28-20020a631c5c000000b005b7d9aace9dsi1122392pgm.46.2023.12.07.04.29.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 07 Dec 2023 04:29:13 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.31 as permitted sender) client-ip=23.128.96.31; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20230601 header.b=R3pTQ2P7; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.31 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by morse.vger.email (Postfix) with ESMTP id 9C476801C898; Thu, 7 Dec 2023 04:29:11 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at morse.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232559AbjLGM24 (ORCPT + 99 others); Thu, 7 Dec 2023 07:28:56 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33450 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232186AbjLGM2z (ORCPT ); Thu, 7 Dec 2023 07:28:55 -0500 Received: from mail-pf1-x42b.google.com (mail-pf1-x42b.google.com [IPv6:2607:f8b0:4864:20::42b]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8446084; Thu, 7 Dec 2023 04:29:01 -0800 (PST) Received: by mail-pf1-x42b.google.com with SMTP id d2e1a72fcca58-6ceba6c4b8dso199554b3a.1; Thu, 07 Dec 2023 04:29:01 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1701952141; x=1702556941; darn=vger.kernel.org; h=message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=Lid62c13OA13UOuK4ZHFWJw8LQvMIM6OUlJkAmjS2aw=; b=R3pTQ2P71oWwOEsR3F+FIkrEDfQ3pb2aQ792ZWI3Bis/nQHdoXAHTnYxBDSAqoTupG YJEpF2z0uPtVSQAK7dqwfaMgfCqkJ39aUXN59pv19zGa9YTjmkjRYlJNGzbjxnKHaJ+7 NzsjEj/BYnw9GZzIzu8n3rIaQCZ8WEw646oZNGC+3+iN8iVgGm1KG21yjJNwBji4Hy1y VPkhsqd3AI+i0H4GxIxqd4UvbA/zVwQDExM9JtkCWDoAE0/1i+X+QIUsK7xdAup5qnih sGIzPaF4ZPHHDypCncitpbEmAjDGigG6M4Vabge6p3wFPyHPmc0Wps7RjoxNoayMvuak yZKg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1701952141; x=1702556941; h=message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Lid62c13OA13UOuK4ZHFWJw8LQvMIM6OUlJkAmjS2aw=; b=WijmHhYdGuDRUjuZHs8lAmj1b9T1YI+VIXqPYnMemH7KzvszBA7vVG9EKr7O4XHOdc vwui3hrDEchhn695g077pI/xbkz44/R6CK7XK3Yh9i9YxGMLZSWU/eaOCg1WL1ceeTjg V0PBT1dbtkXDPbw1R46Jd2p9HuguBwb7F+JeGnhjYE7WBJAku78FUq5g/OsM4U8PRYZM 7qF2QFLbcFzjwz1t7OUnJwSJis+302WWdJgShDzd2Xji2t/24TpSqSP73NcC0a6+Rc5C VVj5DtrWcmBEFz3VbOAp82eg5DddJEWTlXxbV2osmyovDv/xTT9hcvK8BnDZWl8/wFE3 b7cw== X-Gm-Message-State: AOJu0YwJ/GynaHtpkAUjZVmfinmPCM24NnYjbXPERMQOcxxxC5s4vZGg nEhklZD108jTzuqlqSJrldo= X-Received: by 2002:a05:6a20:9381:b0:18d:b43:78ea with SMTP id x1-20020a056a20938100b0018d0b4378eamr2911595pzh.43.1701952140676; Thu, 07 Dec 2023 04:29:00 -0800 (PST) Received: from 377044c6c369.cse.ust.hk (191host097.mobilenet.cse.ust.hk. [143.89.191.97]) by smtp.gmail.com with ESMTPSA id x20-20020a056a00189400b006ce5066282bsm1164715pfh.34.2023.12.07.04.28.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 07 Dec 2023 04:29:00 -0800 (PST) From: Chengfeng Ye To: 3chas3@gmail.com, davem@davemloft.net, horms@kernel.org, kuba@kernel.org Cc: linux-atm-general@lists.sourceforge.net, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Chengfeng Ye Subject: [PATCH v3 1/2] atm: solos-pci: Fix potential deadlock on &cli_queue_lock Date: Thu, 7 Dec 2023 12:28:49 +0000 Message-Id: <20231207122849.41798-1-dg573847474@gmail.com> X-Mailer: git-send-email 2.17.1 X-Spam-Status: No, score=-0.6 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SPF_HELO_NONE, SPF_PASS,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 morse.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (morse.vger.email [0.0.0.0]); Thu, 07 Dec 2023 04:29:11 -0800 (PST) As &card->cli_queue_lock is acquired under softirq context along the following call chain from solos_bh(), other acquisition of the same lock inside process context should disable at least bh to avoid double lock. console_show() --> spin_lock(&card->cli_queue_lock) --> solos_bh() --> spin_lock(&card->cli_queue_lock) This flaw was found by an experimental static analysis tool I am developing for irq-related deadlock. To prevent the potential deadlock, the patch uses spin_lock_bh() on the card->cli_queue_lock under process context code consistently to prevent the possible deadlock scenario. Signed-off-by: Chengfeng Ye --- drivers/atm/solos-pci.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/atm/solos-pci.c b/drivers/atm/solos-pci.c index 94fbc3abe60e..95f768b28a5e 100644 --- a/drivers/atm/solos-pci.c +++ b/drivers/atm/solos-pci.c @@ -449,9 +449,9 @@ static ssize_t console_show(struct device *dev, struct device_attribute *attr, struct sk_buff *skb; unsigned int len; - spin_lock(&card->cli_queue_lock); + spin_lock_bh(&card->cli_queue_lock); skb = skb_dequeue(&card->cli_queue[SOLOS_CHAN(atmdev)]); - spin_unlock(&card->cli_queue_lock); + spin_unlock_bh(&card->cli_queue_lock); if(skb == NULL) return sprintf(buf, "No data.\n"); -- 2.17.1