From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753500AbdJTRaJ (ORCPT ); Fri, 20 Oct 2017 13:30:09 -0400 Received: from mout.web.de ([217.72.192.78]:63653 "EHLO mout.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753294AbdJTRaH (ORCPT ); Fri, 20 Oct 2017 13:30:07 -0400 To: user-mode-linux-devel@lists.sourceforge.net, Jeff Dike , Richard Weinberger Cc: user-mode-linux-user@lists.sourceforge.net, kernel-janitors@vger.kernel.org, LKML From: SF Markus Elfring Subject: [PATCH] um: Use common error handling code in port_listen_fd() Message-ID: Date: Fri, 20 Oct 2017 19:29:55 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.4.0 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Language: en-GB Content-Transfer-Encoding: 7bit X-Provags-ID: V03:K0:tRjuiqKIrjqXO8W4HVQMrhyZ8a+lXdoac2jyBOy9XBbals1NSzo z2hPh8NIkrhfTXl+ILACUWURWbfP+eP+Q2LQ2Kkam55CXFn9s5ZyDKmFe5ExgC2nJAPH+Qu WJzzrrJRfaRO73VY/4y69rre1TQSnRj35ZaxOX3kxnzOfaEiwyQ67CqhRKKGKiprSZRWqdD dqav2L/Ycn+P0bsn4IlWA== X-UI-Out-Filterresults: notjunk:1;V01:K0:AuvxTsFWzJo=:dYoA7x6EmigC5f45gANRtj Aw5dB+VjJszy+R5Hbfrk1w0bTrJDVq3KwYLAudC3gWjg6PJ35133VOHbRwP4rQ3oj8ccTNv+q +lqhXUlRFVVJyHHS7VTLX4CwAccRvukcYdzjcR3QoLlZgS9xZTuu7UxG5hA6ximMmsXuyuTwK GZ4el1IDTz+xZUaQqdAhJ4iWHEAqi3n6naoPi21WgLbMrvZDhGSTUYEwSQEGLl/JNRoqdr3TS gkSALpYCcvZsyZwAqSkH/tOsNW2Su+h/cIKv59Tso5kPdni9PIWQp7fG9GFppf7SxUXXSW2W1 oHsJNrSE4bf2AdEBDwiF/cujpDix6wAwxmfBLQxqILk2rJtotmL4dA08UixlXX8suYTeOQtEX BFgPPswDbvkBamjpDJOFXakU7GvOIaUtOBgnbciLPDu+uhV799i5MslxY5GsDqJ7ifrhhYJGL GCEIBsWnhpMQZ/rt/6toHjba9Wo6b2kTwzf1Kup9PpPTCKXTw1sK9IpLZ1OBsAEdlvD9AzlQg Qf9nwZkfI/E9y71cVUwlqBzeMXRxMucxh1Z1IyAGKb7BiwrdADiie0maPD908FB4goVz+X0EF L6Hyx91BdXH37uWOiRYVJQ368HA3ur6OdjICWPEatA6U7Keubj6RpFJdr9pSnmTcj7k/CSDVB N0K+vdalpK+mIQISG+oh8Yqdx50M+nN4NAM2Kft4p2wiprZ+s6eX/FzWvbbBaUzvLnXlPAVt6 UUKq1JXE3jEGxPBeNzK7mcS3my76XYunlqodirPUAQB30p+0biH0jRHjebwLbq8p9XqGDYSas QLUuuTZwDMObn8mYASMPePvTwDnCIfQbEDZMN6CZiaVEdkiiSA= Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Markus Elfring Date: Fri, 20 Oct 2017 19:24:39 +0200 Add a jump target so that a bit of exception handling can be better reused at the end of this function. This issue was detected by using the Coccinelle software. Signed-off-by: Markus Elfring --- arch/um/drivers/port_user.c | 21 ++++++++------------- 1 file changed, 8 insertions(+), 13 deletions(-) diff --git a/arch/um/drivers/port_user.c b/arch/um/drivers/port_user.c index 9a8e1b64c22e..8d95fa5641af 100644 --- a/arch/um/drivers/port_user.c +++ b/arch/um/drivers/port_user.c @@ -118,29 +118,24 @@ int port_listen_fd(int port) return -errno; arg = 1; - if (setsockopt(fd, SOL_SOCKET, SO_REUSEADDR, &arg, sizeof(arg)) < 0) { - err = -errno; - goto out; - } + if (setsockopt(fd, SOL_SOCKET, SO_REUSEADDR, &arg, sizeof(arg)) < 0) + goto failure_indication; addr.sin_family = AF_INET; addr.sin_port = htons(port); addr.sin_addr.s_addr = htonl(INADDR_ANY); - if (bind(fd, (struct sockaddr *) &addr, sizeof(addr)) < 0) { - err = -errno; - goto out; - } - - if (listen(fd, 1) < 0) { - err = -errno; - goto out; - } + if (bind(fd, (struct sockaddr *) &addr, sizeof(addr)) < 0 || + listen(fd, 1) < 0) + goto failure_indication; err = os_set_fd_block(fd, 0); if (err < 0) goto out; return fd; + + failure_indication: + err = -errno; out: close(fd); return err; -- 2.14.2