From patchwork Wed Aug 9 08:04:46 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: 9889809 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 44730602D7 for ; Wed, 9 Aug 2017 08:05:32 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 360A3285F7 for ; Wed, 9 Aug 2017 08:05:32 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 2864C28A2C; Wed, 9 Aug 2017 08:05:32 +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=-1.9 required=2.0 tests=BAYES_00, RCVD_IN_DNSWL_NONE autolearn=ham version=3.3.1 Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 5EF61285F7 for ; Wed, 9 Aug 2017 08:05:31 +0000 (UTC) Received: from alsa0.perex.cz (localhost [127.0.0.1]) by alsa0.perex.cz (Postfix) with ESMTP id 2E2C22673F2; Wed, 9 Aug 2017 10:05:28 +0200 (CEST) X-Original-To: alsa-devel@alsa-project.org Delivered-To: alsa-devel@alsa-project.org Received: by alsa0.perex.cz (Postfix, from userid 1000) id AA96F2673F3; Wed, 9 Aug 2017 10:05:27 +0200 (CEST) Received: from mout.web.de (mout.web.de [217.72.192.78]) by alsa0.perex.cz (Postfix) with ESMTP id 148FC2673DD for ; Wed, 9 Aug 2017 10:05:24 +0200 (CEST) Received: from [192.168.1.2] ([77.182.172.151]) by smtp.web.de (mrweb101 [213.165.67.124]) with ESMTPSA (Nemesis) id 0MY6sm-1eA8PI1UKe-00UsDZ; Wed, 09 Aug 2017 10:04:48 +0200 From: SF Markus Elfring To: alsa-devel@alsa-project.org, Jaroslav Kysela , Kees Cook , Takashi Iwai , Takashi Sakamoto References: <412aa3a5-c8b6-c1fe-febb-0d62927dacc2@users.sourceforge.net> Message-ID: Date: Wed, 9 Aug 2017 10:04:46 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.2.1 MIME-Version: 1.0 In-Reply-To: <412aa3a5-c8b6-c1fe-febb-0d62927dacc2@users.sourceforge.net> Content-Language: en-GB X-Provags-ID: V03:K0:kBJCTLDHIhPj0ixN/aSAdg6fe3HhIUmFESbem3WfBjo6W1zpUQV i4wjdKe2QnmYG7x1quD12EC47UbLyAW73IALs/iFYogIHNrGx8tPm1eqnMjGNZThv4DNAQy 8QO0BbWo586sU5pm3FmGN+60R4YnqLlR+irNJanorqytwxOX7o7uV9iC6VU55c7qwkdePyz FNV8RXDICB0OjQlGFIzzA== X-UI-Out-Filterresults: notjunk:1; V01:K0:7BLct88Sybg=:cz3CsG9Gdn/VlcXphHVL9h ccFSGkFIeNrnWWiAtE7frP7hedgJbSmMWD2UpS0EPiV1bhxkcJGrDB9bTEWRWp6GIybnGGQ8P mhj8XQgz2Na3eTzqvmkb99FF2RcZw9oqAiBY/cdvFd3sN8xTDw5Z0YKQEmJlWFFi5vJD5WNJr 4NVsVWepli3HCjGRU0bntLU9feX81hhE3cbgebZlY6Sn3YG/ctMbWYtkDjxgz3s/QL6xgMKww e9xKLvB6F4abFrgJ52OyZFfDSfaqeGT/p0eIkDiKn6HXri4BVjcAbs3fAtnuKOx6+0/d/U0qJ rpvCkKmd43RImbjFTlpLi0AjFBS4675h23bLhYwGvV5Luv7orNSHziHk3eOVzdp5B1acsT9nI 5Z/jPPFm4kJHyUGDDfEVRXrnp4/JJN/V5KX8yihCz8TRO+VPmBVxszh9YQ3YumWI+6hYpAISF QdxsMhCF8/jefdNaXNmIxxLAOxuVbZZYfrzqZYxqvAd7sIQAZAofX8aZT4XpRGJnWlUFbC6gO q5qyTiMm2NUXiyi5TIA/2YnnKMUj5Uc0l1gobpLFMpaGlRXcvy0PsV8gtiI4Li+ERK2SPzQRb H5MR8Z/P4fYOX59pYyB0d0h1IF73UZyMwWmKW5izdCdabnlXOUNnsm0BzgRRJ90mr5lXuzAUw 9I+4aTxdY8LSVMBcVNHXcBgPODaLZlM45Ung6Q1pDmFYWzncnWY5/EoOCTC9TcJAXP3bdWuTH 6I1S+goBV4ekK46vy4759VJuHy8Ol+1N5BxlsTbZiO+qQ4T1rN4B6z1kvj81mmhqGrmdUMV1m ohwhRo2wIeGBXMK9ONsmFDl+81RENVu5/NODFGsUKsCIycV9Us= Cc: kernel-janitors@vger.kernel.org, LKML Subject: [alsa-devel] [PATCH 4/4] ALSA: emux: Delete two error messages for a failed memory allocation in snd_emux_create_port() X-BeenThere: alsa-devel@alsa-project.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "Alsa-devel mailing list for ALSA developers - http://www.alsa-project.org" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: alsa-devel-bounces@alsa-project.org Sender: alsa-devel-bounces@alsa-project.org X-Virus-Scanned: ClamAV using ClamSMTP From: Markus Elfring Date: Wed, 9 Aug 2017 09:30:34 +0200 Omit extra messages for a memory allocation failure in this function. 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 --- sound/synth/emux/emux_seq.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/sound/synth/emux/emux_seq.c b/sound/synth/emux/emux_seq.c index fd6cbd439511..396c406d0f77 100644 --- a/sound/synth/emux/emux_seq.c +++ b/sound/synth/emux/emux_seq.c @@ -145,14 +145,12 @@ snd_emux_create_port(struct snd_emux *emu, char *name, /* Allocate structures for this channel */ p = kzalloc(sizeof(*p), GFP_KERNEL); - if (!p) { - snd_printk(KERN_ERR "no memory\n"); + if (!p) return NULL; - } + p->chset.channels = kcalloc(max_channels, sizeof(*p->chset.channels), GFP_KERNEL); if (!p->chset.channels) { - snd_printk(KERN_ERR "no memory\n"); kfree(p); return NULL; }