From mboxrd@z Thu Jan 1 00:00:00 1970 From: akpm@linux-foundation.org Subject: - tpm-use-correct-data-types-for-sizes-in-tpm_write-and-tpm_read.patch removed from -mm tree Date: Sat, 26 Jul 2008 14:13:58 -0700 Message-ID: <200807262113.m6QLDwtJ019646@imap1.linux-foundation.org> Reply-To: linux-kernel@vger.kernel.org Return-path: Received: from smtp1.linux-foundation.org ([140.211.169.13]:55040 "EHLO smtp1.linux-foundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757548AbYGZVOo (ORCPT ); Sat, 26 Jul 2008 17:14:44 -0400 Sender: mm-commits-owner@vger.kernel.org List-Id: mm-commits@vger.kernel.org To: mhalcrow@us.ibm.com, tpm@selhorst.net, mm-commits@vger.kernel.org The patch titled tpm: Use correct data types for sizes in tpm_write() and tpm_read() has been removed from the -mm tree. Its filename was tpm-use-correct-data-types-for-sizes-in-tpm_write-and-tpm_read.patch This patch was dropped because it was merged into mainline or a subsystem tree The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/ ------------------------------------------------------ Subject: tpm: Use correct data types for sizes in tpm_write() and tpm_read() From: Michael Halcrow Use the correct data types for the size parameters in tpm_write() and tpm_read(). Note that rw_verify_area() makes sure that this bug cannot be exploited to produce a buffer overrun. Signed-off-by: Michael Halcrow Cc: Marcel Selhorst Signed-off-by: Andrew Morton --- drivers/char/tpm/tpm.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff -puN drivers/char/tpm/tpm.c~tpm-use-correct-data-types-for-sizes-in-tpm_write-and-tpm_read drivers/char/tpm/tpm.c --- a/drivers/char/tpm/tpm.c~tpm-use-correct-data-types-for-sizes-in-tpm_write-and-tpm_read +++ a/drivers/char/tpm/tpm.c @@ -1028,7 +1028,7 @@ ssize_t tpm_write(struct file *file, con size_t size, loff_t *off) { struct tpm_chip *chip = file->private_data; - int in_size = size, out_size; + size_t in_size = size, out_size; /* cannot perform a write until the read has cleared either via tpm_read or a user_read_timer timeout */ @@ -1063,7 +1063,7 @@ ssize_t tpm_read(struct file *file, char size_t size, loff_t *off) { struct tpm_chip *chip = file->private_data; - int ret_size; + ssize_t ret_size; del_singleshot_timer_sync(&chip->user_read_timer); flush_scheduled_work(); _ Patches currently in -mm which might be from mhalcrow@us.ibm.com are origin.patch git-unionfs.patch notify_change-callers-must-hold-i_mutex.patch