From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 9D74BC55192 for ; Thu, 23 Apr 2020 10:19:46 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 7124220704 for ; Thu, 23 Apr 2020 10:19:46 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726750AbgDWKTo (ORCPT ); Thu, 23 Apr 2020 06:19:44 -0400 Received: from mga04.intel.com ([192.55.52.120]:29833 "EHLO mga04.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726490AbgDWKTo (ORCPT ); Thu, 23 Apr 2020 06:19:44 -0400 IronPort-SDR: TC88eBxm469uo44iVhzRyCaK1OwYEZ+KJRohid+U5Tnkr4YHgQHkOJDIb3jXhpAnIeb8XMTeHn sk8oNkYsL4+w== X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by fmsmga104.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 23 Apr 2020 03:19:43 -0700 IronPort-SDR: rcIskyk6nKvlN2GAWkh1/9Dyc0RneQxqJWAa7jtqbzZNgub/bIh7ytz6vk0u81XppObMID7o6D yKgKBxTWIO3Q== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.73,306,1583222400"; d="scan'208";a="365963385" Received: from kuha.fi.intel.com ([10.237.72.162]) by fmsmga001.fm.intel.com with SMTP; 23 Apr 2020 03:19:41 -0700 Received: by kuha.fi.intel.com (sSMTP sendmail emulation); Thu, 23 Apr 2020 13:19:40 +0300 Date: Thu, 23 Apr 2020 13:19:40 +0300 From: Heikki Krogerus To: Hans de Goede Cc: Greg Kroah-Hartman , linux-usb@vger.kernel.org, Naoki Kiryu , stable@vger.kernel.org Subject: Re: [PATCH] usb: typec: altmode: Fix typec_altmode_get_partner sometimes returning an invalid pointer Message-ID: <20200423101940.GA1286704@kuha.fi.intel.com> References: <20200422144345.43262-1-hdegoede@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20200422144345.43262-1-hdegoede@redhat.com> Sender: linux-usb-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-usb@vger.kernel.org On Wed, Apr 22, 2020 at 04:43:45PM +0200, Hans de Goede wrote: > From: Naoki Kiryu > > Before this commit, typec_altmode_get_partner would return a > const struct typec_altmode * pointing to address 0x08 when > to_altmode(adev)->partner was NULL. > > Add a check for to_altmode(adev)->partner being NULL to fix this. > > BugLink: https://bugzilla.kernel.org/show_bug.cgi?id=206365 > BugLink: https://bugzilla.redhat.com/show_bug.cgi?id=1785972 > Fixes: 5f54a85db5df ("usb: typec: Make sure an alt mode exist before getting its partner") > Cc: stable@vger.kernel.org > Signed-off-by: Naoki Kiryu > Signed-off-by: Hans de Goede Acked-by: Heikki Krogerus > --- > drivers/usb/typec/bus.c | 5 ++++- > 1 file changed, 4 insertions(+), 1 deletion(-) > > diff --git a/drivers/usb/typec/bus.c b/drivers/usb/typec/bus.c > index c823122f9cb7..e8ddb81cb6df 100644 > --- a/drivers/usb/typec/bus.c > +++ b/drivers/usb/typec/bus.c > @@ -198,7 +198,10 @@ EXPORT_SYMBOL_GPL(typec_altmode_vdm); > const struct typec_altmode * > typec_altmode_get_partner(struct typec_altmode *adev) > { > - return adev ? &to_altmode(adev)->partner->adev : NULL; > + if (!adev || !to_altmode(adev)->partner) > + return NULL; > + > + return &to_altmode(adev)->partner->adev; > } > EXPORT_SYMBOL_GPL(typec_altmode_get_partner); > > -- > 2.26.0 thanks, -- heikki