From patchwork Fri May 1 13:21:53 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Kroah-Hartman X-Patchwork-Id: 226675 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=3.0 tests=DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE, SPF_PASS, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id BD5A7C4724C for ; Fri, 1 May 2020 13:30:20 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 98AC8208D6 for ; Fri, 1 May 2020 13:30:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1588339820; bh=JZJ6dw1MBV0VmUloaY0uX5m+6fq5uN/5lbLMBBNi8R8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=LtbqgNr/G/SgfJGlttDdSb1fQjlnqwFO1tBzyB4shcctrBUU442kQKmpKTnmT1Yjs Hn0qC+wcYmMuZpkjo6s5uIRzikbFM5ukxSjeMxs0Ega/IpBD0MkhuH1vaEl/RuxscD Pan7tKXpNJsUZ2IlheTrdbB2CDHbUby7jqGykANc= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729917AbgEANaT (ORCPT ); Fri, 1 May 2020 09:30:19 -0400 Received: from mail.kernel.org ([198.145.29.99]:54288 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729911AbgEANaS (ORCPT ); Fri, 1 May 2020 09:30:18 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 310EE208D6; Fri, 1 May 2020 13:30:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1588339817; bh=JZJ6dw1MBV0VmUloaY0uX5m+6fq5uN/5lbLMBBNi8R8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=lYyu9vkbCxJj6eNFM0WTsEl+uPkv/NpQLotXfU/vevkIWiD+w9IUoG/4aL77ieFxF fJobo7kBE4j+0AP0PsbLeD9hBiZTOKmTxZTF6URhIJbPaDTz3rtipJE6bvqH0BpQXc 5TJuaHqQ9niIZ8ZN2PifDGd8lLIl/Xa22R/wDj50= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Clement Leger , Bjorn Andersson , Doug Anderson Subject: [PATCH 4.9 59/80] remoteproc: Fix wrong rvring index computation Date: Fri, 1 May 2020 15:21:53 +0200 Message-Id: <20200501131531.273408824@linuxfoundation.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200501131513.810761598@linuxfoundation.org> References: <20200501131513.810761598@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Clement Leger commit 00a0eec59ddbb1ce966b19097d8a8d2f777e726a upstream. Index of rvring is computed using pointer arithmetic. However, since rvring->rvdev->vring is the base of the vring array, computation of rvring idx should be reversed. It previously lead to writing at negative indices in the resource table. Signed-off-by: Clement Leger Link: https://lore.kernel.org/r/20191004073736.8327-1-cleger@kalray.eu Signed-off-by: Bjorn Andersson Cc: Doug Anderson Signed-off-by: Greg Kroah-Hartman --- drivers/remoteproc/remoteproc_core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/drivers/remoteproc/remoteproc_core.c +++ b/drivers/remoteproc/remoteproc_core.c @@ -284,7 +284,7 @@ void rproc_free_vring(struct rproc_vring { int size = PAGE_ALIGN(vring_size(rvring->len, rvring->align)); struct rproc *rproc = rvring->rvdev->rproc; - int idx = rvring->rvdev->vring - rvring; + int idx = rvring - rvring->rvdev->vring; struct fw_rsc_vdev *rsc; dma_free_coherent(rproc->dev.parent, size, rvring->va, rvring->dma);