From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751802AbdJVLa6 (ORCPT ); Sun, 22 Oct 2017 07:30:58 -0400 Received: from mout.web.de ([212.227.17.11]:51163 "EHLO mout.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751589AbdJVLa4 (ORCPT ); Sun, 22 Oct 2017 07:30:56 -0400 Subject: [PATCH 2/2] xen-tpmfront: Combine two condition checks into one statement in vtpm_send() From: SF Markus Elfring To: linux-integrity@vger.kernel.org, Jarkko Sakkinen , Jason Gunthorpe , =?UTF-8?Q?Peter_H=c3=bcwe?= Cc: LKML , kernel-janitors@vger.kernel.org References: Message-ID: Date: Sun, 22 Oct 2017 13:30:46 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.4.0 MIME-Version: 1.0 In-Reply-To: Content-Type: text/plain; charset=utf-8 Content-Language: en-GB Content-Transfer-Encoding: 8bit X-Provags-ID: V03:K0:VkIBIfX/tc9/0YsyhRMddpgYllitgCf0Q3jGyXzGQhlPLZJw6SY GhhmZnm7sPeCv34B6mToJbdfPZQUi4EKnvqpOSgC1/76EBRQ5Cjb4Wb0SdjRDEvjAkITCMU PdP+hnJWLzxHgR11etFacnV4YcpF4XegTh2eHjBuYYToCpTbsoV5sycTJjR1genDJOq7+05 MBLEr0yJ90jbOuy6N2rcQ== X-UI-Out-Filterresults: notjunk:1;V01:K0:cwG+QtrPeus=:xdDd9RVZphzw2P3k8R8W1f oFHor1t6xx4/R0sTyrQGwEzmILJ5mQy1hsEBqk6JYzdKhkMWqen6MFSM4iA3FFNkm+l4kpx07 a1+2sb3ELXCMb88208UXAzxq7FZQJt5++4nLdleVtfzCpqBUu87MgFVQ/Y9hsgta3TudnJrJl Ll3Gfm2e9EdfoKsV2aphYFqpQ5q3H7ZSKh7/LzI5ewS5mhSCZ8iAwP8+4iu4MpfOniHlQWEiI RZpYcD28bnc+74xJHluC+0ysGO1nk/OsvnHBUXvcup1KiXcv2fggjSysUYJULgkxflL95rDdn e846VRx/kPFhvsQ/8FfpLu3E0V/itOm+sM9A3NHtp5RwkdV49RMhFaHWYmR+kKRHh33v5blr1 MvKrR2lLlELKYAu9lWWV4KPiUL9cTf01AuN+EWtETB4qe5KGV02WgKUDiBbDuLTlp5FB+fNUI VhWaAJiXy6vtWblKy3d9IJR1PxluUwpb01ZvOcmrmKTWHcROakEaquOu9RFjL2ZjHe12phLHX oiOnc0ivU96taOj3CmEF+Ebx29e0aceIo3bJMxoW1pL+gfy0cdRjtFTyuNQZafP8g+7XyV2LC A9MciZmJ9N8GUAv/ofM64b10NexDPMbGJoVpT0cpo4ncOhaEV561oecXmfD/J7k8X5qDPKn7+ 9FSO7pR54PvVi0j44geoyZCPtsJNvEXHQuJ/4wTql47/vLYH6tg9mJclxX2G0dB4OWOciALK3 q2ObLVHMkuDbpU4dsOW8Ewbua9I/LPNDxvhYtzrSF3wogCQp6QpxoSwsZSx2CRKytMWi6HcAj J8mg9NZNwkxIS9S2y4AJI9oCMiN0pKYXu++z+v8jroMW+fB1YU= Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Markus Elfring 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 --- 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