From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id B95EF15957A; Mon, 29 Jan 2024 17:07:24 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1706548044; cv=none; b=SFEcciLfpZKXMbJ6Ix/me77g/ardYr585sPa8fpkEyshZD+UDVbOowzYY8y76nTBzWuNzA6vUA0/FqZe8cM+UILiS9Xae9cnVW3uMh1R3LG50+i0gWre1LPEVEaQMGNFdUAlYbyoRgSlaReThugSv2gu1AztXhu3y2Gz1BWi3k8= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1706548044; c=relaxed/simple; bh=DZ19t269uGMIVetrgdqMyIlnHQhH4PywPeOwcUEJQuE=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=PHMa6rThlc4Qrm1Vv+kQLAKJvcwxPY8xcJdA21ECPF1iXTL1nt3Ls7SpaV/exV6GPd/UD5XlrLhSn1bbZ1qYMS4f9O8cmxz/ceLhaPRC5QLaODUS8EW8Fl4tnfKhqlBrUcEnnUCYGjyK4dFhV+mm8/icDglA3RHkkGKXHEfUUgs= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=2M3rHDRu; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="2M3rHDRu" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 71667C43394; Mon, 29 Jan 2024 17:07:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1706548044; bh=DZ19t269uGMIVetrgdqMyIlnHQhH4PywPeOwcUEJQuE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=2M3rHDRu2Jj/7pAjtczjpnFPhGxLdXGbT2MwwKPPaxl/4TJy5y2UDqWq8Huloknf0 LqbRe9NLbO13RE2Zt/g4APTrIGujwTizwRU65n/Kmx0cJlUhSFuWGgc8vdmU0nkySA cQaXi0ZzCfN113tZw7tkJd/lG0llahP2y7IiM4XY= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Krishna chaitanya chundru , Jeffrey Hugo , Manivannan Sadhasivam Subject: [PATCH 6.7 045/346] bus: mhi: host: Add alignment check for event ring read pointer Date: Mon, 29 Jan 2024 09:01:16 -0800 Message-ID: <20240129170017.712534280@linuxfoundation.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240129170016.356158639@linuxfoundation.org> References: <20240129170016.356158639@linuxfoundation.org> User-Agent: quilt/0.67 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.7-stable review patch. If anyone has any objections, please let me know. ------------------ From: Krishna chaitanya chundru commit eff9704f5332a13b08fbdbe0f84059c9e7051d5f upstream. Though we do check the event ring read pointer by "is_valid_ring_ptr" to make sure it is in the buffer range, but there is another risk the pointer may be not aligned. Since we are expecting event ring elements are 128 bits(struct mhi_ring_element) aligned, an unaligned read pointer could lead to multiple issues like DoS or ring buffer memory corruption. So add a alignment check for event ring read pointer. Fixes: ec32332df764 ("bus: mhi: core: Sanity check values from remote device before use") cc: stable@vger.kernel.org Signed-off-by: Krishna chaitanya chundru Reviewed-by: Jeffrey Hugo Reviewed-by: Manivannan Sadhasivam Link: https://lore.kernel.org/r/20231031-alignment_check-v2-1-1441db7c5efd@quicinc.com Signed-off-by: Manivannan Sadhasivam Signed-off-by: Greg Kroah-Hartman --- drivers/bus/mhi/host/main.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) --- a/drivers/bus/mhi/host/main.c +++ b/drivers/bus/mhi/host/main.c @@ -268,7 +268,8 @@ static void mhi_del_ring_element(struct static bool is_valid_ring_ptr(struct mhi_ring *ring, dma_addr_t addr) { - return addr >= ring->iommu_base && addr < ring->iommu_base + ring->len; + return addr >= ring->iommu_base && addr < ring->iommu_base + ring->len && + !(addr & (sizeof(struct mhi_ring_element) - 1)); } int mhi_destroy_device(struct device *dev, void *data)