From patchwork Mon Oct 16 17:31:49 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: 826440 Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) (using TLSv1.2 with cipher ADH-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3yG5BZ0Bzyz9sPt for ; Tue, 17 Oct 2017 04:37:58 +1100 (AEDT) Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) by lists.ozlabs.org (Postfix) with ESMTP id 3yG5BY6JLTzDrJp for ; Tue, 17 Oct 2017 04:37:57 +1100 (AEDT) X-Original-To: linuxppc-dev@lists.ozlabs.org Delivered-To: linuxppc-dev@lists.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=users.sourceforge.net (client-ip=217.72.192.78; helo=mout.web.de; envelope-from=elfring@users.sourceforge.net; receiver=) Received: from mout.web.de (mout.web.de [217.72.192.78]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 3yG54G0rDrzDrJ7 for ; Tue, 17 Oct 2017 04:32:29 +1100 (AEDT) Received: from [192.168.1.2] ([78.49.107.148]) by smtp.web.de (mrweb101 [213.165.67.124]) with ESMTPSA (Nemesis) id 0MEEa4-1e1vGM3LWy-00FULn; Mon, 16 Oct 2017 19:31:55 +0200 Subject: [PATCH 1/4] char/tpm: Delete an error message for a failed memory allocation in tpm_ascii_bios_measurements_show() From: SF Markus Elfring To: linux-integrity@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, Andy Shevchenko , Benjamin Herrenschmidt , Corentin Labbe , Jarkko Sakkinen , Jason Gunthorpe , Jerry Snitselaar , Kenneth Goldman , Michael Ellerman , Nayna Jain , Paul Mackerras , =?utf-8?q?Peter_H=C3=BCwe?= , Stefan Berger References: <1d3516a2-a8e6-9e95-d438-f115fac84c7f@users.sourceforge.net> Message-ID: Date: Mon, 16 Oct 2017 19:31:49 +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: <1d3516a2-a8e6-9e95-d438-f115fac84c7f@users.sourceforge.net> Content-Language: en-GB X-Provags-ID: V03:K0:vIlq3T1GSLVUf4zbw9Xxn+Ro8Zr6ulEUJB6N0uz04U5Tg7nqMpv wT/bR6vXoq6LzuY0zGz+95oXYYafQ+X0toJT33r5iO9vJh/jCqx+Bw8vQ8IWMV+4AmzyQ40 A1BDBLt0iCIt/1lnT8S1aedF6h25ikOFhPgGvTp6YIlqiYqlF/CYfhR0Iz62YE4tpSn75x9 pM11wbbTA1FIksqCA3Z9Q== X-UI-Out-Filterresults: notjunk:1; V01:K0:ZKLjex/jwuM=:0ia2rzUI9SzjBdBRwuj4W+ uK5WFUI2FYBz0UiioP/VUr7mE53gnQLYxWdObOYbf7ShWXepfFLkH2QYmH5VFkjcUqn60fy0U 6XH3lvpB07BlrNW2ib8dJvfAybLbOdVQP/8abkpTRHUzkI5CuMxA8DOBfWBTjrKtV+Qzfu5zl XGXhLZ61q6k6D0mN08V0K6Iy0fJCcNeQFiRmIPpkMzfEIuFYm/CWFcNljPNtps29IYPLThf35 vIijtc7EvUsxB6ydB5cncyqxlcPZRONZJ0CZEHfxYTOK9Wr11YyDQhgaRNuu3HL47tkdfQBE6 qLvkuCc18Wt1rUyFI43dPYFCpAut+3NNelNU6CLLGArza5OWQyN8uka9JWPx2DTYVMDX/amzR hp8B2fs5mb+v/TVmoz+tDfN1me9geswWen5vOZkdQNrsDJkOf+TTQNuB5tVtrWeRl2zb8FJCq RqZiPBNZ3Vl5eK6gzl7lEtTGpw4kDGMVD5XZIzYPnFGiFPuVOq2MOyluAlQ83Ru7CsDbT+zRj N5TuL2qt0wGEwhITwVWXR44L4kzhENeNu4x3Z0jBFL+N9GlaLSnWkbn8RtmZr66B/Kc4fnBz/ MI1ikH7c7glSS0eUz4NfDBS+89VjmvHPof7vGDtgDVeq7kXnIN7lPO5Sdnelkx49qRPK9GV7F 9NUBbD7zPD5jOU/4B2grD+TI3XeQDpTIR+AARnVEcB8a21Sh5o+x4Ft7YnAD8Cl2qZZ9Y2yPI IsX+oVCoFZiQ7iFVgEbEstf9c4s8p6v6qWX/t9eAvDy0NxuxR3aRBlXPbOylBRk/v2+XYVOQW lzqVw3i8OSmO8zfRFAhbbUUIyfCfkWlA4K8g4cYbFDw0IgCNHI= X-BeenThere: linuxppc-dev@lists.ozlabs.org X-Mailman-Version: 2.1.24 Precedence: list List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: kernel-janitors@vger.kernel.org, LKML Errors-To: linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org Sender: "Linuxppc-dev" From: Markus Elfring Date: Mon, 16 Oct 2017 17:43:55 +0200 Omit an extra message for a memory allocation failure in this function. This issue was detected by using the Coccinelle software. Signed-off-by: Markus Elfring --- drivers/char/tpm/tpm1_eventlog.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/drivers/char/tpm/tpm1_eventlog.c b/drivers/char/tpm/tpm1_eventlog.c index 9a8605e500b5..9749469cb823 100644 --- a/drivers/char/tpm/tpm1_eventlog.c +++ b/drivers/char/tpm/tpm1_eventlog.c @@ -280,11 +280,8 @@ static int tpm_ascii_bios_measurements_show(struct seq_file *m, void *v) (unsigned char *)(v + sizeof(struct tcpa_event)); eventname = kmalloc(MAX_TEXT_EVENT, GFP_KERNEL); - if (!eventname) { - printk(KERN_ERR "%s: ERROR - No Memory for event name\n ", - __func__); + if (!eventname) return -EFAULT; - } /* 1st: PCR */ seq_printf(m, "%2d ", do_endian_conversion(event->pcr_index)); From patchwork Mon Oct 16 17:32:59 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: 826441 Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from lists.ozlabs.org (lists.ozlabs.org [103.22.144.68]) (using TLSv1.2 with cipher ADH-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3yG5J51pqCz9sRq for ; Tue, 17 Oct 2017 04:42:45 +1100 (AEDT) Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) by lists.ozlabs.org (Postfix) with ESMTP id 3yG5J43KHMzDrJH for ; Tue, 17 Oct 2017 04:42:44 +1100 (AEDT) X-Original-To: linuxppc-dev@lists.ozlabs.org Delivered-To: linuxppc-dev@lists.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=users.sourceforge.net (client-ip=217.72.192.78; helo=mout.web.de; envelope-from=elfring@users.sourceforge.net; receiver=) Received: from mout.web.de (mout.web.de [217.72.192.78]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 3yG55M0N3gzDrJZ for ; Tue, 17 Oct 2017 04:33:26 +1100 (AEDT) Received: from [192.168.1.2] ([78.49.107.148]) by smtp.web.de (mrweb102 [213.165.67.124]) with ESMTPSA (Nemesis) id 0Lb29N-1dOReu2lvl-00kdZg; Mon, 16 Oct 2017 19:33:01 +0200 Subject: [PATCH 2/4] char/tpm: Delete an error message for a failed memory allocation in tpm_ibmvtpm_probe() From: SF Markus Elfring To: linux-integrity@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, Andy Shevchenko , Benjamin Herrenschmidt , Corentin Labbe , Jarkko Sakkinen , Jason Gunthorpe , Jerry Snitselaar , Kenneth Goldman , Michael Ellerman , Nayna Jain , Paul Mackerras , =?utf-8?q?Peter_H=C3=BCwe?= , Stefan Berger References: <1d3516a2-a8e6-9e95-d438-f115fac84c7f@users.sourceforge.net> Message-ID: <2ed7178a-347e-7e56-4edd-977687aaad66@users.sourceforge.net> Date: Mon, 16 Oct 2017 19:32:59 +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: <1d3516a2-a8e6-9e95-d438-f115fac84c7f@users.sourceforge.net> Content-Language: en-GB X-Provags-ID: V03:K0:jOxa7oQYyqOptSB8aVnn5AWyD658w4tNjaVuzUUJq7n75cTTR5q cHhZE2MEDImoC/ivUJ79USS2H9kGO6DcheTCmxYZFTzFNKqArGroJJbFDH2pWDw00xrJ9p7 qSGlwADRUy/2XfzEq1TnUoh+HRxBGRZ761EByZzK+RU/qYBVEKmQB+ZrpNOIJHpXslrt1sA xyO4mIZw9D8icCva5394Q== X-UI-Out-Filterresults: notjunk:1; V01:K0:BdDllyhH2Sk=:wwKj+EcjPzK5CxnW9/aafq 6IdaACOVxrCUmBCFGFnLl4KHFJvVMMSKerUTGwRetfEgoH/NOJecCNszItzZ1Q11E2iPLSKUd 2zX4ubcD6bVNXh97YoH9x71Pc5uznjzNz2LpPldSv7UZO8Kr4dAtu9A6QTesNwoUnKLJS13l4 XO3KoRMtgEozuivlKGxjppQBYikWiZ85rxdmtNOn9GGwX0NCVtVXDr6cyoMxrCeEjS+fVKdd8 O9zGH4gGQhEC1CtLquD4hpvV7T7ucg+eKD4ExAaG+V4S6lOIdr0gRf8azk8VEwgBeJEBE0l8N 57sK8m3v9/15VIht5lxG81nhMhfZ2JGygKwmr1juNEXVYjaNSU2GUZEGN4+8a+b9vn9Vvrkst XJhgR57HeXK6szlpjJfUFltAtZTk2hlpsUuAjPpLwoz9bYk/YkEZdLJPrmGlcANFSoQquaVjb XrDLlJgaL8ijEvzsNcxaDEH7sCqNg4veKA0480j011Vck1t6vQDYKs5kvzaCw1yMyC1bVogtw +Si1dVSC32s9kILk7/8raylH7qnJLdjSIPJlg25IqNQooOydNobzRdu79+Z9/YGg97K9/M/es YK8Ravpi5hOJiLUVToglaEBRw92+bIQalpUf+awGhh70qrZmroYjHK/c3ciKI08UDPhoCU8LK rtUjxXIvumQrTy1mPFkbjv/PVdBZdteSsm85vYm5osI0SVpPvVw70QPn+R2V3vcpK8e3ocqrN h3NMdfIDw2XZXz5H867//P17YQvyH/BnRws4fczrGz7VuC1+wDdIBlOt55vN+jJU/JvI2mgy7 bwph1BddVbIQVz9t03KN9A8Bsbv56gMgtbkrJb92d8BJqmyeK4= X-BeenThere: linuxppc-dev@lists.ozlabs.org X-Mailman-Version: 2.1.24 Precedence: list List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: kernel-janitors@vger.kernel.org, LKML Errors-To: linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org Sender: "Linuxppc-dev" From: Markus Elfring Date: Mon, 16 Oct 2017 18:08:23 +0200 Omit an extra message for a memory allocation failure in this function. This issue was detected by using the Coccinelle software. Signed-off-by: Markus Elfring --- drivers/char/tpm/tpm_ibmvtpm.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/drivers/char/tpm/tpm_ibmvtpm.c b/drivers/char/tpm/tpm_ibmvtpm.c index 25f6e2665385..b18148ef2612 100644 --- a/drivers/char/tpm/tpm_ibmvtpm.c +++ b/drivers/char/tpm/tpm_ibmvtpm.c @@ -609,10 +609,8 @@ static int tpm_ibmvtpm_probe(struct vio_dev *vio_dev, return PTR_ERR(chip); ibmvtpm = kzalloc(sizeof(struct ibmvtpm_dev), GFP_KERNEL); - if (!ibmvtpm) { - dev_err(dev, "kzalloc for ibmvtpm failed\n"); + if (!ibmvtpm) goto cleanup; - } ibmvtpm->dev = dev; ibmvtpm->vdev = vio_dev; From patchwork Mon Oct 16 17:33:59 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: 826442 Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) (using TLSv1.2 with cipher ADH-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3yG5Mg4qcnz9ryk for ; Tue, 17 Oct 2017 04:45:51 +1100 (AEDT) Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) by lists.ozlabs.org (Postfix) with ESMTP id 3yG5Mg2JmvzDrKC for ; Tue, 17 Oct 2017 04:45:51 +1100 (AEDT) X-Original-To: linuxppc-dev@lists.ozlabs.org Delivered-To: linuxppc-dev@lists.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=users.sourceforge.net (client-ip=212.227.17.11; helo=mout.web.de; envelope-from=elfring@users.sourceforge.net; receiver=) Received: from mout.web.de (mout.web.de [212.227.17.11]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 3yG56c1gNqzDrJT for ; Tue, 17 Oct 2017 04:34:31 +1100 (AEDT) Received: from [192.168.1.2] ([78.49.107.148]) by smtp.web.de (mrweb102 [213.165.67.124]) with ESMTPSA (Nemesis) id 0LnS4I-1darw42rr4-00hd6o; Mon, 16 Oct 2017 19:34:03 +0200 Subject: [PATCH 3/4] char/tpm: Improve a size determination in nine functions From: SF Markus Elfring To: linux-integrity@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, Andy Shevchenko , Benjamin Herrenschmidt , Corentin Labbe , Jarkko Sakkinen , Jason Gunthorpe , Jerry Snitselaar , Kenneth Goldman , Michael Ellerman , Nayna Jain , Paul Mackerras , =?utf-8?q?Peter_H=C3=BCwe?= , Stefan Berger References: <1d3516a2-a8e6-9e95-d438-f115fac84c7f@users.sourceforge.net> Message-ID: <83a166af-aecc-649d-dfe3-a72245345209@users.sourceforge.net> Date: Mon, 16 Oct 2017 19:33:59 +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: <1d3516a2-a8e6-9e95-d438-f115fac84c7f@users.sourceforge.net> Content-Language: en-GB X-Provags-ID: V03:K0:AiZ9SCVWs/uYYiW7eThZa1w+bnV2nwCvSUyVJkvsDP0hrxt8nRs kPtpUMLU0PdE+KGHORcPybro3D7MQnBM3hL0wD7yzGni09ZQyb92a0ZqgVThvR8tYFxwLLH eY23Sa4b4V20A4UreNRaQ1Pfvn55OxmsmIMPGBUydjJegubVLDKOXN3hagp1Zbm/yLp5hUc WA4vg9mBRLOoAd8uonK9g== X-UI-Out-Filterresults: notjunk:1; V01:K0:WW93H3LTT80=:djWLVi8udmePSaV22nmmRT vXGfVFApRxMSC9g88fZ2B2ARdZtVt454OmtGlrb1Iq3sFnLH1O5PGqM65ByZ3dsW1PyVdqNHq oBIIMqy+GFYeAY4iriaB0vT5YTDWf4Va2Lf3N2G3EKyhTiAMauuyIEZE+0QannfF6jXPF0y99 HQABXmhHjnkd5gKknnIMSPksuCOcizj7Qry/LMH9Pj7AR9kwCrONlZ65CFN3A9STKiXD3vcZQ TYp9vh4X7taEIzKaQIdBLKwBSvXHLCEI5t+eV5JuqvO13k9ERLrh8ZwQToIdxqCicrUGFFCOT 0ONgVzkiaXuan5HS+aJj/g62R9Z3otjWKk+tc7w4neJB7N3CvHuyGVNyxpngXUno+/WmKjHCx +pjASUbr/T97Arfs8SBcubLWYl+w/0j+5cOK6X0oNvNpj/unc+RKNf3lBwVdeUJtlrHFKaw/N quyxQMHMhNfAH0LvhYIz/1DuYDhwefdyavsDkDTetgr9gjpMrgi3kIPHeZe0iTh4Y/J+bPbFN lqPM7PwlKANFNG7F6pl0Z1QC/2yx6K4oBZ/J+iIz1Ilj24ozZipslSPFDWPFYC/F1GryGKEH9 CJSGN6Jeqqw45gosCC/FnVdz4mPnpTEo0Dsz9v8shTt2FdUkLVkDYtLfcSJqRRoIsAReAE4MF MOR+blEN37bfTUqT1oJZ0/K+ATwjTFdBwq3C8xQ9QWcobI8IW+asHU92lcMTI71hrNOa5DeD2 b89j9lrLtOhbkNXIl2aKp/ORCSRXa5cUjt5IWQptJO/KAzNUnxLeEtq+VYAXQmErP0VN/ork3 pq+sFIp9zVll1PPSsj8dncUHYrUd+heQTETgRg+hXU+rV7SF4s= X-BeenThere: linuxppc-dev@lists.ozlabs.org X-Mailman-Version: 2.1.24 Precedence: list List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: kernel-janitors@vger.kernel.org, LKML Errors-To: linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org Sender: "Linuxppc-dev" From: Markus Elfring Date: Mon, 16 Oct 2017 18:28:17 +0200 Replace the specification of data structures by pointer dereferences as the parameter for the operator "sizeof" to make the corresponding size determination a bit safer according to the Linux coding style convention. This issue was detected by using the Coccinelle software. Signed-off-by: Markus Elfring --- drivers/char/tpm/st33zp24/i2c.c | 3 +-- drivers/char/tpm/st33zp24/spi.c | 3 +-- drivers/char/tpm/st33zp24/st33zp24.c | 3 +-- drivers/char/tpm/tpm_crb.c | 2 +- drivers/char/tpm/tpm_i2c_atmel.c | 2 +- drivers/char/tpm/tpm_i2c_nuvoton.c | 2 +- drivers/char/tpm/tpm_ibmvtpm.c | 2 +- drivers/char/tpm/tpm_tis.c | 2 +- drivers/char/tpm/tpm_tis_spi.c | 3 +-- 9 files changed, 9 insertions(+), 13 deletions(-) diff --git a/drivers/char/tpm/st33zp24/i2c.c b/drivers/char/tpm/st33zp24/i2c.c index be5d1abd3e8e..d0cb25688485 100644 --- a/drivers/char/tpm/st33zp24/i2c.c +++ b/drivers/char/tpm/st33zp24/i2c.c @@ -245,8 +245,7 @@ static int st33zp24_i2c_probe(struct i2c_client *client, return -ENODEV; } - phy = devm_kzalloc(&client->dev, sizeof(struct st33zp24_i2c_phy), - GFP_KERNEL); + phy = devm_kzalloc(&client->dev, sizeof(*phy), GFP_KERNEL); if (!phy) return -ENOMEM; diff --git a/drivers/char/tpm/st33zp24/spi.c b/drivers/char/tpm/st33zp24/spi.c index 0fc4f20b5f83..c952df9244c8 100644 --- a/drivers/char/tpm/st33zp24/spi.c +++ b/drivers/char/tpm/st33zp24/spi.c @@ -358,8 +358,7 @@ static int st33zp24_spi_probe(struct spi_device *dev) return -ENODEV; } - phy = devm_kzalloc(&dev->dev, sizeof(struct st33zp24_spi_phy), - GFP_KERNEL); + phy = devm_kzalloc(&dev->dev, sizeof(*phy), GFP_KERNEL); if (!phy) return -ENOMEM; diff --git a/drivers/char/tpm/st33zp24/st33zp24.c b/drivers/char/tpm/st33zp24/st33zp24.c index 4d1dc8b46877..0686a129268c 100644 --- a/drivers/char/tpm/st33zp24/st33zp24.c +++ b/drivers/char/tpm/st33zp24/st33zp24.c @@ -533,8 +533,7 @@ int st33zp24_probe(void *phy_id, const struct st33zp24_phy_ops *ops, if (IS_ERR(chip)) return PTR_ERR(chip); - tpm_dev = devm_kzalloc(dev, sizeof(struct st33zp24_dev), - GFP_KERNEL); + tpm_dev = devm_kzalloc(dev, sizeof(*tpm_dev), GFP_KERNEL); if (!tpm_dev) return -ENOMEM; diff --git a/drivers/char/tpm/tpm_crb.c b/drivers/char/tpm/tpm_crb.c index 7b3c2a8aa9de..343c46e8560f 100644 --- a/drivers/char/tpm/tpm_crb.c +++ b/drivers/char/tpm/tpm_crb.c @@ -557,7 +557,7 @@ static int crb_acpi_add(struct acpi_device *device) if (sm == ACPI_TPM2_MEMORY_MAPPED) return -ENODEV; - priv = devm_kzalloc(dev, sizeof(struct crb_priv), GFP_KERNEL); + priv = devm_kzalloc(dev, sizeof(*priv), GFP_KERNEL); if (!priv) return -ENOMEM; diff --git a/drivers/char/tpm/tpm_i2c_atmel.c b/drivers/char/tpm/tpm_i2c_atmel.c index 95ce2e9ccdc6..2d0df930a76d 100644 --- a/drivers/char/tpm/tpm_i2c_atmel.c +++ b/drivers/char/tpm/tpm_i2c_atmel.c @@ -165,7 +165,7 @@ static int i2c_atmel_probe(struct i2c_client *client, if (IS_ERR(chip)) return PTR_ERR(chip); - priv = devm_kzalloc(dev, sizeof(struct priv_data), GFP_KERNEL); + priv = devm_kzalloc(dev, sizeof(*priv), GFP_KERNEL); if (!priv) return -ENOMEM; diff --git a/drivers/char/tpm/tpm_i2c_nuvoton.c b/drivers/char/tpm/tpm_i2c_nuvoton.c index c6428771841f..5983d52eb6d9 100644 --- a/drivers/char/tpm/tpm_i2c_nuvoton.c +++ b/drivers/char/tpm/tpm_i2c_nuvoton.c @@ -551,7 +551,7 @@ static int i2c_nuvoton_probe(struct i2c_client *client, if (IS_ERR(chip)) return PTR_ERR(chip); - priv = devm_kzalloc(dev, sizeof(struct priv_data), GFP_KERNEL); + priv = devm_kzalloc(dev, sizeof(*priv), GFP_KERNEL); if (!priv) return -ENOMEM; diff --git a/drivers/char/tpm/tpm_ibmvtpm.c b/drivers/char/tpm/tpm_ibmvtpm.c index b18148ef2612..a4b462a77b99 100644 --- a/drivers/char/tpm/tpm_ibmvtpm.c +++ b/drivers/char/tpm/tpm_ibmvtpm.c @@ -608,7 +608,7 @@ static int tpm_ibmvtpm_probe(struct vio_dev *vio_dev, if (IS_ERR(chip)) return PTR_ERR(chip); - ibmvtpm = kzalloc(sizeof(struct ibmvtpm_dev), GFP_KERNEL); + ibmvtpm = kzalloc(sizeof(*ibmvtpm), GFP_KERNEL); if (!ibmvtpm) goto cleanup; diff --git a/drivers/char/tpm/tpm_tis.c b/drivers/char/tpm/tpm_tis.c index ebd0e75a3e4d..0a3af60bab2a 100644 --- a/drivers/char/tpm/tpm_tis.c +++ b/drivers/char/tpm/tpm_tis.c @@ -294,7 +294,7 @@ static int tpm_tis_init(struct device *dev, struct tpm_info *tpm_info) if (rc) return rc; - phy = devm_kzalloc(dev, sizeof(struct tpm_tis_tcg_phy), GFP_KERNEL); + phy = devm_kzalloc(dev, sizeof(*phy), GFP_KERNEL); if (phy == NULL) return -ENOMEM; diff --git a/drivers/char/tpm/tpm_tis_spi.c b/drivers/char/tpm/tpm_tis_spi.c index 424ff2fde1f2..7cabb12d0b3a 100644 --- a/drivers/char/tpm/tpm_tis_spi.c +++ b/drivers/char/tpm/tpm_tis_spi.c @@ -200,8 +200,7 @@ static int tpm_tis_spi_probe(struct spi_device *dev) { struct tpm_tis_spi_phy *phy; - phy = devm_kzalloc(&dev->dev, sizeof(struct tpm_tis_spi_phy), - GFP_KERNEL); + phy = devm_kzalloc(&dev->dev, sizeof(*phy), GFP_KERNEL); if (!phy) return -ENOMEM; From patchwork Mon Oct 16 17:34:56 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: 826443 Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) (using TLSv1.2 with cipher ADH-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3yG5QP25gsz9sRm for ; Tue, 17 Oct 2017 04:48:13 +1100 (AEDT) Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) by lists.ozlabs.org (Postfix) with ESMTP id 3yG5QP0c7mzDrJn for ; Tue, 17 Oct 2017 04:48:13 +1100 (AEDT) X-Original-To: linuxppc-dev@lists.ozlabs.org Delivered-To: linuxppc-dev@lists.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=users.sourceforge.net (client-ip=212.227.17.12; helo=mout.web.de; envelope-from=elfring@users.sourceforge.net; receiver=) Received: from mout.web.de (mout.web.de [212.227.17.12]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 3yG57q037TzDrFy for ; Tue, 17 Oct 2017 04:35:34 +1100 (AEDT) Received: from [192.168.1.2] ([78.49.107.148]) by smtp.web.de (mrweb101 [213.165.67.124]) with ESMTPSA (Nemesis) id 0Meje0-1dt5as2pyK-00OFgw; Mon, 16 Oct 2017 19:34:58 +0200 Subject: [PATCH 4/4] char/tpm: Less checks in tpm_ibmvtpm_probe() after error detection From: SF Markus Elfring To: linux-integrity@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, Andy Shevchenko , Benjamin Herrenschmidt , Corentin Labbe , Jarkko Sakkinen , Jason Gunthorpe , Jerry Snitselaar , Kenneth Goldman , Michael Ellerman , Nayna Jain , Paul Mackerras , =?utf-8?q?Peter_H=C3=BCwe?= , Stefan Berger References: <1d3516a2-a8e6-9e95-d438-f115fac84c7f@users.sourceforge.net> Message-ID: <09a2c3a1-1b10-507d-a866-258b570f6da1@users.sourceforge.net> Date: Mon, 16 Oct 2017 19:34:56 +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: <1d3516a2-a8e6-9e95-d438-f115fac84c7f@users.sourceforge.net> Content-Language: en-GB X-Provags-ID: V03:K0:3+5IEMjvrBHtXW03pFAr9fNZebdZMgZ946p4x2sj3eYx+R7EYao /wizqobuqRjy5/ZbHALgNbp2CayRWqBpqY11qx+bXTNxwDs6QbagRIYGB2F8pOVkhDr1Wle HqH1eUUbHDVYitsOA6rB+2FAGNXcMaTQfJK0xUPj76nucaDrVOQOpOsEAQfz1gjE+K/fuSf 2Y5sEchph+NPGi9FOAG1A== X-UI-Out-Filterresults: notjunk:1; V01:K0:RyKmwl4/Sgg=:mgsJJeIiVhsWwGRl6l4y2o An2BObe1CVUAoxo4yZOnBSNf483VxnJkPsZ5wRgyGo96KeYHelayeAtPPEYqgHtLZQgV0zD0d Socf1kGXtR5xyaIUx+j73cFEOpImZLp6ZMA53yPQSRcrnzHYo4PZbm6iaWK1Pe9PYxHGGxgnc 96h+fpHolEOpDHBMr+g+4XI/TWNEmRGjXRTb2yaW/JvcHtU0BbjTUZ6dfmpJnzfN8i4wk24+a J4opjw4PBJMox5XkcCgYww5HnLeEOL4ULlVjbnS0jMXLM8V7rRobCYJs1wDqj4WkNcCeQWPxM I/wtifX/tEae75zfLinbp1Cu1uqgz1MLdBxHSxdT3nqZ49+15Vs/xZQwwPAMv8bUAQltVUNeA Ut+Y4I5geDrVIQEmo035t2XuHcIikFWpR76WGfPrrcTfbbezIgSQ1OSzlbEUpofqCS6sU3dgo E5fEEEv46HdXgm6G1chB4yoKFL0t33IS8nBVbOJ1r1HxlPG7TTNQy21WII1IO3BakzX8oESa7 WD/vjp5gVHx1a3zZijkmadi4WlsRlQ6/15qZ6oz3QbCHSJ2oOm2U5I8Ucc7E/kJoz1ZKeScvL okKeFUrI9e45fV6kknJeCSYPTF8xl+jXjV1U4fn938WTZB+alfBpPOw7gH7rXeuYBpfNFrm2S 5WC1JNILZHxHcs7JEPaU+9eOGrRqJ9p3adylRhGBCTgDEVidHtiOIcVXABiPiEwBdu7uLjkKa Gfg7nD8BgPfi/ceWnm9BjY9VetUAeHMtkGj3GjFnUq+exDwmqo9MrQXMez3qcMPrQEO23CyvM LsXwBfQaPWgnf5vKuFFwF4anwrtbalmFNGcWSfopGUKtWYC2es= X-BeenThere: linuxppc-dev@lists.ozlabs.org X-Mailman-Version: 2.1.24 Precedence: list List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: kernel-janitors@vger.kernel.org, LKML Errors-To: linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org Sender: "Linuxppc-dev" From: Markus Elfring Date: Mon, 16 Oct 2017 19:00:34 +0200 Two pointer checks could be repeated by the tpm_ibmvtpm_probe() function during error handling even if the relevant properties can be determined for the involved variables before by source code analysis. * Return directly after a call of the function "kzalloc" failed at the beginning. * Adjust jump targets so that extra checks can be omitted at the end. Signed-off-by: Markus Elfring --- drivers/char/tpm/tpm_ibmvtpm.c | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/drivers/char/tpm/tpm_ibmvtpm.c b/drivers/char/tpm/tpm_ibmvtpm.c index a4b462a77b99..b8dda7546f64 100644 --- a/drivers/char/tpm/tpm_ibmvtpm.c +++ b/drivers/char/tpm/tpm_ibmvtpm.c @@ -610,7 +610,7 @@ static int tpm_ibmvtpm_probe(struct vio_dev *vio_dev, ibmvtpm = kzalloc(sizeof(*ibmvtpm), GFP_KERNEL); if (!ibmvtpm) - goto cleanup; + return -ENOMEM; ibmvtpm->dev = dev; ibmvtpm->vdev = vio_dev; @@ -619,7 +619,7 @@ static int tpm_ibmvtpm_probe(struct vio_dev *vio_dev, crq_q->crq_addr = (struct ibmvtpm_crq *)get_zeroed_page(GFP_KERNEL); if (!crq_q->crq_addr) { dev_err(dev, "Unable to allocate memory for crq_addr\n"); - goto cleanup; + goto free_tpm; } crq_q->num_entry = CRQ_RES_BUF_SIZE / sizeof(*crq_q->crq_addr); @@ -629,7 +629,7 @@ static int tpm_ibmvtpm_probe(struct vio_dev *vio_dev, if (dma_mapping_error(dev, ibmvtpm->crq_dma_handle)) { dev_err(dev, "dma mapping failed\n"); - goto cleanup; + goto free_page; } rc = plpar_hcall_norets(H_REG_CRQ, vio_dev->unit_address, @@ -683,13 +683,10 @@ static int tpm_ibmvtpm_probe(struct vio_dev *vio_dev, reg_crq_cleanup: dma_unmap_single(dev, ibmvtpm->crq_dma_handle, CRQ_RES_BUF_SIZE, DMA_BIDIRECTIONAL); -cleanup: - if (ibmvtpm) { - if (crq_q->crq_addr) - free_page((unsigned long)crq_q->crq_addr); - kfree(ibmvtpm); - } - +free_page: + free_page((unsigned long)crq_q->crq_addr); +free_tpm: + kfree(ibmvtpm); return rc; }