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 Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id CE553C433EF for ; Wed, 30 Mar 2022 20:49:08 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1351255AbiC3Uuw (ORCPT ); Wed, 30 Mar 2022 16:50:52 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56932 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1351250AbiC3Uua (ORCPT ); Wed, 30 Mar 2022 16:50:30 -0400 Received: from mail-pg1-x549.google.com (mail-pg1-x549.google.com [IPv6:2607:f8b0:4864:20::549]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 87C914579A for ; Wed, 30 Mar 2022 13:48:29 -0700 (PDT) Received: by mail-pg1-x549.google.com with SMTP id r28-20020a63205c000000b00398344a2582so5750113pgm.20 for ; Wed, 30 Mar 2022 13:48:29 -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=/g82k/yLueQhmfK5T8wtfFe4TaWb3pB9z1BLHTV6OJE=; b=ZLwfiXegtOpdGKQO5+Awr7UqpHxHq7YWpZLHThKlwygdWHkEdfaQhUwBLXkLorgM8e VYG9ldW0nT4Snd9SE3sUP5QbAHJZ77MNQT7dfwjvysO3vT5GISBhm4O1LtHn7dI1zwR6 orVt/ljchxeEjsT7wFoyMXoNx7+f2n608RHnJRA1r0+bxut21Y+rddwzSWjabl9TwtHA gh/RjUGC5dl9viJn+UvoywL+R7hV4PnFQQvhHcW+MJ+k89ab8tIOFRfQg5BwMc5kry1Q nvVFaUXDRz/FxjzHC60onq/gJvaNvb1meWYkjjvzlcAZ4hs6Ir8fbFeYU4IwgU0af40I SEKA== 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=/g82k/yLueQhmfK5T8wtfFe4TaWb3pB9z1BLHTV6OJE=; b=1hc3IZnx+rqcSd8qzyDrGkIi6h87Oq/uv2jmPDTHyWyQm7FLlxwZaENlr9hT/eA2FN GGZjADOl2AmNWU2UYYA/P2rYaaxzTu1FnVCYgihwLm9ItHYJeVBWOFeWxegIG8mRn/Fv eI6YKwEMY9a7uYNspq6ims463jajV6h7RCCK+HjO1SZopoyR9je5vAZkhXbM7U5mftfR Hq8fbhCVi51JMGFs+bYdIT/0gT9ByYzbtXMmhqLKPGLiZwkqQHotBTiw5HP2lKzcGcwj 0Xx3lJkz003X9UDkR2Lh5KPrPY8F/Gm2jFTdbZp6Kvg3840pd3F7chT38V9FFFIZWEjl oChg== X-Gm-Message-State: AOAM530664eLOtq7Jd+66wk7h8tyse7wIiHSQrBHatwCYLmMGMEgXg0v aOPoWPg0pKKFzCoAxXwuu04toLY4TjDFgg== X-Google-Smtp-Source: ABdhPJwo/TJxx9dwkuOJqRMDbdr8r/HZtULbQKNklDf3TJsj8fxT4i77GccosAsp1qcKZt/IiSQxwD6gUT4Cjg== X-Received: from wonchungspecialist.c.googlers.com ([fda3:e722:ac3:cc00:7f:e700:c0a8:1440]) (user=wonchung job=sendgmr) by 2002:a17:90b:4c44:b0:1c7:1326:ec90 with SMTP id np4-20020a17090b4c4400b001c71326ec90mr1666161pjb.87.1648673309036; Wed, 30 Mar 2022 13:48:29 -0700 (PDT) Date: Wed, 30 Mar 2022 20:48:09 +0000 Message-Id: <20220330204809.2061497-1-wonchung@google.com> Mime-Version: 1.0 X-Mailer: git-send-email 2.35.1.1021.g381101b075-goog Subject: [PATCH v2] misc/mei: Add NULL check to component match callback functions From: Won Chung To: Tomas Winkler Cc: Heikki Krogerus , Mika Westerberg , Benson Leung , Prashant Malani , linux-kernel@vger.kernel.org, stable@vger.kernel.org, Won Chung Content-Type: text/plain; charset="UTF-8" Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Component match callback functions need to check if expected data is passed to them. 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: 1e8d19d9b0dfc ("mei: hdcp: bind only with i915 on the same PCH") Fixes: c2004ce99ed73 ("mei: pxp: export pavp client to me client bus") Signed-off-by: Heikki Krogerus Signed-off-by: Mika Westerberg Signed-off-by: Won Chung --- Changes from v1: - Add "Fixes" tag - Send to stable@vger.kernel.org drivers/misc/mei/hdcp/mei_hdcp.c | 2 +- drivers/misc/mei/pxp/mei_pxp.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/misc/mei/hdcp/mei_hdcp.c b/drivers/misc/mei/hdcp/mei_hdcp.c index ec2a4fce8581..843dbc2b21b1 100644 --- a/drivers/misc/mei/hdcp/mei_hdcp.c +++ b/drivers/misc/mei/hdcp/mei_hdcp.c @@ -784,7 +784,7 @@ static int mei_hdcp_component_match(struct device *dev, int subcomponent, { struct device *base = data; - if (strcmp(dev->driver->name, "i915") || + if (!base || !dev->driver || strcmp(dev->driver->name, "i915") || subcomponent != I915_COMPONENT_HDCP) return 0; diff --git a/drivers/misc/mei/pxp/mei_pxp.c b/drivers/misc/mei/pxp/mei_pxp.c index f7380d387bab..e32a81da8af6 100644 --- a/drivers/misc/mei/pxp/mei_pxp.c +++ b/drivers/misc/mei/pxp/mei_pxp.c @@ -131,7 +131,7 @@ static int mei_pxp_component_match(struct device *dev, int subcomponent, { struct device *base = data; - if (strcmp(dev->driver->name, "i915") || + if (!base || !dev->driver || strcmp(dev->driver->name, "i915") || subcomponent != I915_COMPONENT_PXP) return 0; -- 2.35.1.1021.g381101b075-goog