From: Alexander Steffen <Alexander.Steffen@infineon.com>
To: tpmdd-devel@lists.sourceforge.net
Cc: Alexander Steffen <Alexander.Steffen@infineon.com>,
stable@vger.kernel.org
Subject: [PATCH 2/2] tpm-interface: Fix checks of buffer size
Date: Tue, 4 Jul 2017 15:54:19 +0200 [thread overview]
Message-ID: <20170704135419.1692-2-Alexander.Steffen@infineon.com> (raw)
In-Reply-To: <20170704135419.1692-1-Alexander.Steffen@infineon.com>
bufsiz contains the length of the buffer, whereas bufvalid contains the
number of valid bytes within the buffer. Therefore, bufvalid should be used
as a limit when reading from the buffer and bufsize when writing to it.
Cc: stable@vger.kernel.org
Signed-off-by: Alexander Steffen <Alexander.Steffen@infineon.com>
---
drivers/char/tpm/tpm-interface.c | 9 +++------
1 file changed, 3 insertions(+), 6 deletions(-)
diff --git a/drivers/char/tpm/tpm-interface.c b/drivers/char/tpm/tpm-interface.c
index a452cd0..5ef8eb3 100644
--- a/drivers/char/tpm/tpm-interface.c
+++ b/drivers/char/tpm/tpm-interface.c
@@ -393,19 +393,16 @@ ssize_t tpm_transmit(struct tpm_chip *chip, struct tpm_space *space,
unsigned long stop;
bool need_locality;
- if (!tpm_validate_command(chip, space, buf, bufsiz))
+ if (!tpm_validate_command(chip, space, buf, bufvalid))
return -EINVAL;
- if (bufsiz > TPM_BUFSIZE)
- bufsiz = TPM_BUFSIZE;
-
count = be32_to_cpu(*((__be32 *) (buf + 2)));
ordinal = be32_to_cpu(*((__be32 *) (buf + 6)));
if (count == 0)
return -ENODATA;
- if (count > bufsiz || count > bufvalid) {
+ if (count > bufvalid) {
dev_err(&chip->dev,
- "invalid count value %x %zx\n", count, bufsiz);
+ "invalid count value %x %zx\n", count, bufvalid);
return -E2BIG;
}
--
2.7.4
prev parent reply other threads:[~2017-07-04 13:54 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-07-04 13:54 [PATCH 1/2] tpm-dev-common: Reject too short writes Alexander Steffen
2017-07-04 13:54 ` Alexander Steffen [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20170704135419.1692-2-Alexander.Steffen@infineon.com \
--to=alexander.steffen@infineon.com \
--cc=stable@vger.kernel.org \
--cc=tpmdd-devel@lists.sourceforge.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).