From patchwork Wed Dec 2 09:41:35 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Manivannan Sadhasivam X-Patchwork-Id: 335951 Delivered-To: patch@linaro.org Received: by 2002:a17:906:4755:0:0:0:0 with SMTP id j21csp777822ejs; Wed, 2 Dec 2020 01:44:46 -0800 (PST) X-Google-Smtp-Source: ABdhPJzmm/nsJ+Dz6Jqoyp1HdVh3L152lqqF3gSy8BUrd8qBmmN8+XMWt9lRp6gPKEjdDlU1DNtC X-Received: by 2002:a17:906:cd06:: with SMTP id oz6mr1485424ejb.25.1606902285924; Wed, 02 Dec 2020 01:44:45 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1606902285; cv=none; d=google.com; s=arc-20160816; b=KeJu9boYhi4gqof3aX84HnTxhS+pCL78i2WpmHZY2qgImc9A1d9nB/OptkOq5YuKCU iucAE19nkEIvR37lwmWz5WPwVwRejOyMQnAUUSPCiAEAfRXnRaDboe5P5MLDV54fJBdp RIE+w8JXnjgr5ZBSq9rkgHBlhKZo7oUbwmCTceP6g2bGaJidTpHZ8i4rAgHWsIhbljZR NX1ixxb1j8axpufogYyoL4QwD8NRvBvkMK6frDCrK2yWvDN6omtIYUXsxo15v6bAMJaq tXVHFuuICPDALxPTFmeBNbOChU0huZXRfFSsWCXvgSYoRa0SZaVTz3Q8p1aCpkXy4cil 5lHQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=0LsQFaATp5kPNt9O4pgdJHaJ3akqe6fvWiwrf87Kxp4=; b=XGlzVFHADx6N3ecT4sLu0Zl+tOV7bJkRwg1Esjf/9G97T7r6DK5qUXSw8+H4iq6tMk gw83RZ/nGoHdGLu9dek8tItpAXtS5D8a/KxDMq8Q7g9QDBNOitO4G40H27Bmdup/EUEa j734nODE1H8VtR9dtsHKVeS4XP27tHqBywWLN5oSQ3DAZs1MmyptO1ngmjcEPIYghsEJ tzq+ndrDQh7OXJ924I3SwQQcFvVmnFaRsy0reqzoWl0oHt7q8GphJhPjLnQFcZtKT1cW hb8obCvKmV76FXHKN9VsIMjvkR4Ad1JBpo2OaXWaLIyN9PRrc4fOTNsiVHDGFXr/trsY DmRA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=hKj+OAqh; spf=pass (google.com: domain of linux-arm-msm-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-arm-msm-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id do13si531726ejc.286.2020.12.02.01.44.45; Wed, 02 Dec 2020 01:44:45 -0800 (PST) Received-SPF: pass (google.com: domain of linux-arm-msm-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=hKj+OAqh; spf=pass (google.com: domain of linux-arm-msm-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-arm-msm-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2388274AbgLBJn4 (ORCPT + 15 others); Wed, 2 Dec 2020 04:43:56 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54922 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2388293AbgLBJnz (ORCPT ); Wed, 2 Dec 2020 04:43:55 -0500 Received: from mail-pf1-x441.google.com (mail-pf1-x441.google.com [IPv6:2607:f8b0:4864:20::441]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 433D0C061A4C for ; Wed, 2 Dec 2020 01:42:46 -0800 (PST) Received: by mail-pf1-x441.google.com with SMTP id 131so879814pfb.9 for ; Wed, 02 Dec 2020 01:42:46 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=0LsQFaATp5kPNt9O4pgdJHaJ3akqe6fvWiwrf87Kxp4=; b=hKj+OAqhvuORH/zH/KUnQJ4X0Kfz7CN0EAUjbcR305J9Bd9GDJ6xEaDjXWCXrmgIJl Auqfpwa+o5bQLdGxbWsjL3Uxgc+01hl2lOr9dyQ5a2ON2BoPbHs8RNhqh7Hx5zOdioM3 s24OnkxpU6gTjh+vtL3EkvT6qvO7vhRCox9av/byOUhe8p8PpJCIcTeL56eBy25bjXtw EAmPU4z/SEz4C/HdhEmmAQVu1P16mOU4RV7K2PutZSXjBl3xNff77OTizeHjvQNfMpvC nvVQxiHWMdncUjWYnwOCdzcQDGq+A1L2hs/llM0WgHrv4wo0zT9VR99MzPX9Yx76cGWv 4bPA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=0LsQFaATp5kPNt9O4pgdJHaJ3akqe6fvWiwrf87Kxp4=; b=gDTadmRT3cmp5aRXMZhvwFruYMIHfwATf2Ci6NXuQaIZcb7k/oj7jXpPOKMj1Lcxxt vzFQ8mOqkSF1JQ9CZY9Y0bG9HzwSmI8YHlYp+qV5KSeZwU9O/dJeo5e/gN+Yz0qNYyCH WRlEZR0rBBoMtxVbtEDKOd/L56vhQtHo+pVRJ7jnjSVdJLRB50aEbCiwijU+ekrhQiT1 NGOIiWOLcSnNne8yVwrfOGU0GMM1UVoUkDvhQ9VX+RMCFNgT8EGwMFs413V5Ms6r4atO 10ASVf0Dc9MakOdSyFjNuRBvayN4269z8Cokplmr6yL8yEJuhXTEoKRn6nmC/bSJoTVy s3/g== X-Gm-Message-State: AOAM530GjDjm/BulwAy2kaGhJ+6A8je5YxIcahulQmhxhbuXZg8uU8Nd XRDQpEu5YrB65avCzw57prKr X-Received: by 2002:a63:211:: with SMTP id 17mr1942020pgc.56.1606902165559; Wed, 02 Dec 2020 01:42:45 -0800 (PST) Received: from localhost.localdomain ([103.59.133.81]) by smtp.gmail.com with ESMTPSA id bg8sm1393990pjb.52.2020.12.02.01.42.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 02 Dec 2020 01:42:44 -0800 (PST) From: Manivannan Sadhasivam To: gregkh@linuxfoundation.org Cc: hemantk@codeaurora.org, bbhatt@codeaurora.org, linux-arm-msm@vger.kernel.org, jhugo@codeaurora.org, linux-kernel@vger.kernel.org, loic.poulain@linaro.org, Carl Yin , Manivannan Sadhasivam Subject: [PATCH 05/29] bus: mhi: core: Fix null pointer access when parsing MHI configuration Date: Wed, 2 Dec 2020 15:11:35 +0530 Message-Id: <20201202094159.107075-6-manivannan.sadhasivam@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20201202094159.107075-1-manivannan.sadhasivam@linaro.org> References: <20201202094159.107075-1-manivannan.sadhasivam@linaro.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org From: Carl Yin Functions parse_ev_cfg() and parse_ch_cfg() access mhi_cntrl->mhi_dev before it is set in function mhi_register_controller(), use cntrl_dev instead of mhi_dev. Fixes: 0cbf260820fa ("bus: mhi: core: Add support for registering MHI controllers") Signed-off-by: Carl Yin Reviewed-by: Bhaumik Bhatt Reviewed-by: Hemant Kumar Reviewed-by: Manivannan Sadhasivam Signed-off-by: Manivannan Sadhasivam --- drivers/bus/mhi/core/init.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- 2.25.1 diff --git a/drivers/bus/mhi/core/init.c b/drivers/bus/mhi/core/init.c index 0a09f8215057..8cefa359fccd 100644 --- a/drivers/bus/mhi/core/init.c +++ b/drivers/bus/mhi/core/init.c @@ -610,7 +610,7 @@ static int parse_ev_cfg(struct mhi_controller *mhi_cntrl, { struct mhi_event *mhi_event; const struct mhi_event_config *event_cfg; - struct device *dev = &mhi_cntrl->mhi_dev->dev; + struct device *dev = mhi_cntrl->cntrl_dev; int i, num; num = config->num_events; @@ -692,7 +692,7 @@ static int parse_ch_cfg(struct mhi_controller *mhi_cntrl, const struct mhi_controller_config *config) { const struct mhi_channel_config *ch_cfg; - struct device *dev = &mhi_cntrl->mhi_dev->dev; + struct device *dev = mhi_cntrl->cntrl_dev; int i; u32 chan;