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 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,URIBL_BLOCKED,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 7A08CC432C0 for ; Fri, 22 Nov 2019 10:39:43 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 514C320718 for ; Fri, 22 Nov 2019 10:39:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1574419183; bh=QIdrYBN1CMXCnK5GnZ7PBljurGUU0QC3Y6NR8gwZJLw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=n0lT4noaKA4ASmcKutHcOTAxt9W92/hbvJNuZvh70gCBJUevnKJCMdNiBS8/+cz/G lSQGc5K9A2/IQQwIRPaoy6jTS5/XIU39PwVgkculFw8SSs17NB3aOqXrNgm4W+unvr iaigFrSWf1SVQpwmIPrROAWmDQHYqzoHEpbimXiU= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728808AbfKVKjm (ORCPT ); Fri, 22 Nov 2019 05:39:42 -0500 Received: from mail.kernel.org ([198.145.29.99]:42992 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728090AbfKVKjk (ORCPT ); Fri, 22 Nov 2019 05:39:40 -0500 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 3232920718; Fri, 22 Nov 2019 10:39:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1574419179; bh=QIdrYBN1CMXCnK5GnZ7PBljurGUU0QC3Y6NR8gwZJLw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=LFwswbRk+NL8NJe5QfhF1lLsBABxrSPWqIGEcl37P5q1K86S4yU43h5njY36Mp+H1 tbqkVro6qkRS9sGEVsGrt+oWlu8sEznTKgpf/tUrMngeCiWv1bDUbLQ9oBYExNHpj/ 2E96IMQGy34FkxZFo6sDhZ4QCVHDehRwQSVzrRwA= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Lucas Stach , Dmitry Torokhov Subject: [PATCH 4.9 006/222] Input: synaptics-rmi4 - fix video buffer size Date: Fri, 22 Nov 2019 11:25:46 +0100 Message-Id: <20191122100831.559220488@linuxfoundation.org> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191122100830.874290814@linuxfoundation.org> References: <20191122100830.874290814@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Lucas Stach commit 003f01c780020daa9a06dea1db495b553a868c29 upstream. The video buffer used by the queue is a vb2_v4l2_buffer, not a plain vb2_buffer. Using the wrong type causes the allocation of the buffer storage to be too small, causing a out of bounds write when __init_vb2_v4l2_buffer initializes the buffer. Signed-off-by: Lucas Stach Fixes: 3a762dbd5347 ("[media] Input: synaptics-rmi4 - add support for F54 diagnostics") Cc: stable@vger.kernel.org Link: https://lore.kernel.org/r/20191104114454.10500-1-l.stach@pengutronix.de Signed-off-by: Dmitry Torokhov Signed-off-by: Greg Kroah-Hartman --- drivers/input/rmi4/rmi_f54.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/drivers/input/rmi4/rmi_f54.c +++ b/drivers/input/rmi4/rmi_f54.c @@ -364,7 +364,7 @@ static const struct vb2_ops rmi_f54_queu static const struct vb2_queue rmi_f54_queue = { .type = V4L2_BUF_TYPE_VIDEO_CAPTURE, .io_modes = VB2_MMAP | VB2_USERPTR | VB2_DMABUF | VB2_READ, - .buf_struct_size = sizeof(struct vb2_buffer), + .buf_struct_size = sizeof(struct vb2_v4l2_buffer), .ops = &rmi_f54_queue_ops, .mem_ops = &vb2_vmalloc_memops, .timestamp_flags = V4L2_BUF_FLAG_TIMESTAMP_MONOTONIC,