From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752585AbdEVGzE (ORCPT ); Mon, 22 May 2017 02:55:04 -0400 Received: from mout.web.de ([212.227.15.3]:63802 "EHLO mout.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751010AbdEVGzB (ORCPT ); Mon, 22 May 2017 02:55:01 -0400 To: linux-bluetooth@vger.kernel.org, netdev@vger.kernel.org, "David S. Miller" , Gustavo Padovan , Johan Hedberg , Marcel Holtmann From: SF Markus Elfring Subject: [PATCH] Bluetooth: Delete error messages for failed memory allocations in two functions Cc: LKML , kernel-janitors@vger.kernel.org Message-ID: <0afbfdb7-48f1-4d15-d5bd-8ea40b1eb52a@users.sourceforge.net> Date: Mon, 22 May 2017 08:54:49 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.1.1 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Language: en-GB Content-Transfer-Encoding: 7bit X-Provags-ID: V03:K0:xmpIIshptx/70MeSoaN2syW1WecGIeKAgn53vDR7hyMsWj7NrJo wRMmetxx8g+xrAOUVxV29C5Tc79zWuPDSv94GkV7uw5uvN4GAEaiSifMNKZ+BYy2WhNV9mB 4IrQA9250CQSPm/UY+DEH0PzwDz1I9bVo8F2iJqqAinq1ck6hYVtOtFAtRl+fzBdPOJtQ3U 4WXbFfaS6BNPdjvbfxyIw== X-UI-Out-Filterresults: notjunk:1;V01:K0:pQ/1mnGEVp8=:x0I3ETFLytrN/kbgR+zdez jBG3pSUCsEbrbpxQvIDxNMxV8Jg5dVWU7ld3uy9q6jnnLJdpi2tXMGHfiymtYJsr2tVehI1rX ye7wNXPAHUVkMGrBIvP9P+/qbYFrb6Q3IGNH+IM3/53XgS+KHEWAwuILYxFmyVTUoOL3LmvLC YW9Ui6ic97p5+otK0Fjtm36InS4HnXf6cCMe9TIQFDp+qaXyp9/q/a6sKYrK9RYDvM86fQ185 PWO3tjHk9Yt42LMk/rN93K8d/ywsa4N2yXT7E3RsFuigQUUcR/CIzotPUdSthu859IlZWcYyd bdNFFzV7+ppiGbFzDKaaDsDaRfklnJ7EX3VKcTtWWMyxQ33t4j0TvS1+RxyF18znOqWrzfGAQ muFFpdnY+RJvnyfQZpPuSWaS9pic3AO6/5IDs/pYLSaRJE6og92NuJLRxdpK/4gxQrUCxeoRr 2yxRKPWLI9a79x21lc7vBRGvZ2b3XyYLd14j/W0+TaqfrBcHyBzHC12Km6DKQ3/ET51n9fIFR PrE+n01g648c2Nyntut2xE40+VrWVEeYr5Tj3nRnbCf0QuXQhZ+dznT+b+44+g19D+N8AVYL6 YiLIBbSPMJ+Kt3ckEU8X4WZiQfFbFiwe8ZI+Uvc04B+eoQi1I1NsA/oXfXSkh8SalXN0YXJ7p GOuYwhxaJfGDI6y+7jqUD41t6xf9wyJG1dYdIDVJhAGB8qSbZh6j0GDWsyeauUYv2OdJDwTEw CakZTJTuV4+1GRFfOBMXDebrbyHHBI7gbH6zScngZDie24PmdH98LYJVX2/4/ZgmmKbYsG/b4 XMh8rfA Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Markus Elfring Date: Mon, 22 May 2017 08:42:28 +0200 Omit two extra messages for memory allocation failures in these functions. This issue was detected by using the Coccinelle software. Link: http://events.linuxfoundation.org/sites/events/files/slides/LCJ16-Refactor_Strings-WSang_0.pdf Signed-off-by: Markus Elfring --- net/bluetooth/ecdh_helper.c | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/net/bluetooth/ecdh_helper.c b/net/bluetooth/ecdh_helper.c index 24d4e60f8c48..c7b1a9aee579 100644 --- a/net/bluetooth/ecdh_helper.c +++ b/net/bluetooth/ecdh_helper.c @@ -92,8 +92,6 @@ bool compute_ecdh_secret(const u8 public_key[64], const u8 private_key[32], - if (!buf) { - pr_err("alg: kpp: Failed to allocate %d bytes for buf\n", - buf_len); + if (!buf) goto free_req; - } + crypto_ecdh_encode_key(buf, buf_len, &p); /* Set A private Key */ @@ -173,8 +171,5 @@ bool generate_ecdh_keys(u8 public_key[64], u8 private_key[32]) - if (!buf) { - pr_err("alg: kpp: Failed to allocate %d bytes for buf\n", - buf_len); + if (!buf) goto free_req; - } do { if (tries++ >= max_tries) -- 2.13.0