From patchwork Sun Oct 22 10:16:19 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: SF Markus Elfring X-Patchwork-Id: 10021661 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 23C5460234 for ; Sun, 22 Oct 2017 10:16:40 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 132CC28707 for ; Sun, 22 Oct 2017 10:16:40 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 06A542874F; Sun, 22 Oct 2017 10:16:40 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 92E9D28707 for ; Sun, 22 Oct 2017 10:16:39 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751436AbdJVKQj (ORCPT ); Sun, 22 Oct 2017 06:16:39 -0400 Received: from mout.web.de ([212.227.17.12]:62175 "EHLO mout.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751404AbdJVKQh (ORCPT ); Sun, 22 Oct 2017 06:16:37 -0400 Received: from [192.168.1.2] ([77.182.45.221]) by smtp.web.de (mrweb101 [213.165.67.124]) with ESMTPSA (Nemesis) id 0Lmu2K-1dYFzU1pim-00h7WI; Sun, 22 Oct 2017 12:16:28 +0200 To: linux-integrity@vger.kernel.org, Jarkko Sakkinen , Jason Gunthorpe , =?UTF-8?Q?Peter_H=c3=bcwe?= Cc: LKML , kernel-janitors@vger.kernel.org From: SF Markus Elfring Subject: [PATCH] tpm_tis_core: Use common error handling code in tpm_tis_send_data() Message-ID: Date: Sun, 22 Oct 2017 12:16:19 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.4.0 MIME-Version: 1.0 Content-Language: en-GB X-Provags-ID: V03:K0:FfNYDoVvZMjVzkpW1r7ilqpVm3GfGZL083yeX8HpSCGugixVT5J lo2OV3/MMVHs0XBDuT1L+hOPWtXhXHYdjwqA46fxLONEOrkZy1b/PBJ9BkOk9s7BCtuZwCQ +9SOs1oQRiJgWfftBNJY3fISlcW/3t7Mjql3zO21P/h3I1ZGaQoZwfsfQuboFU0mJyD7XXx VP1HlQLFAR9Q6WuP0aE6A== X-UI-Out-Filterresults: notjunk:1; V01:K0:A1sOa1DhbjU=:XNk2qVrRjhpIl3eZTtSNhU yfjDwXbDPfPGJ5IoiOfYs4qfdgaPiFUjCvctt95n07Q26Kx58FjmClZmWcsOXyze+Cu76+Z6o lvpueti69p7Tt2EcrFoNNNfF5tJ9KIKjpofIvi3ayBsEnYGnHyY7C1aqDZu0SdB9Z04p/niNi fjrmXCoJjkLcDtbeMJ6PSEsSFU658wIzHVMls1La8fyLjcRtFKKaMbcKtdnPsf3i/ONNPlQAH zEawYPJppCKr9LxbSG5jXu9lQoFD/o1YEIZa9EI4kvxjIOWK3kI/NxigJT2qvyujZYRQZdJ2r hT7ymTHRho/eG0WHWX1EtYA+kxmlUDgv+dopT8RYNu+fFwzguxKWybTP/XUloJ8Pi5LYfKW9L wrJLms6VvPTRH+9tDfI2F+NO7CySbrQOQb9ApQ+owA4GtpH4zFRsRw0PLHGyQso7Nc2pyNN74 oRyJDmdeRzXrQ0TyW/24gOnu9zZjYxo10JbHqHHi4l6QXaStt2ET9GGtkqpoqgO660QHAIIm2 wJ10KRY8xCsw+4bgB+iWANDUYZDqvt1T8EW7r9py+Fmtp0KjmRmmM9BR9CxB6CONCE+PYnSrs wcHkfRk6PxjIOQ5iI3lLCzLSZLHuwy311fJ42pXX4g84VzXvaf/Rg40r5wmmgBoTGsE/6wO+8 zluR9U6s3WPUi5PCEjaAW2esrmbyXlhMpoE+oUL3YtqZgW1cmVcaVGjUPQtlwTNPFu9qD39R5 Z0jIBqbJjzH6ktpDXmJl6whroUSWGdmfPIouPBQrTSkGrtcE+pczy+SgOyyqcC4gRmNDljNGn I/I26vv6lApIowkYuBlPXbINZjhSkslucEIyW2T836U3fii2F0= Sender: linux-integrity-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-integrity@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Markus Elfring Date: Sun, 22 Oct 2017 11:41:09 +0200 Add a jump target so that a specific error code assignment for timeout conditions will be in the implementation only at the end of this function. This issue was detected by using the Coccinelle software. Signed-off-by: Markus Elfring --- drivers/char/tpm/tpm_tis_core.c | 26 ++++++++++++-------------- 1 file changed, 12 insertions(+), 14 deletions(-) diff --git a/drivers/char/tpm/tpm_tis_core.c b/drivers/char/tpm/tpm_tis_core.c index fdde971bc810..3681f7a74d1b 100644 --- a/drivers/char/tpm/tpm_tis_core.c +++ b/drivers/char/tpm/tpm_tis_core.c @@ -262,12 +262,10 @@ static int tpm_tis_send_data(struct tpm_chip *chip, const u8 *buf, size_t len) status = tpm_tis_status(chip); if ((status & TPM_STS_COMMAND_READY) == 0) { tpm_tis_ready(chip); - if (wait_for_tpm_stat - (chip, TPM_STS_COMMAND_READY, chip->timeout_b, - &priv->int_queue, false) < 0) { - rc = -ETIME; - goto out_err; - } + if (wait_for_tpm_stat(chip, TPM_STS_COMMAND_READY, + chip->timeout_b, &priv->int_queue, false) + < 0) + goto report_timeout; } while (count < len - 1) { @@ -286,10 +284,9 @@ static int tpm_tis_send_data(struct tpm_chip *chip, const u8 *buf, size_t len) count += burstcnt; if (wait_for_tpm_stat(chip, TPM_STS_VALID, chip->timeout_c, - &priv->int_queue, false) < 0) { - rc = -ETIME; - goto out_err; - } + &priv->int_queue, false) < 0) + goto report_timeout; + status = tpm_tis_status(chip); if (!itpm && (status & TPM_STS_DATA_EXPECT) == 0) { rc = -EIO; @@ -303,10 +300,9 @@ static int tpm_tis_send_data(struct tpm_chip *chip, const u8 *buf, size_t len) goto out_err; if (wait_for_tpm_stat(chip, TPM_STS_VALID, chip->timeout_c, - &priv->int_queue, false) < 0) { - rc = -ETIME; - goto out_err; - } + &priv->int_queue, false) < 0) + goto report_timeout; + status = tpm_tis_status(chip); if (!itpm && (status & TPM_STS_DATA_EXPECT) != 0) { rc = -EIO; @@ -315,6 +311,8 @@ static int tpm_tis_send_data(struct tpm_chip *chip, const u8 *buf, size_t len) return 0; +report_timeout: + rc = -ETIME; out_err: tpm_tis_ready(chip); return rc;