Received: by 2002:a05:6a10:2726:0:0:0:0 with SMTP id ib38csp2234495pxb; Wed, 30 Mar 2022 20:12:01 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwJtPJEbfXbMVO297+cQSPCkcjK7zPvwCRD/VGws9zSuNWVq9qWI2263qmykx6qr7Xl3col X-Received: by 2002:a05:6a00:1da1:b0:4fa:a53d:d0a5 with SMTP id z33-20020a056a001da100b004faa53dd0a5mr36664099pfw.42.1648696321349; Wed, 30 Mar 2022 20:12:01 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1648696321; cv=none; d=google.com; s=arc-20160816; b=KidpT3U6QnkOXriuKapktrjJBW5P50Z8Y7SOfIny7UekaocmG3XRT3ejxrkrjtyr6F I14zjdyTBhBaPgrDoF7+1ZuvB/bdLAcQbDTGxUhKFRtBqdvLAi/MqRN7ZzjNtl2mVY0T HGZwtepQUZWkoDQtUVBnQXptQ9UPgnDEkHdqpOmkjJ+bIkqpcFzX9gYi+R5yhiSdGiYB sLdbNIyNgGqm1BX1Tn41tqOlG8MELrqjdOUoXIZ9KN20YJpAnETNfYJhBR00o/v16TRv Yvp60RDFYawd5J2ZfKDSnd3lmMY6xoDm5xS79p2mYo7NAy5nndhqmTl2vY2JNuQu3e2R b2Nw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:cc:to:subject:message-id:date:from:in-reply-to :references:mime-version:dkim-signature; bh=s9G70I/zaybCNjMBuuh48NsQh+RQ1aOHxWfcOdS61NU=; b=YgvfxOy+NERmjjIzxPB42On8wjG6A30ay6rjiUWd+CpbqA4T2WdHJ+TMAN39Dkgyw1 pYFA5bTJZxWZR7/jhN5db14NZO6sFdsJHFqFiBPPu8X+YgLJ0w4HSSrcCPSW+cXfzuIP JZHsyurZg+DneiYiM4qUrxrUvrKfN2QtkSpzLkR/rB2/V5BBSz6Q3N2VDjtB5x2AJu7p 9sx/jt/GyRLVCUL/YjhD7MC7/LuHA4BZyDvJA6N4sDIJRGRW7sG241KSO4qVvDkawvVk F6a0YfLkGUFoi/lWglBcseFX8Xea9QBsPHRqorq//K1SDyl1RY9Rk37T8ziArYiSLb5w z7MA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@google.com header.s=20210112 header.b=dAD9ZiAY; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com Return-Path: Received: from lindbergh.monkeyblade.net (lindbergh.monkeyblade.net. [2620:137:e000::1:18]) by mx.google.com with ESMTPS id b7-20020a170902e94700b00153b2d1644asi20825900pll.82.2022.03.30.20.12.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 30 Mar 2022 20:12:01 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:18 as permitted sender) client-ip=2620:137:e000::1:18; Authentication-Results: mx.google.com; dkim=pass header.i=@google.com header.s=20210112 header.b=dAD9ZiAY; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id DB247F7F48; Wed, 30 Mar 2022 19:47:34 -0700 (PDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1348159AbiC3VRn (ORCPT + 99 others); Wed, 30 Mar 2022 17:17:43 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43308 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233332AbiC3VRk (ORCPT ); Wed, 30 Mar 2022 17:17:40 -0400 Received: from mail-ed1-x529.google.com (mail-ed1-x529.google.com [IPv6:2a00:1450:4864:20::529]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 727A45882A for ; Wed, 30 Mar 2022 14:15:54 -0700 (PDT) Received: by mail-ed1-x529.google.com with SMTP id c62so25946849edf.5 for ; Wed, 30 Mar 2022 14:15:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=s9G70I/zaybCNjMBuuh48NsQh+RQ1aOHxWfcOdS61NU=; b=dAD9ZiAYhN9sRAbOvEwtAfZoYaVGY7JhtrvE1XXU/1EyI5/2eySDpZRBKVDJ9S5FxM CbQ8rNM9kUCWaEn9N8sKxrwV/66j8r2ScFXW5BkCLsP30CXHUb42V/guKom3xLbpEhLq AeRl2Fa8CYE/ezROk0HeypXg3hBPAtou9TU8tZl3vPrQtgoIytTNAxYpWyiCKua94TZO Qa1AbJJsIcu2VLWb/QlVY5YuNQpUOod32dACG8pVCk4qDpQw3SBQoaORHMNhSfRNWIKp MSX1OM3Q2S2WKjSmDu1/Nm1tI1CHvhUmp0Zg/gu8wx5cdzrVQUVrBZnQU8qGZV4C6z5d 8CPg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=s9G70I/zaybCNjMBuuh48NsQh+RQ1aOHxWfcOdS61NU=; b=XRDa97jNGm5P+kgqwbZ4PM+NTW/quBIUQKA//DSD1OMDfXH/LwG6J6HfUMPKn2oTZJ tCE6SAnYrC0L6iUyZ/t0MhqJYkN+AvXm/g/BuphNMbCmcH3rpxWVS7dDxhXjDrDHHjjW SBEtTv5tMmbZMLr2512Lp1eyAVHV2EqW0RyHoLrgrNwJm8yzGkJPRK93Sz8ezA5Hw1Dw c6ZKTjb6FyOQxtMR2ZhTBwxDxkfgOynPV1C6qSMh9/3azkXXiODWnUBH/pDtbbNCUWD9 fMGV4uHKOuEiqghhrjU3B8MX+32HaWor9/i09NE2kzxbFNHnGNcdB2HtkFffnbmmCAi7 GNYw== X-Gm-Message-State: AOAM532XDsIT/krSlJ7ZTV2LOEPjLVSXyvm39bJvHrVN4kFWlMB6Ghc5 ICpkJvFy4MFYzdWfvHh6RbD94+vGk3Iw8u++icv3rg== X-Received: by 2002:a05:6402:254e:b0:418:e716:f987 with SMTP id l14-20020a056402254e00b00418e716f987mr13079947edb.74.1648674952841; Wed, 30 Mar 2022 14:15:52 -0700 (PDT) MIME-Version: 1.0 References: <20220330205543.2064615-1-wonchung@google.com> In-Reply-To: <20220330205543.2064615-1-wonchung@google.com> From: Won Chung Date: Wed, 30 Mar 2022 14:15:40 -0700 Message-ID: Subject: Re: [PATCH v2] sound/hda: Add NULL check to component match callback function To: Jaroslav Kysela , Takashi Iwai Cc: Heikki Krogerus , Mika Westerberg , Benson Leung , Prashant Malani , linux-kernel@vger.kernel.org, stable@vger.kernel.org Content-Type: text/plain; charset="UTF-8" X-Spam-Status: No, score=-9.5 required=5.0 tests=BAYES_00,DKIMWL_WL_MED, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RDNS_NONE,SPF_HELO_NONE,T_SCC_BODY_TEXT_LINE, USER_IN_DEF_DKIM_WL autolearn=no 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 Wed, Mar 30, 2022 at 1:55 PM Won Chung wrote: > > Component match callback function needs to check if expected data is > passed to it. Without this check, it can cause a NULL pointer > dereference when another driver registers a component before i915 > drivers have their component master fully bind. > > Fixes: 7b882fe3e3e8b ("ALSA: hda - handle multiple i915 device instances") > Signed-off-by: Heikki Krogerus > Signed-off-by: Mika Westerberg > Signed-off-by: Won Chung > --- > - Add "Fixes" tag > - Send to stable@vger.kernel.org > > sound/hda/hdac_i915.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/sound/hda/hdac_i915.c b/sound/hda/hdac_i915.c > index efe810af28c5..958b0975fa40 100644 > --- a/sound/hda/hdac_i915.c > +++ b/sound/hda/hdac_i915.c > @@ -102,13 +102,13 @@ static int i915_component_master_match(struct device *dev, int subcomponent, > struct pci_dev *hdac_pci, *i915_pci; > struct hdac_bus *bus = data; > > - if (!dev_is_pci(dev)) > + if (!dev_is_pci(dev) || !bus) > return 0; > > hdac_pci = to_pci_dev(bus->dev); > i915_pci = to_pci_dev(dev); > > - if (!strcmp(dev->driver->name, "i915") && > + if (dev->driver && !strcmp(dev->driver->name, "i915") && > subcomponent == I915_COMPONENT_AUDIO && > connectivity_check(i915_pci, hdac_pci)) > return 1; > -- > 2.35.1.1021.g381101b075-goog > Hi, I am resending this patch to correct email accounts. Sorry for confusion. Thanks, Won