lkml.org 
[lkml]   [2017]   [Oct]   [22]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
Subject[PATCH 2/2] xen-tpmfront: Combine two condition checks into one statement in vtpm_send()
From
Date
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
\
 
 \ /
  Last update: 2017-10-22 17:53    [W:0.074 / U:1.532 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site