Received: by 2002:a05:6358:e9c4:b0:b2:91dc:71ab with SMTP id hc4csp4261456rwb; Sun, 7 Aug 2022 19:40:31 -0700 (PDT) X-Google-Smtp-Source: AA6agR7+73k4cHqWDZjfPU5b1rtUe7+crLK55fcjjhQZ0q9XFSlGq9Wp9I9OQ6toXhTDPpiO3OHp X-Received: by 2002:a05:6402:f17:b0:43e:4700:f63e with SMTP id i23-20020a0564020f1700b0043e4700f63emr16039196eda.190.1659926430970; Sun, 07 Aug 2022 19:40:30 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1659926430; cv=none; d=google.com; s=arc-20160816; b=iQTPvR7pghgt6WMgrOSCq5mLqfMZ1xQ98aYzQMK3Pg/YSYWbSRwv3b2fL/+HGvHS8W dFDOj7rnjq5D9+uqMZDJgZlkN9e4GS3wuq6c9x2f2w28m5NwHibkWxhSBnvz2U0maU2o 03SzQH+BsaX0r8vbR5Y1vtWTJWTkYckbwq/z70qChZKnGAuHLAKYdq90QhOcQ5ImZ9tI 27fp5G8xBvDXPJqAiLBffieeRN5ebPkFJpEvJLqW7JZlB3aWczuex7ltm7gBlIfWiybi MoBz8vD1f7kxTwQRxW2dl4qWNPqm4wFrDIyLfT1b1xjIbPVScfTBZxIM4kFT6Nrd8lW+ CRpQ== 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 :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=+WZDzV5J3ivELdyQiru2fUJPb0wO5/a1oSQJzWEi7Y0=; b=JGd3RRAx6/kbXR1bNZ8Ovd1OPckyowS7e0JKJmvsEeUcomw+VPpTkAuSUChGBAcVZa /lQeRlnf4fKM+ZJN2EmpWGfBUMxBbyorKtW2GXKcLl8qQLCG6hgoJ821irY2H8CF/gIS JoH8yjFQh867qsRlqUt0s+uRSncqecmEBM7GHPFFB1AwKmn22oRydMKkB7bzrAi52YWu k0eCH66QgZY6sBzoRI2jJFCpyn2dIOJ0MBWyQ3tapLlTDtwTqNlxtGi0JzbopF4uScev yVKAzd1/USmCTd1P877H5VPIka6UQO8/QK94M6fidT+2TiQ8Q0nc35Ts4CO2qo+r3NGR QHZA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=LvFvdjao; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id p21-20020a170907911500b00731745a7eefsi228003ejq.441.2022.08.07.19.40.06; Sun, 07 Aug 2022 19:40:30 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=LvFvdjao; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S242548AbiHHBiL (ORCPT + 99 others); Sun, 7 Aug 2022 21:38:11 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57804 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S242126AbiHHBgp (ORCPT ); Sun, 7 Aug 2022 21:36:45 -0400 Received: from sin.source.kernel.org (sin.source.kernel.org [IPv6:2604:1380:40e1:4800::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3AA73DFA0; Sun, 7 Aug 2022 18:33:35 -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 sin.source.kernel.org (Postfix) with ESMTPS id 5A395CE0F7F; Mon, 8 Aug 2022 01:33:33 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 703A4C433D6; Mon, 8 Aug 2022 01:33:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1659922411; bh=zHXXtMvGg4b4maDB7wqIZ15PbGofr2RdcvBPSMXAyHU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=LvFvdjaoh/NDuGwwlLEVFDgU/CtZ+pt0eun99RRwXe+rJMS2XjIa+iQb7mCS1XuzK 8wZIrqkxarPVc+r1D4PfZAc7TCvgwpo7DMOf+Fn33zF/TB2p8gADEsaqIP4v9bg/Dx Ike0InREUudqUuI+0IYeRNQXghn67+Rz2uHw34L4uCz6EB9FET1U0sNHtmYll1TYHq bY3BzAyqERHlvw7ROeHmRzN8RNU5dM/u5oax35aoozwayCcY7gEC/jrSV4yKA3Isaz +GkJUuGvj1eOKS5jaIymYAzs0d1t1s4sb+YbtXk/nQZwWsWuJ+tPqarLu43+IOniVZ N3wgmtP9nsvKA== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Tetsuo Handa , syzbot , "Rafael J . Wysocki" , Sasha Levin , rafael@kernel.org, pavel@ucw.cz, len.brown@intel.com, linux-pm@vger.kernel.org Subject: [PATCH AUTOSEL 5.19 52/58] PM: hibernate: defer device probing when resuming from hibernation Date: Sun, 7 Aug 2022 21:31:10 -0400 Message-Id: <20220808013118.313965-52-sashal@kernel.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220808013118.313965-1-sashal@kernel.org> References: <20220808013118.313965-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-7.7 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham 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: Tetsuo Handa [ Upstream commit 8386c414e27caba8501119948e9551e52b527f59 ] syzbot is reporting hung task at misc_open() [1], for there is a race window of AB-BA deadlock which involves probe_count variable. Currently wait_for_device_probe() from snapshot_open() from misc_open() can sleep forever with misc_mtx held if probe_count cannot become 0. When a device is probed by hub_event() work function, probe_count is incremented before the probe function starts, and probe_count is decremented after the probe function completed. There are three cases that can prevent probe_count from dropping to 0. (a) A device being probed stopped responding (i.e. broken/malicious hardware). (b) A process emulating a USB device using /dev/raw-gadget interface stopped responding for some reason. (c) New device probe requests keeps coming in before existing device probe requests complete. The phenomenon syzbot is reporting is (b). A process which is holding system_transition_mutex and misc_mtx is waiting for probe_count to become 0 inside wait_for_device_probe(), but the probe function which is called from hub_event() work function is waiting for the processes which are blocked at mutex_lock(&misc_mtx) to respond via /dev/raw-gadget interface. This patch mitigates (b) by deferring wait_for_device_probe() from snapshot_open() to snapshot_write() and snapshot_ioctl(). Please note that the possibility of (b) remains as long as any thread which is emulating a USB device via /dev/raw-gadget interface can be blocked by uninterruptible blocking operations (e.g. mutex_lock()). Please also note that (a) and (c) are not addressed. Regarding (c), we should change the code to wait for only one device which contains the image for resuming from hibernation. I don't know how to address (a), for use of timeout for wait_for_device_probe() might result in loss of user data in the image. Maybe we should require the userland to wait for the image device before opening /dev/snapshot interface. Link: https://syzkaller.appspot.com/bug?extid=358c9ab4c93da7b7238c [1] Reported-by: syzbot Signed-off-by: Tetsuo Handa Tested-by: syzbot Signed-off-by: Rafael J. Wysocki Signed-off-by: Sasha Levin --- kernel/power/user.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/kernel/power/user.c b/kernel/power/user.c index ad241b4ff64c..d43c2aa583b2 100644 --- a/kernel/power/user.c +++ b/kernel/power/user.c @@ -26,6 +26,7 @@ #include "power.h" +static bool need_wait; static struct snapshot_data { struct snapshot_handle handle; @@ -78,7 +79,7 @@ static int snapshot_open(struct inode *inode, struct file *filp) * Resuming. We may need to wait for the image device to * appear. */ - wait_for_device_probe(); + need_wait = true; data->swap = -1; data->mode = O_WRONLY; @@ -168,6 +169,11 @@ static ssize_t snapshot_write(struct file *filp, const char __user *buf, ssize_t res; loff_t pg_offp = *offp & ~PAGE_MASK; + if (need_wait) { + wait_for_device_probe(); + need_wait = false; + } + lock_system_sleep(); data = filp->private_data; @@ -244,6 +250,11 @@ static long snapshot_ioctl(struct file *filp, unsigned int cmd, loff_t size; sector_t offset; + if (need_wait) { + wait_for_device_probe(); + need_wait = false; + } + if (_IOC_TYPE(cmd) != SNAPSHOT_IOC_MAGIC) return -ENOTTY; if (_IOC_NR(cmd) > SNAPSHOT_IOC_MAXNR) -- 2.35.1