From patchwork Sat Jan 21 16:31:09 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Keeping X-Patchwork-Id: 9530339 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 7BC606020B for ; Sat, 21 Jan 2017 16:32:21 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 6E4AE28119 for ; Sat, 21 Jan 2017 16:32:21 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 632A02842E; Sat, 21 Jan 2017 16:32:21 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-3.6 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED,RCVD_IN_SORBS_SPAM,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 2DEA528119 for ; Sat, 21 Jan 2017 16:32:21 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id C176B6E298; Sat, 21 Jan 2017 16:32:04 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from metanate.com (dougal.metanate.com [90.155.101.14]) by gabe.freedesktop.org (Postfix) with ESMTPS id 6A5B66E28E for ; Sat, 21 Jan 2017 16:32:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=simple/simple; d=metanate.com; s=stronger; h=References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From; bh=xIcSVBlsI6NxrTRdBz1N4yroMy3NoRWrUYr4mZk7v54=; b=kFyRjDOqe+ZwFfCVc49d0ZSrvhxPbFn6B1R+TdQYWjs+yMr5KUoyNbwx+Ib9idEEsY06zJY8Bjyi1kSNwTHpuQ4LUqec/VlYHeu1LI/zcnXBRwycwKz32aZgadQEDcDowgkvW2x5lbKjBa0sv9aOSBxsInNTazcpVMLhlazqkCsw3usFHnpoc4gIMB40kgQndvS7Sr+uXl/YEMTMgHoEMNLCXLbrWFgBwnxon0w/nmDL72IURudCAMxfTyyNxhRRzOpCY+ZGxTVTnpKMxnubvmO95clUnl98AdkCdJJul41ucn8ORDbzdIlaiRlL3DfM8PrrrXlDVCb0kTkunPrkRw==; Received: from johnkeeping.plus.com ([81.174.171.191] helo=localhost.localdomain) by shrek.metanate.com with esmtpsa (TLSv1.2:DHE-RSA-AES128-GCM-SHA256:128) (Exim 4.83_RC2) (envelope-from ) id 1cUyZy-0004rJ-Jw; Sat, 21 Jan 2017 16:31:50 +0000 From: John Keeping To: Mark Yao Subject: [PATCH v2 07/26] drm/rockchip: dw-mipi-dsi: avoid out-of-bounds read on tx_buf Date: Sat, 21 Jan 2017 16:31:09 +0000 Message-Id: <20170121163128.22240-8-john@metanate.com> X-Mailer: git-send-email 2.11.0.197.gb556de5.dirty In-Reply-To: <20170121163128.22240-1-john@metanate.com> References: <20170121163128.22240-1-john@metanate.com> Cc: linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, linux-rockchip@lists.infradead.org, Chris Zhong , linux-arm-kernel@lists.infradead.org X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Virus-Scanned: ClamAV using ClamSMTP As a side-effect of this, encode the endianness explicitly rather than casting a u16. Signed-off-by: John Keeping Reviewed-by: Chris Zhong --- Unchanged in v2 --- drivers/gpu/drm/rockchip/dw-mipi-dsi.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/rockchip/dw-mipi-dsi.c b/drivers/gpu/drm/rockchip/dw-mipi-dsi.c index 4be1ff3a42bb..2e6ad4591ebf 100644 --- a/drivers/gpu/drm/rockchip/dw-mipi-dsi.c +++ b/drivers/gpu/drm/rockchip/dw-mipi-dsi.c @@ -572,8 +572,13 @@ static int dw_mipi_dsi_gen_pkt_hdr_write(struct dw_mipi_dsi *dsi, u32 hdr_val) static int dw_mipi_dsi_dcs_short_write(struct dw_mipi_dsi *dsi, const struct mipi_dsi_msg *msg) { - const u16 *tx_buf = msg->tx_buf; - u32 val = GEN_HDATA(*tx_buf) | GEN_HTYPE(msg->type); + const u8 *tx_buf = msg->tx_buf; + u32 val = GEN_HTYPE(msg->type); + + if (msg->tx_len > 0) + val |= GEN_HDATA(tx_buf[0]); + if (msg->tx_len > 1) + val |= GEN_HDATA(tx_buf[1] << 8); if (msg->tx_len > 2) { dev_err(dsi->dev, "too long tx buf length %zu for short write\n",