From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1760007Ab2C2QxP (ORCPT ); Thu, 29 Mar 2012 12:53:15 -0400 Received: from mail-yw0-f74.google.com ([209.85.213.74]:53379 "EHLO mail-yw0-f74.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1759728Ab2C2Qta (ORCPT ); Thu, 29 Mar 2012 12:49:30 -0400 From: Daniel Kurtz To: Dmitry Torokhov , Henrik Rydberg , Joonyoung Shim , Nick Dyer , linux-input@vger.kernel.org, linux-kernel@vger.kernel.org, Benson Leung , Yufeng Shen Cc: Daniel Kurtz Subject: [PATCH 05/16 v2] Input: atmel_mxt_ts - verify object size in mxt_write_object Date: Fri, 30 Mar 2012 00:49:15 +0800 Message-Id: <1333039766-8617-6-git-send-email-djkurtz@chromium.org> X-Mailer: git-send-email 1.7.7.3 In-Reply-To: <1333039766-8617-1-git-send-email-djkurtz@chromium.org> References: <1333039766-8617-1-git-send-email-djkurtz@chromium.org> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Don't allow writing past the length of an object. Signed-off-by: Daniel Kurtz --- drivers/input/touchscreen/atmel_mxt_ts.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/drivers/input/touchscreen/atmel_mxt_ts.c b/drivers/input/touchscreen/atmel_mxt_ts.c index 920b35c..242976d 100644 --- a/drivers/input/touchscreen/atmel_mxt_ts.c +++ b/drivers/input/touchscreen/atmel_mxt_ts.c @@ -501,7 +501,7 @@ static int mxt_write_object(struct mxt_data *data, u16 reg; object = mxt_get_object(data, type); - if (!object) + if (!object || offset >= object->size) return -EINVAL; reg = object->start_address; -- 1.7.7.3