From: SF Markus Elfring <elfring@users.sourceforge.net>
To: linux-integrity@vger.kernel.org,
"Jarkko Sakkinen" <jarkko.sakkinen@linux.intel.com>,
"Jason Gunthorpe" <jgunthorpe@obsidianresearch.com>,
"Peter Hüwe" <PeterHuewe@gmx.de>
Cc: LKML <linux-kernel@vger.kernel.org>, kernel-janitors@vger.kernel.org
Subject: [PATCH 2/2] xen-tpmfront: Combine two condition checks into one statement in vtpm_send()
Date: Sun, 22 Oct 2017 13:30:46 +0200 [thread overview]
Message-ID: <f1d76752-d5b4-649d-b11d-63348d439505@users.sourceforge.net> (raw)
In-Reply-To: <cf592c7d-8fbc-833b-fa1a-ff9e91c3734c@users.sourceforge.net>
From: Markus Elfring <elfring@users.sourceforge.net>
Date: Sun, 22 Oct 2017 13:15:16 +0200
A return was performed with the same error code after two condition checks.
Thus use a single statement instead.
Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>
---
drivers/char/tpm/xen-tpmfront.c | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
diff --git a/drivers/char/tpm/xen-tpmfront.c b/drivers/char/tpm/xen-tpmfront.c
index 873a5631937a..0d02743e7a87 100644
--- a/drivers/char/tpm/xen-tpmfront.c
+++ b/drivers/char/tpm/xen-tpmfront.c
@@ -82,10 +82,7 @@ static int vtpm_send(struct tpm_chip *chip, u8 *buf, size_t count)
u32 ordinal;
unsigned long duration;
- if (offset > PAGE_SIZE)
- return -EINVAL;
-
- if (offset + count > PAGE_SIZE)
+ if (offset > PAGE_SIZE || offset + count > PAGE_SIZE)
return -EINVAL;
/* Wait for completion of any existing command or cancellation */
--
2.14.2
next prev parent reply other threads:[~2017-10-22 11:30 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-10-22 11:28 [PATCH 0/2] Xen vTPM frontend: Fine-tuning for vtpm_send() SF Markus Elfring
2017-10-22 11:29 ` [PATCH 1/2] xen-tpmfront: Use common error handling code in vtpm_send() SF Markus Elfring
2017-10-23 13:42 ` Jarkko Sakkinen
2017-10-23 13:57 ` SF Markus Elfring
2017-10-24 13:56 ` Jarkko Sakkinen
2017-10-22 11:30 ` SF Markus Elfring [this message]
2017-10-23 7:31 ` [PATCH 2/2] xen-tpmfront: Combine two condition checks into one statement " Dan Carpenter
2017-10-23 13:44 ` Jarkko Sakkinen
2017-10-24 13:52 ` Jarkko Sakkinen
2017-10-23 13:42 ` [PATCH 0/2] Xen vTPM frontend: Fine-tuning for vtpm_send() Jarkko Sakkinen
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=f1d76752-d5b4-649d-b11d-63348d439505@users.sourceforge.net \
--to=elfring@users.sourceforge.net \
--cc=PeterHuewe@gmx.de \
--cc=jarkko.sakkinen@linux.intel.com \
--cc=jgunthorpe@obsidianresearch.com \
--cc=kernel-janitors@vger.kernel.org \
--cc=linux-integrity@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
/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).