Received: by 2002:a05:6358:5282:b0:b5:90e7:25cb with SMTP id g2csp1082147rwa; Sun, 21 Aug 2022 00:05:19 -0700 (PDT) X-Google-Smtp-Source: AA6agR6jqsA3SEkP5LhxmGGz9A0pxXTjDIs5yOr/L7EO8TrIjQWxB9AQxVDaIZtq7h5fW3boN3kq X-Received: by 2002:a17:907:86aa:b0:73d:670d:3f8f with SMTP id qa42-20020a17090786aa00b0073d670d3f8fmr3442790ejc.723.1661065519232; Sun, 21 Aug 2022 00:05:19 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1661065519; cv=none; d=google.com; s=arc-20160816; b=uCQTdkLj4bJLHCSQKeUNhVuxZS5eabV8k04gxTxZ8OMxgoR8Qsn7R32kmOGshf0wnJ LJfWvdaA9oVNQV/Gx8OFBF3cFMLR48blIAbjvYblB7WuTfSGtfkSQEzCUa+w8Ga+TK9q ZoVuqSPCOq6lQ0xQmqMoCiKnmL3CHO1e8k/OLtcmWjCjbwW+OFyaHF5IBB0ZKuj2u9Vk +UZqVC20yozb486V7KeLTZYpe367jGqVx2LtQ+mF+e2WFMDUXXRWoCXSDRYB8bwL6zQE dln4jSP+zm1U1yqC9v6EnTNLPi8r3NHS4Z5sT9C9atk1V0Sw0njH3fgeCNT8Esah6lBL VVsg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:in-reply-to:content-disposition:mime-version :references:message-id:subject:cc:to:from:date:dkim-signature; bh=z/NBFdLZtTRa3QZSlOGTzOIaec1u/fb1sH1wxjCVKdw=; b=ntc2uqEn/8OpEM/xoQuvn+blSXZAxCsV2BQP8cqETYcp6+A0mpvYt6sbkoOHcQ0mni +dx+T3xBezUvB87QMsfJQV9VV/+utig9aabm0rQkpGLOMOx9qWE7wVZQThoGZvuxw1Nl 2hOLgUTWT+sL30SLFuJb4aA1aPfA+D+OtHrLY+NX0oF3oMyVuLZdwUNUNRuuqbzef1y4 Ue5B1zyg28NCUrPIkJUfmr5X2I6rcn/l2cWIYc+1PdS16Q/ZsctImykGIJcKEwHw3hoa Rn7+SE9DHajRoxBEE+q+H3V1mpy0YgiM8tZDbQ7Kin8GzPYTIGe7KwYULOE5htTDN9dG fpPQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b="gaRiIVD/"; 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=linuxfoundation.org Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id hr7-20020a1709073f8700b007262ad8839esi8348613ejc.16.2022.08.21.00.04.53; Sun, 21 Aug 2022 00:05:19 -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=@linuxfoundation.org header.s=korg header.b="gaRiIVD/"; 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=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229892AbiHUHBz (ORCPT + 99 others); Sun, 21 Aug 2022 03:01:55 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50610 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229738AbiHUHBi (ORCPT ); Sun, 21 Aug 2022 03:01:38 -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 C45C92AC49; Sun, 21 Aug 2022 00:01:36 -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 ECC64B80BA8; Sun, 21 Aug 2022 07:01:34 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 1D1A8C433D6; Sun, 21 Aug 2022 07:01:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1661065293; bh=IkBhuQ4Ga0ENimbZcXbIIWSwXIVkLhO73dH4+EuA5qk=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=gaRiIVD//Qr759lieITGg0VK5y8wZHNrbBrROJxrwx7M8f0yQz3U3PklMmRWCJ2ac A/2TxsYoxPbDbFCMPf2cNq41YOSAOVZhklFeCGAZb/qHkk5y7eyqU93AD1oIStI8uV YjlV4MWCK0hySxeUQOkFco/U5bjU9gBtUYvMYTNo= Date: Sat, 20 Aug 2022 20:40:52 +0200 From: Greg Kroah-Hartman To: Heikki Krogerus , Takashi Iwai Cc: Linyu Yuan , linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org Subject: Re: [REGRESSION 5.19] NULL dereference by ucsi_acpi driver Message-ID: References: <87r11cmbx0.wl-tiwai@suse.de> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <87r11cmbx0.wl-tiwai@suse.de> X-Spam-Status: No, score=-6.1 required=5.0 tests=BAYES_00,DATE_IN_PAST_12_24, 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 On Fri, Aug 19, 2022 at 06:32:43PM +0200, Takashi Iwai wrote: > Hi, > > we've got multiple reports about 5.19 kernel starting crashing after > some time, and this turned out to be triggered by ucsi_acpi driver. > The details are found in: > https://bugzilla.suse.com/show_bug.cgi?id=1202386 > > The culprit seems to be the commit 87d0e2f41b8c > usb: typec: ucsi: add a common function ucsi_unregister_connectors() Adding Heikki to the thread... > > This commit looks as if it were a harmless cleanup, but this failed in > a subtle way. Namely, in the error scenario, the driver gets an error > at ucsi_register_altmodes(), and goes to the error handling to release > the resources. Through this refactoring, the release part was unified > to a funciton ucsi_unregister_connectors(). And there, it has a NULL > check of con->wq, and it bails out the loop if it's NULL. > Meanwhile, ucsi_register_port() itself still calls destroy_workqueue() > and clear con->wq at its error path. This ended up in the leftover > power supply device with the uninitialized / cleared device. > > It was confirmed that the problem could be avoided by a simple > revert. I'll be glad to revert this now, unless Heikki thinks: > > I guess another fix could be removing the part clearing con->wq, i.e. > > --- a/drivers/usb/typec/ucsi/ucsi.c > +++ b/drivers/usb/typec/ucsi/ucsi.c > @@ -1192,11 +1192,6 @@ static int ucsi_register_port(struct ucsi *ucsi, int index) > out_unlock: > mutex_unlock(&con->lock); > > - if (ret && con->wq) { > - destroy_workqueue(con->wq); > - con->wq = NULL; > - } > - > return ret; > } > > > ... but it's totally untested and I'm not entirely sure whether it's > better. that is any better? thanks, greg k-h