From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752303AbdLEVwu (ORCPT ); Tue, 5 Dec 2017 16:52:50 -0500 Received: from mout.web.de ([212.227.15.3]:54813 "EHLO mout.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751416AbdLEVwp (ORCPT ); Tue, 5 Dec 2017 16:52:45 -0500 Subject: [PATCH 2/2] usbip: Use common error handling code in stub_recv_cmd_submit() From: SF Markus Elfring To: linux-usb@vger.kernel.org, Greg Kroah-Hartman , Shuah Khan , Valentina Manea Cc: LKML , kernel-janitors@vger.kernel.org References: <6a84f1e4-a5c1-84da-bd14-de28e306991b@users.sourceforge.net> Message-ID: <32b1d0d7-8a48-a960-c666-b0ea187ecdcc@users.sourceforge.net> Date: Tue, 5 Dec 2017 22:52:03 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.5.0 MIME-Version: 1.0 In-Reply-To: <6a84f1e4-a5c1-84da-bd14-de28e306991b@users.sourceforge.net> Content-Type: text/plain; charset=utf-8 Content-Language: en-GB Content-Transfer-Encoding: 8bit X-Provags-ID: V03:K0:U1ynOJFR63NO2D4A3rLLUcINdL5WD7wpq25LXAbJUNzl0UYNfy+ KByK+e0Gd1MmeWGvM3/WdL024WkMML3Ig3XebqxzYHJZYHjS7IshgJhgNTVnHsqeZCXHW1k 0bGTjGKIRpzYYpGHPg8vxCYdHleM3aBmQOTI3d8HD6JP54FJUYzGgZuaGeUisbHypbKm1kk 1/ohFeMmJGgToOb0YjWhg== X-UI-Out-Filterresults: notjunk:1;V01:K0:1R3HcFoZTEU=:lKDa4fcBgd32NXjQwEjzoh 9p5Kco9tKGpRog79h2MIvEGkrllwzztd4dpQO5vAWInQQFh55edbZHKldAp7i4FoQr3oaA6oC NvssCml3LhIhWsEthLWg1/ZJ0cxqJm3na2SeK1gT4v89DDjqoeulRxRz50ttjFhbA/s3t4pys U8ioahq2rZg4J5RGgMwRn9VHMjKhXQHz0SmRh4YnCDputMMzUR9YLDgwL7rfaWCti4/IDSuSM zvr9uxCv+dK6S+LKVqRsSQK1B3sLC9rcmiUFR8T1AV6Vgj+pbOqhFy9Dv40wazAdT6MR1laeH 00yEdrPP35y6dxRd81Nav1141rh6Totdk/VDBhklwrVrYJB7uHC64gigGeZgbdSLD/UTmm96c 7UhMR57XL4vLZP2GtlAFPnesU+6E2/J1Xc8itysky5ZuhtKY9IXgFe4noQum1LB6KhLCiGBiO /TrNTacQCkww10eBq15Et9UGEeR8z8sQaDrdwjpk4Sykv1pkWzrBrnV4MGxmfsSmr0w1vWapg HXsa9OzWu2cvU95m2z8Lxcnulh3vWhtzNRYrOU7eB9YbfmyJn2FZPwet5Mm5KIRfLsvM8hnUQ 3I07QOAENuKh0u2eCZZg70XL9QrMdcMT+iIzbuxaoLz9aPa3TqHFsacPpQ1Mqqnen9wINPQoc 4MGOYzNvkFtu0ZdYj7ZfJ+iaxs05CvapXBqvt4mkZwrk0UsfP1N0HQ+cfbWnNXJ0IWPsMmClS VOvLS75PN+HzZ01gNqDDoTlppWWa/pRp6CMmLLHdENN8rhpyf8XkQ7+vRq3Ivv69a4HVMUaCK PbZXBLKR+3zBsMZ0G5uU1vnA2xWd5DVuDFMlt5b/tl7eVeya7sJXWeh3eTZt8/kFhmmpccT Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Markus Elfring Date: Tue, 5 Dec 2017 22:40:30 +0100 Add a jump target so that a bit of exception handling can be better reused at the end of this function. Signed-off-by: Markus Elfring --- drivers/usb/usbip/stub_rx.c | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/drivers/usb/usbip/stub_rx.c b/drivers/usb/usbip/stub_rx.c index a70eb81823a3..f46d71abd2f9 100644 --- a/drivers/usb/usbip/stub_rx.c +++ b/drivers/usb/usbip/stub_rx.c @@ -445,29 +445,23 @@ static void stub_recv_cmd_submit(struct stub_device *sdev, else priv->urb = usb_alloc_urb(0, GFP_KERNEL); - if (!priv->urb) { - usbip_event_add(ud, SDEV_EVENT_ERROR_MALLOC); - return; - } + if (!priv->urb) + goto add_event_malloc_failure; /* allocate urb transfer buffer, if needed */ if (pdu->u.cmd_submit.transfer_buffer_length > 0) { priv->urb->transfer_buffer = kzalloc(pdu->u.cmd_submit.transfer_buffer_length, GFP_KERNEL); - if (!priv->urb->transfer_buffer) { - usbip_event_add(ud, SDEV_EVENT_ERROR_MALLOC); - return; - } + if (!priv->urb->transfer_buffer) + goto add_event_malloc_failure; } /* copy urb setup packet */ priv->urb->setup_packet = kmemdup(&pdu->u.cmd_submit.setup, 8, GFP_KERNEL); - if (!priv->urb->setup_packet) { - usbip_event_add(ud, SDEV_EVENT_ERROR_MALLOC); - return; - } + if (!priv->urb->setup_packet) + goto add_event_malloc_failure; /* set other members from the base header of pdu */ priv->urb->context = (void *) priv; @@ -507,6 +501,10 @@ static void stub_recv_cmd_submit(struct stub_device *sdev, } usbip_dbg_stub_rx("Leave\n"); + return; + +add_event_malloc_failure: + usbip_event_add(ud, SDEV_EVENT_ERROR_MALLOC); } /* recv a pdu */ -- 2.15.1