From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753942AbdL1VqD (ORCPT ); Thu, 28 Dec 2017 16:46:03 -0500 Received: from mout.web.de ([212.227.17.11]:59713 "EHLO mout.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750899AbdL1VqC (ORCPT ); Thu, 28 Dec 2017 16:46:02 -0500 Subject: [PATCH 1/3] pcmcia/cistpl: Delete error messages for a failed memory allocation in three functions From: SF Markus Elfring To: linux-pcmcia@lists.infradead.org, Bhumika Goyal , Greg Kroah-Hartman Cc: LKML , kernel-janitors@vger.kernel.org References: <4eaa454f-8b57-fe0a-4802-3676bc2f582e@users.sourceforge.net> Message-ID: <45a0f894-3de7-0606-08d1-3422d135cf2d@users.sourceforge.net> Date: Thu, 28 Dec 2017 22:45:45 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.5.2 MIME-Version: 1.0 In-Reply-To: <4eaa454f-8b57-fe0a-4802-3676bc2f582e@users.sourceforge.net> Content-Type: text/plain; charset=utf-8 Content-Language: en-GB Content-Transfer-Encoding: 8bit X-Provags-ID: V03:K0:CqpepJ6OlSmYd2HXgvyTtPKM7Psi9hzbjvJLDgcZb33lQbjxIdk 9AUP1/M2EPYuLsRpCnfK4swwfojUhlEIMLhIHBP5ZZkVdJ7vRPEVmJEQeZXLiPzCUlWUdvo 7Pphut3YwVAr1GEherJ9eXscZb3PpckSB9dHJS/6SeoHhSsC83XfRDn9kNwL+KlOFoLtIfR TkFKUmdMaH7YC3PPjfyug== X-UI-Out-Filterresults: notjunk:1;V01:K0:WnB51mMpMgQ=:gErfDXvbYcxbxroM8x7JZ5 u1AoZu3dUV9zYUtjnVKR2XRQdPS9Le5cG52n1CKD3u8TCzMCepySsbemIIF8NxSGNR2T5teKy O1ZfR2yQOe6fCqae92Zeylbba5yOPpTyXhalOui71A1M3xPWJ+znYWqsyWKkPpjzsFDgNYiaI rqKbyG8qRt1I5hPO+QLabcvJ8B0quOwm5LE7/x3ogH/yG3StEPAQU9oS6KOz2r3zNhm4x3ncK shi4MJB0IwBZuEnwXoMCgODRmaPwNkj3UM6fcpYBC6CqKFekllgJEhPMzOxKoRQf8d0M8OxnY 90mn+b9AFQegO+Om/Lh4Z1FkfnoKi9oFYJ+MoODBIRdN+LlYE/hCbnrTRze9SkflIKTidkpH3 p8I47DG7MLZEg5UuJS7FmJyFG8vpv01uRv047hiQt5aGjfXbJXT3SiCZBhX0ieSJ8qZjOHxMC 9DtU/WIBLArDAf0cVspBwgX72uWAaw8iipAr+hX123aIuW6TkRxZAOsVGcbgOzCWl3ApysCCJ hC9g7OXLyT4FLKG4w9TrcUwo8alzXIkI341Z5jE8pfh9rcgPaxiwOvsKIsPYDc2RTztra2CMV qajGOFe8f48o/8r/alEBankQ2DjR8SKLvUCzAVusYsRVdCLuuGiSBLTlaWwNmfKK6UcBefMZ+ aKKVWOsDd/y3cWYT4iR4UJPzmVOPTrWF/NqsTWzFbGgFeG2nrPhCOxbtbZasVDVSJEzlgezvJ MYz9OqbJcqi0MZize8yhq8JClT260BFwAcnk0LeFM5cyXjdQ7OjWQLm2ncQX3WcNi0CiBgcMR qv3AdE26NVT4hl+Wna+slkv2EONiXbyQLfkXwxcjgVPOKdvgis= Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Markus Elfring Date: Thu, 28 Dec 2017 22:12:00 +0100 Omit extra messages for a memory allocation failure in these functions. This issue was detected by using the Coccinelle software. Signed-off-by: Markus Elfring --- drivers/pcmcia/cistpl.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/drivers/pcmcia/cistpl.c b/drivers/pcmcia/cistpl.c index 102646fedb56..192c0e8e9c3d 100644 --- a/drivers/pcmcia/cistpl.c +++ b/drivers/pcmcia/cistpl.c @@ -379,10 +379,9 @@ int verify_cis_cache(struct pcmcia_socket *s) return -EINVAL; buf = kmalloc(256, GFP_KERNEL); - if (buf == NULL) { - dev_warn(&s->dev, "no memory for verifying CIS\n"); + if (!buf) return -ENOMEM; - } + mutex_lock(&s->ops_mutex); list_for_each_entry(cis, &s->cis_cache, node) { int len = cis->len; @@ -419,7 +418,6 @@ int pcmcia_replace_cis(struct pcmcia_socket *s, kfree(s->fake_cis); s->fake_cis = kmalloc(len, GFP_KERNEL); if (s->fake_cis == NULL) { - dev_warn(&s->dev, "no memory to replace CIS\n"); mutex_unlock(&s->ops_mutex); return -ENOMEM; } @@ -1395,14 +1393,12 @@ int pccard_validate_cis(struct pcmcia_socket *s, unsigned int *info) mutex_unlock(&s->ops_mutex); tuple = kmalloc(sizeof(*tuple), GFP_KERNEL); - if (tuple == NULL) { - dev_warn(&s->dev, "no memory to validate CIS\n"); + if (!tuple) return -ENOMEM; - } + p = kmalloc(sizeof(*p), GFP_KERNEL); if (p == NULL) { kfree(tuple); - dev_warn(&s->dev, "no memory to validate CIS\n"); return -ENOMEM; } -- 2.15.1