From: Peter Huewe <peterhuewe@gmx.de>
To: Peter Huewe <peterhuewe@gmx.de>
Cc: Ashley Lai <ashley@ashleylai.com>,
Rajiv Andrade <mail@srajiv.net>,
Marcel Selhorst <tpmdd@selhorst.net>,
tpmdd-devel@lists.sourceforge.net, linux-kernel@vger.kernel.org,
Xiaoyan Zhang <xiaoyan.zhang@intel.com>,
Gang Wei <gang.wei@intel.com>,
stable@vger.kernel.org
Subject: [PATCH 1/2] tpm/tpm_ppi: Do not compare strcmp(a,b) == -1
Date: Wed, 30 Oct 2013 01:40:27 +0100 [thread overview]
Message-ID: <1383093628-31580-1-git-send-email-peterhuewe@gmx.de> (raw)
strcmp does return the difference between two strings not only -1,0,1
consequently
if (strcmp (a,b) == -1)
might lead to taking the wrong branch
-> compare with <= instead.
This also makes the code/behavior compliant with its comments.
(e.g. if PPI Version is 1.0)
Fixes Coverity complaints:
CID: 741083 Misuse of memcmp-style function
CID: 741084 Misuse of memcmp-style function
CID: 741085 Misuse of memcmp-style function
Cc: stable@vger.kernel.org
Signed-off-by: Peter Huewe <peterhuewe@gmx.de>
---
drivers/char/tpm/tpm_ppi.c | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/drivers/char/tpm/tpm_ppi.c b/drivers/char/tpm/tpm_ppi.c
index 8e562dc..8b2e05a 100644
--- a/drivers/char/tpm/tpm_ppi.c
+++ b/drivers/char/tpm/tpm_ppi.c
@@ -169,7 +169,7 @@ static ssize_t tpm_store_ppi_request(struct device *dev,
* is updated with function index from SUBREQ to SUBREQ2 since PPI
* version 1.1
*/
- if (strcmp(version, "1.1") == -1)
+ if (strcmp(version, "1.1") <= -1)
params[2].integer.value = TPM_PPI_FN_SUBREQ;
else
params[2].integer.value = TPM_PPI_FN_SUBREQ2;
@@ -179,7 +179,7 @@ static ssize_t tpm_store_ppi_request(struct device *dev,
* string/package type. For PPI version 1.0 and 1.1, use buffer type
* for compatibility, and use package type since 1.2 according to spec.
*/
- if (strcmp(version, "1.2") == -1) {
+ if (strcmp(version, "1.2") <= -1) {
params[3].type = ACPI_TYPE_BUFFER;
params[3].buffer.length = sizeof(req);
sscanf(buf, "%d", &req);
@@ -245,7 +245,7 @@ static ssize_t tpm_show_ppi_transition_action(struct device *dev,
* (e.g. Capella with PPI 1.0) need integer/string/buffer type, so for
* compatibility, define params[3].type as buffer, if PPI version < 1.2
*/
- if (strcmp(version, "1.2") == -1) {
+ if (strcmp(version, "1.2") <= -1) {
params[3].type = ACPI_TYPE_BUFFER;
params[3].buffer.length = 0;
params[3].buffer.pointer = NULL;
@@ -387,7 +387,7 @@ static ssize_t show_ppi_operations(char *buf, u32 start, u32 end)
kfree(output.pointer);
output.length = ACPI_ALLOCATE_BUFFER;
output.pointer = NULL;
- if (strcmp(version, "1.2") == -1)
+ if (strcmp(version, "1.2") <= -1)
return -EPERM;
params[2].integer.value = TPM_PPI_FN_GETOPR;
--
1.7.8.6
next reply other threads:[~2013-10-30 0:40 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-10-30 0:40 Peter Huewe [this message]
2013-10-30 0:40 ` [PATCH 2/2] tpm/tpm_ppi: Check return value of acpi_get_name Peter Huewe
2013-10-30 1:05 ` [PATCH 1/2] tpm/tpm_ppi: Do not compare strcmp(a,b) == -1 Joe Perches
2013-10-30 19:35 ` Peter Hüwe
2013-10-30 19:41 ` Joe Perches
2013-10-31 12:22 ` Bernd Petrovitsch
2013-10-30 16:45 ` [tpmdd-devel] [PATCH 1/2] tpm/tpm_ppi: Do not compare strcmp(a, b) " Jason Gunthorpe
2013-10-30 19:46 ` [PATCH 1/2 v2] tpm/tpm_ppi: Do not compare strcmp(a,b) " Peter Huewe
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=1383093628-31580-1-git-send-email-peterhuewe@gmx.de \
--to=peterhuewe@gmx.de \
--cc=ashley@ashleylai.com \
--cc=gang.wei@intel.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mail@srajiv.net \
--cc=stable@vger.kernel.org \
--cc=tpmdd-devel@lists.sourceforge.net \
--cc=tpmdd@selhorst.net \
--cc=xiaoyan.zhang@intel.com \
/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 NNTP newsgroup(s).