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 A9047C6FD1C for ; Fri, 24 Mar 2023 10:35:10 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231658AbjCXKfI (ORCPT ); Fri, 24 Mar 2023 06:35:08 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56490 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229734AbjCXKfG (ORCPT ); Fri, 24 Mar 2023 06:35:06 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 070941AD; Fri, 24 Mar 2023 03:35:05 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 6F65662A3B; Fri, 24 Mar 2023 10:35:05 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 0BE62C433EF; Fri, 24 Mar 2023 10:35:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1679654104; bh=R6AHyT4VK2SKRPK37TZm5Le0My/nLlBY56tfIt3oIOk=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=AJGC8Co2ydH4rBXjExx9YBlfv/6aHZkSAYRHO2fpNwCVLOgP0g+AFhRjqA758ZkWR 4v8O7PLforWQY74UG/OoCwFB7aIUQdsQiUDrGFU3vNT7HXjsKt4YeB4O5abesu0K77 MWcFM+yZbh4+DJOiA8eiSM8obkk6QeU3S6Wi7kdl+NauLJfExdSwRLwHKLL40h6aGs DHAtm5k1HF9/25m8lYJSs8Y7LeX4EEOwvQMDwCohrPHfULTtzPvDuTarrPCTubgdfv qdvRiHkOfEmglGm9MWP/r1FjTGkHKLQPrSfHrkkxpsGvyWzF7VRut/Tyfdvy0k24Wa Xq/yIdVFs+QlA== Date: Fri, 24 Mar 2023 16:04:52 +0530 From: Manivannan Sadhasivam To: Jeffrey Hugo Cc: mhi@lists.linux.dev, linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH] bus: mhi: host: Range check CHDBOFF and ERDBOFF Message-ID: <20230324103452.GC4259@thinkpad> References: <1679066059-8399-1-git-send-email-quic_jhugo@quicinc.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <1679066059-8399-1-git-send-email-quic_jhugo@quicinc.com> Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Fri, Mar 17, 2023 at 09:14:19AM -0600, Jeffrey Hugo wrote: > If the value read from the CHDBOFF and ERDBOFF registers is outside the > range of the MHI register space then an invalid address might be computed > which later causes a kernel panic. Range check the read value to prevent > a crash due to bad data from the device. > > Fixes: 6cd330ae76ff ("bus: mhi: core: Add support for ringing channel/event ring doorbells") Please CC stable list. > Signed-off-by: Jeffrey Hugo > Reviewed-by: Pranjal Ramajor Asha Kanojiya > --- > drivers/bus/mhi/host/init.c | 12 ++++++++++++ > 1 file changed, 12 insertions(+) > > diff --git a/drivers/bus/mhi/host/init.c b/drivers/bus/mhi/host/init.c > index 3d779ee..ae8ebcfb 100644 > --- a/drivers/bus/mhi/host/init.c > +++ b/drivers/bus/mhi/host/init.c > @@ -516,6 +516,12 @@ int mhi_init_mmio(struct mhi_controller *mhi_cntrl) > return -EIO; > } > > + if (val >= mhi_cntrl->reg_len - (8 * MHI_DEV_WAKE_DB)) { > + dev_err(dev, "CHDB offset: 0x%x is out of range: 0x%zx\n", > + val, mhi_cntrl->reg_len - (8 * MHI_DEV_WAKE_DB)); > + return -EINVAL; Isn't -ERANGE a better errno here and also in other places of the driver? Thanks, Mani > + } > + > /* Setup wake db */ > mhi_cntrl->wake_db = base + val + (8 * MHI_DEV_WAKE_DB); > mhi_cntrl->wake_set = false; > @@ -532,6 +538,12 @@ int mhi_init_mmio(struct mhi_controller *mhi_cntrl) > return -EIO; > } > > + if (val >= mhi_cntrl->reg_len - (8 * mhi_cntrl->total_ev_rings)) { > + dev_err(dev, "ERDB offset: 0x%x is out of range: 0x%zx\n", > + val, mhi_cntrl->reg_len - (8 * mhi_cntrl->total_ev_rings)); > + return -EINVAL; > + } > + > /* Setup event db address for each ev_ring */ > mhi_event = mhi_cntrl->mhi_event; > for (i = 0; i < mhi_cntrl->total_ev_rings; i++, val += 8, mhi_event++) { > -- > 2.7.4 > > -- மணிவண்ணன் சதாசிவம்