From patchwork Mon Sep 12 10:43:30 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jarkko Sakkinen X-Patchwork-Id: 668708 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.sourceforge.net (lists.sourceforge.net [216.34.181.88]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3sXktx5cYWz9sf6 for ; Mon, 12 Sep 2016 20:43:53 +1000 (AEST) Received: from localhost ([127.0.0.1] helo=sfs-ml-4.v29.ch3.sourceforge.com) by sfs-ml-4.v29.ch3.sourceforge.com with esmtp (Exim 4.76) (envelope-from ) id 1bjOiJ-0005Pg-5v; Mon, 12 Sep 2016 10:43:47 +0000 Received: from sog-mx-1.v43.ch3.sourceforge.com ([172.29.43.191] helo=mx.sourceforge.net) by sfs-ml-4.v29.ch3.sourceforge.com with esmtp (Exim 4.76) (envelope-from ) id 1bjOiI-0005PY-8r for tpmdd-devel@lists.sourceforge.net; Mon, 12 Sep 2016 10:43:46 +0000 X-ACL-Warn: Received: from mga06.intel.com ([134.134.136.31]) by sog-mx-1.v43.ch3.sourceforge.com with esmtps (TLSv1:AES256-SHA:256) (Exim 4.76) id 1bjOiH-0006Rk-6a for tpmdd-devel@lists.sourceforge.net; Mon, 12 Sep 2016 10:43:46 +0000 Received: from fmsmga003.fm.intel.com ([10.253.24.29]) by orsmga104.jf.intel.com with ESMTP; 12 Sep 2016 03:43:39 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.30,322,1470726000"; d="scan'208";a="759791386" Received: from jsakkine-mobl1.tm.intel.com (HELO localhost) ([10.237.55.54]) by FMSMGA003.fm.intel.com with ESMTP; 12 Sep 2016 03:43:37 -0700 From: Jarkko Sakkinen To: Peter Huewe Date: Mon, 12 Sep 2016 13:43:30 +0300 Message-Id: <1473677010-13737-1-git-send-email-jarkko.sakkinen@linux.intel.com> X-Mailer: git-send-email 2.7.4 X-Spam-Score: -2.0 (--) X-Spam-Report: Spam Filtering performed by mx.sourceforge.net. See http://spamassassin.org/tag/ for more details. -2.3 RP_MATCHES_RCVD Envelope sender domain matches handover relay domain 0.3 AWL AWL: Adjusted score from AWL reputation of From: address X-Headers-End: 1bjOiH-0006Rk-6a Cc: "moderated list:TPM DEVICE DRIVER" , open list Subject: [tpmdd-devel] [PATCH v2] tpm: tpm_transmit() does not check for minimum buffer size. X-BeenThere: tpmdd-devel@lists.sourceforge.net X-Mailman-Version: 2.1.9 Precedence: list List-Id: Tpm Device Driver maintainance List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: tpmdd-devel-bounces@lists.sourceforge.net tpm_transmit() does not check that bufsiz is at least TPM_HEADER_SIZE before accessing data. This commit adds the check and returns -ENOMEM. v2: Updated commit msg Signed-off-by: Jarkko Sakkinen --- drivers/char/tpm/tpm-interface.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/char/tpm/tpm-interface.c b/drivers/char/tpm/tpm-interface.c index fd863ff..6a67f7f 100644 --- a/drivers/char/tpm/tpm-interface.c +++ b/drivers/char/tpm/tpm-interface.c @@ -337,6 +337,9 @@ ssize_t tpm_transmit(struct tpm_chip *chip, const u8 *buf, size_t bufsiz, u32 count, ordinal; unsigned long stop; + if (bufsiz < TPM_HEADER_SIZE) + return -EINVAL; + if (bufsiz > TPM_BUFSIZE) bufsiz = TPM_BUFSIZE;