From patchwork Wed Mar 30 20:55:43 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Won Chung X-Patchwork-Id: 555260 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 1310DC433EF for ; Wed, 30 Mar 2022 20:55:55 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232343AbiC3U5j (ORCPT ); Wed, 30 Mar 2022 16:57:39 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40652 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229891AbiC3U5i (ORCPT ); Wed, 30 Mar 2022 16:57:38 -0400 Received: from mail-pj1-x1049.google.com (mail-pj1-x1049.google.com [IPv6:2607:f8b0:4864:20::1049]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id BB135167FE for ; Wed, 30 Mar 2022 13:55:52 -0700 (PDT) Received: by mail-pj1-x1049.google.com with SMTP id mq8-20020a17090b380800b001c6f8962e95so535129pjb.1 for ; Wed, 30 Mar 2022 13:55:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; h=date:message-id:mime-version:subject:from:to:cc; bh=fuRrXdsCRqzg+1qCb9I6FDwYnHbmBjFKNJzRCp889gI=; b=M10w2f7BstD7C/YkxqdBqK5uM+YHXdt7cblQWQ+ryWqUdSnZQPYYCoT9drOuZdMz5g YFTUE70bG+zoEU32ySLAFgCYe+4fwMmSQDlAwvoqlpOaK0aZh4ftlk2OeK3LAS2EKyKZ AgbqW1yHnwjI5N1/3M4CAU+5+9umeunbgq0FlA5cLHKEZgKD12jO4iIR+7l6mjq601mI 73lpN/8RZ4seREOX6M/D3WFKP7ysHdrmLI6jbzQk3RsOS+P/6DGsZ3a2+FOsBrQRmWdJ 2zo1882YSKNtv2UbbrWqSRfzntQlOUv6eI6Sn+eRHOGC7mm+ejJWsq+JRC4K9Mu0cty9 JYdQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:date:message-id:mime-version:subject:from:to:cc; bh=fuRrXdsCRqzg+1qCb9I6FDwYnHbmBjFKNJzRCp889gI=; b=o1TzLJ8Ww6m2Lg60Xve+iujCzBul4DFh0GyNCNOR82IAMEIDumyCtIqpdRoY1mibWd LpIc3LpQA3wpe/KdOg41R+swI0CWPqEgWfuQoO7fkNB7nb7npVw5txL9nmaSAUH9jY90 oxk0qFlzAZIM6o3v6eP3sYOXzRCZIXVGnd3xqJvQraIT30kVyBeb5LRX2oPspE9RflcC sUGLlt1dconsUhJ877t9Qn4mmuGwlzb2beNf4A6eU05cdZPklC4qBcfXPKc5g44CsFXM RDyrBbct/9LhP+P4mY3LEnLPDjzks0guN4NuwwUdQ93z7xF3sZE+NtzRqYPW0qOeVpSM MKjw== X-Gm-Message-State: AOAM530kBJXfCyDeVURO2zC4W+9cnAxP2MYiKDwrraH2Vwq6Gb8sKJFU nypiG90bL9pUXSYsYc/NET+xomzz2ApYAQ== X-Google-Smtp-Source: ABdhPJxOidzSbO2lGNLqW0nT6Qnr1sDRUAC84FarjkZhbKNtYjCY7NQ/XunZAORsrxJd/TuPX7/l1UPcf9uJdQ== X-Received: from wonchungspecialist.c.googlers.com ([fda3:e722:ac3:cc00:7f:e700:c0a8:1440]) (user=wonchung job=sendgmr) by 2002:a05:6a00:1702:b0:4fd:aae0:84a1 with SMTP id h2-20020a056a00170200b004fdaae084a1mr1516689pfc.12.1648673752216; Wed, 30 Mar 2022 13:55:52 -0700 (PDT) Date: Wed, 30 Mar 2022 20:55:43 +0000 Message-Id: <20220330205543.2064615-1-wonchung@google.com> Mime-Version: 1.0 X-Mailer: git-send-email 2.35.1.1021.g381101b075-goog Subject: [PATCH v2] sound/hda: Add NULL check to component match callback function From: Won Chung To: Jaroslav Kysela , Takashi Iwai Cc: Heikki Krogerus , Mika Westerberg , Benson Leung , Prashant Malani , linux-kernel@vger.kernel.org, stable@vger.kernel.org, Won Chung Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org 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;