Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2b66e0c4 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "mhi: core: confirm MHI offset is valid before using it"

parents 43b7c183 d035bea9

drivers/platform/msm/mhi/mhi_bhi.c

+3 −3
Original line number Diff line number Diff line 
/* Copyright (c) 2014-2016, The Linux Foundation. All rights reserved.

/* Copyright (c) 2014-2017, The Linux Foundation. All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and
@@ -39,7 +39,7 @@ static int bhi_alloc_bhie_xfer(struct mhi_device_ctxt *mhi_dev_ctxt, 
{

	struct bhi_ctxt_t *bhi_ctxt = &mhi_dev_ctxt->bhi_ctxt;

	struct device *dev = &mhi_dev_ctxt->plat_dev->dev;

	const u32 align = bhi_ctxt->alignment - 1;

	const phys_addr_t align = bhi_ctxt->alignment - 1;

	size_t seg_size = bhi_ctxt->firmware_info.segment_size;

	/* We need one additional entry for Vector Table */

	int segments = DIV_ROUND_UP(size, seg_size) + 1;
@@ -112,7 +112,7 @@ static int bhi_alloc_pbl_xfer(struct mhi_device_ctxt *mhi_dev_ctxt, 
			      size_t size)

{

	struct bhi_ctxt_t *bhi_ctxt = &mhi_dev_ctxt->bhi_ctxt;

	const u32 align_len = bhi_ctxt->alignment;

	const phys_addr_t align_len = bhi_ctxt->alignment;

	size_t alloc_size = size + (align_len - 1);

	struct device *dev = &mhi_dev_ctxt->plat_dev->dev;

drivers/platform/msm/mhi/mhi_ssr.c

+8 −1
Original line number Diff line number Diff line 
/* Copyright (c) 2014-2016, The Linux Foundation. All rights reserved.

/* Copyright (c) 2014-2017, The Linux Foundation. All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and
@@ -139,6 +139,13 @@ int set_mhi_base_state(struct mhi_device_ctxt *mhi_dev_ctxt) 


	mhi_dev_ctxt->bhi_ctxt.bhi_base = mhi_dev_ctxt->core.bar0_base;

	pcie_word_val = mhi_reg_read(mhi_dev_ctxt->bhi_ctxt.bhi_base, BHIOFF);



	/* confirm it's a valid reading */

	if (unlikely(pcie_word_val == U32_MAX)) {

		mhi_log(mhi_dev_ctxt, MHI_MSG_ERROR,

			"Invalid BHI Offset:0x%x\n", pcie_word_val);

		return -EIO;

	}

	mhi_dev_ctxt->bhi_ctxt.bhi_base += pcie_word_val;

	pcie_word_val = mhi_reg_read(mhi_dev_ctxt->bhi_ctxt.bhi_base,

				     BHI_EXECENV);