From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753429AbdARV6U (ORCPT ); Wed, 18 Jan 2017 16:58:20 -0500 Received: from mout.web.de ([217.72.192.78]:58796 "EHLO mout.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752222AbdARV6S (ORCPT ); Wed, 18 Jan 2017 16:58:18 -0500 Subject: [PATCH 2/5] um: port: Delete three error messages for a failed memory allocation To: user-mode-linux-devel@lists.sourceforge.net, user-mode-linux-user@lists.sourceforge.net, Anton Ivanov , Dan Williams , Hannes Reinecke , Jeff Dike , Jens Axboe , Richard Weinberger References: Cc: LKML , kernel-janitors@vger.kernel.org, Wolfram Sang From: SF Markus Elfring Message-ID: <651ecf90-9c68-aec1-58d7-d11e7671ed4c@users.sourceforge.net> Date: Wed, 18 Jan 2017 22:57:30 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Thunderbird/45.6.0 MIME-Version: 1.0 In-Reply-To: Content-Type: text/plain; charset=windows-1252 Content-Transfer-Encoding: 7bit X-Provags-ID: V03:K0:29ewCPH68LrjXePpCuOa6CqPMK6ulg0EJxpGs5tCWzJ1aeWaz3V iW2SBXTDcCdS9Fe3vcu7PPWBvrQOE2dEuMy1lnc4Eh+HDCYT4wfYY/NHZvaR+81TzDrmUQt M607rVO1pbhwmm/drgRtb7iVE9kfpmR8cR3keOZrxGhpy/dYKxesiUDdTqdvq3xXgl5rDCX Z+lC/D64KO27JY8jEJNgA== X-UI-Out-Filterresults: notjunk:1;V01:K0:h7yNt1IV8Dc=:eid3PvRfKaIdFd0uerv3Yv 51VnOlJhTwCOjp6lFGOYsROVUPNQnGmtLDfgeObrGRvQE66LtVXj0wKOxUBhz5gsLbJpPhfrf W9T6nyvquBWHfdqZXs3UinfeQbZuI7wGqgsZOarLOQ9uLSiVuIxBbiM/3Uwkly17cyc47gwvh ZDEgpya2KFYGc02Ex704PRYmRVu6VkP0+yTF3fzwZdvgQ4kWREI2f/pYGk7t9ELLkaNzQfqty ZdZmNO43FezTvTWW1ln2usAZ5+okvZvjduwL4MNqQ1P/E1LkqHG88zzpCKbrewXIs6ZJEUO1D NyGkp+os+bggAUk16rolvrUs6Uog5Sews56m+3bjKu/Eg0GMpY+1J/oSVtLAp0aEvQF/9LTXg v8QcjPtEr1/Jv/vLhTvcMXwIzZHcgWqMxq2a/wTa9CESsTTt/BzwWFqsljs59z6LMJq+tM5xW BPvmTc2GCmtzh5ukvZK+I9em/nfmDHDa50trzoofJDvriOTUOwaNXeZ8MHkWWnf59Jjo9lDZU 1UXRy3fwzOYr43BfV+FrI/mrhqNiHQ0PGXCPZYgYr5/LM4HZDMavTlyaygY7ciIVP8F5MO9dF YXWucJxy0Z0azcvO9qEBKIZH4AUCfFUTcIHqEKN+i3Oi4kB8XwaWGvSjK5nLcm+81Fnyhvk/7 t1ovsV3PdoCzNEDawN1Te/4+NojygXSPOXMdkm2Vv2Cs06JzYuaAQ+0tV8qXWzN+g+WP0HYpj +XVcY+QKUTVSYPK9qrGwbDAxxtn0xfS5DbXZhBeeglStWvOJyX1XXjRsSLzUB/tDbu1tddUvP mE9pg4G Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Markus Elfring Date: Wed, 18 Jan 2017 22:00:14 +0100 The script "checkpatch.pl" pointed information out like the following. WARNING: Possible unnecessary 'out of memory' message Thus fix the affected source code places. Signed-off-by: Markus Elfring --- arch/um/drivers/port_kern.c | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/arch/um/drivers/port_kern.c b/arch/um/drivers/port_kern.c index b2bbda21c5f3..c96741e920f5 100644 --- a/arch/um/drivers/port_kern.c +++ b/arch/um/drivers/port_kern.c @@ -87,11 +87,8 @@ static int port_accept(struct port_list *port) } conn = kmalloc(sizeof(*conn), GFP_ATOMIC); - if (conn == NULL) { - printk(KERN_ERR "port_accept : failed to allocate " - "connection\n"); + if (!conn) goto out_close; - } *conn = ((struct connection) { .list = LIST_HEAD_INIT(conn->list), .fd = fd, @@ -170,10 +167,8 @@ void *port_data(int port_num) goto found; } port = kmalloc(sizeof(struct port_list), GFP_KERNEL); - if (port == NULL) { - printk(KERN_ERR "Allocation of port list failed\n"); + if (!port) goto out; - } fd = port_listen_fd(port_num); if (fd < 0) { @@ -202,10 +197,8 @@ void *port_data(int port_num) found: dev = kmalloc(sizeof(struct port_dev), GFP_KERNEL); - if (dev == NULL) { - printk(KERN_ERR "Allocation of port device entry failed\n"); + if (!dev) goto out; - } *dev = ((struct port_dev) { .port = port, .helper_pid = -1, -- 2.11.0