From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 953F93F23CC; Tue, 17 Mar 2026 16:47:02 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773766022; cv=none; b=VNEl1v7+Y/vUsyIK5Taa/Ct4G20juLTND6kiHA2zxDv1RJXt/hTjPT+dHojqJllSjTz7mQPH8Th8HFUaSuYcj1wD7887VeoS51ccS1hsXEKXFTnHpydV06AMOjfXp3TBUGUP5NpRije6XlzBC/KBgFDuXi2fXODdbB5TLxkPpq4= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773766022; c=relaxed/simple; bh=/GV2qdCABUdDVwkl7KtobTOJzi34l/8RNK0q2OaYY2g=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=DqGnOPTUG+PzCl98HYk5G1Lt6Egt+p92IpxvGSdZKBg6M5K///HlhxJInNQpkvrmxh5EFpLtLboMT78Z7TU18M1D+ETTi4piieRgJnr1jbQn/++dtK44GMLl0HsEY5G3x0kMMVBxsSubNaKDQmUOegHhJRyJ/W0j5LhAauodnNA= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=BiJfRadu; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="BiJfRadu" Received: by smtp.kernel.org (Postfix) with ESMTPSA id F1D4BC4CEF7; Tue, 17 Mar 2026 16:47:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1773766022; bh=/GV2qdCABUdDVwkl7KtobTOJzi34l/8RNK0q2OaYY2g=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=BiJfRadur1BcoysDR9/Owa10nWMYe3pxsdGBBUPKyITMK0502Eh0Uvzs1yUPew7P+ /NsD0m0GKlqQpkJoRZrTRYaxbiRaln/AYzTDr4UIqStWLTxjc+LaIW/HxLDZC8cN2g vBOBreRiFXFKSduw2/9YlgcSbK3zkniIE1cmZkws= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, stable , Xu Yang , Arnaud Ferraris , Heikki Krogerus Subject: [PATCH 6.19 153/378] usb: roles: get usb role switch from parent only for usb-b-connector Date: Tue, 17 Mar 2026 17:31:50 +0100 Message-ID: <20260317163012.642193547@linuxfoundation.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260317163006.959177102@linuxfoundation.org> References: <20260317163006.959177102@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.19-stable review patch. If anyone has any objections, please let me know. ------------------ From: Xu Yang commit 8345b1539faa49fcf9c9439c3cbd97dac6eca171 upstream. usb_role_switch_is_parent() was walking up to the parent node and checking for the "usb-role-switch" property regardless of the type of the passed fwnode. This could cause unrelated device nodes to be probed as potential role switch parent, leading to spurious matches and "-EPROBE_DEFER" being returned infinitely. Till now only Type-B connector node will have a parent node which may present "usb-role-switch" property and register the role switch device. For Type-C connector node, its parent node will always be a Type-C chip device which will never register the role switch device. However, it may still present a non-boolean "usb-role-switch = <&usb_controller>" property for historical compatibility. So restrict the helper to only operate on Type-B connector when attempting to get the role switch from parent node. Fixes: 6fadd72943b8 ("usb: roles: get usb-role-switch from parent") Cc: stable Signed-off-by: Xu Yang Tested-by: Arnaud Ferraris Reviewed-by: Heikki Krogerus Link: https://patch.msgid.link/20260309074313.2809867-3-xu.yang_2@nxp.com Signed-off-by: Greg Kroah-Hartman --- drivers/usb/roles/class.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) --- a/drivers/usb/roles/class.c +++ b/drivers/usb/roles/class.c @@ -139,9 +139,14 @@ static void *usb_role_switch_match(const static struct usb_role_switch * usb_role_switch_is_parent(struct fwnode_handle *fwnode) { - struct fwnode_handle *parent = fwnode_get_parent(fwnode); + struct fwnode_handle *parent; struct device *dev; + if (!fwnode_device_is_compatible(fwnode, "usb-b-connector")) + return NULL; + + parent = fwnode_get_parent(fwnode); + if (!fwnode_property_present(parent, "usb-role-switch")) { fwnode_handle_put(parent); return NULL;