From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751937AbbLLJQx (ORCPT ); Sat, 12 Dec 2015 04:16:53 -0500 Received: from mout.web.de ([212.227.15.14]:57475 "EHLO mout.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751498AbbLLJQs (ORCPT ); Sat, 12 Dec 2015 04:16:48 -0500 Subject: [PATCH] uinput: Rename a jump label in uinput_ioctl_handler() To: LKML , linux-input@vger.kernel.org, Dmitry Torokhov References: <566ABCD9.1060404@users.sourceforge.net> Cc: kernel-janitors@vger.kernel.org, Julia Lawall From: SF Markus Elfring Message-ID: <566BE5F2.9070909@users.sourceforge.net> Date: Sat, 12 Dec 2015 10:16:34 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:38.0) Gecko/20100101 Thunderbird/38.4.0 MIME-Version: 1.0 In-Reply-To: <566ABCD9.1060404@users.sourceforge.net> Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit X-Provags-ID: V03:K0:ARC1aHW0BBW/mU5ccPojNBqMPURyb/h2R1TfgrgfQ3VRjWvbAWx kyf8s9RZGZHJCrxA02B8WJo6N8aj8JJwG8I0iUBvjwI1xRJkeeRyyzH470jociMpBbazaYb Mi2SWUpB58K6wP4BPJizJwJ4/nWi4GRweAva8AU/1u5VEZEffTjxhhSRpki+yYkmKpgr4WN Zkiab2ol8TFuZ4uRLGB4g== X-UI-Out-Filterresults: notjunk:1;V01:K0:899n1k/kDDE=:QSD9Udo9zwI6D+UjcmRGOH 7KiZ6D6NQVw/fsSSiMLWd/N097nMmg9G1/K6ErxdIEXm8FlJFgkY55bGQ6F9thUt+mNS99E+r 5qKZhclLxM8AEiiBmQhBdZTjFD6BVXtJy8Wk3GvwgJUaxi0w1VSQgmqA9hSNEyVHNNvAXbVqI iIoVZR0IgjX4xFW6ejFis6BiJgqBXnz150OndrQwdY5fu5ztVa302djdvgpmqXw16lhDRcbO9 bYwpdxtmzOxcBKRy3yiSHoqEDaploR0oezUx07Bo56gD4p0ag2b7YYLNMsfz1eh8yutH+7t2Q SUfCdK7wED4Qy+5hFJl/BZ1MezdgaqZGcT0/QrP+SZrJc4xxLfEhFcfDtiABBLhFTUsrjHGdx 9YDIHZ0bb2G7X8uyi7K1PdCZ+8vvfbPijeR9k6Qog+nX0ZP/E8yPTbP6Ui/dTSWOqplyOUsMK cZKaeIkWxDv7uh9jCPlZjeM5yNinawtm6QZ+KXgq1Z+T5Mg3eleBzsYXDFSe7eZparhqCTUpW 4oZUA1ijaPc1HQp5RqDZnneXzbeyHa/vLZdTVM4yxQK5hY76Ux8eWyzfn2zlqIUkYNvAS4lu3 rcH/TIN2Rr3N4N3m3OHy8lZ7UTleRUI9UOmOgCIDIKBG1fb6f5AuEHI/CTXhbI86M4l6uHuQD Ir7V5RiOANrkNyVthyf/ncNKl97YHBuex0h0Hks2N+YZOJHbHh7+co5+f40aEaVYT1RhZkgen O3Cabu9AZMw8WV5AarnTvXXL9ipDDLT+WgGZTiW+AVlstsk96SDeCUbRrHCMX+/Xvt9jei44G HSk5ESV Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Markus Elfring Date: Sat, 12 Dec 2015 10:06:00 +0100 This issue was detected by using the Coccinelle software. Choose a jump label according to the current Linux coding style convention. Signed-off-by: Markus Elfring --- drivers/input/misc/uinput.c | 66 ++++++++++++++++++++++----------------------- 1 file changed, 33 insertions(+), 33 deletions(-) diff --git a/drivers/input/misc/uinput.c b/drivers/input/misc/uinput.c index 5adbced..466f62d 100644 --- a/drivers/input/misc/uinput.c +++ b/drivers/input/misc/uinput.c @@ -717,7 +717,7 @@ static long uinput_ioctl_handler(struct file *file, unsigned int cmd, if (!udev->dev) { retval = uinput_allocate_device(udev); if (retval) - goto out; + goto unlock; } switch (cmd) { @@ -725,82 +725,82 @@ static long uinput_ioctl_handler(struct file *file, unsigned int cmd, if (put_user(UINPUT_VERSION, (unsigned int __user *)p)) retval = -EFAULT; - goto out; + goto unlock; case UI_DEV_CREATE: retval = uinput_create_device(udev); - goto out; + goto unlock; case UI_DEV_DESTROY: uinput_destroy_device(udev); - goto out; + goto unlock; case UI_SET_EVBIT: retval = uinput_set_bit(arg, evbit, EV_MAX); - goto out; + goto unlock; case UI_SET_KEYBIT: retval = uinput_set_bit(arg, keybit, KEY_MAX); - goto out; + goto unlock; case UI_SET_RELBIT: retval = uinput_set_bit(arg, relbit, REL_MAX); - goto out; + goto unlock; case UI_SET_ABSBIT: retval = uinput_set_bit(arg, absbit, ABS_MAX); - goto out; + goto unlock; case UI_SET_MSCBIT: retval = uinput_set_bit(arg, mscbit, MSC_MAX); - goto out; + goto unlock; case UI_SET_LEDBIT: retval = uinput_set_bit(arg, ledbit, LED_MAX); - goto out; + goto unlock; case UI_SET_SNDBIT: retval = uinput_set_bit(arg, sndbit, SND_MAX); - goto out; + goto unlock; case UI_SET_FFBIT: retval = uinput_set_bit(arg, ffbit, FF_MAX); - goto out; + goto unlock; case UI_SET_SWBIT: retval = uinput_set_bit(arg, swbit, SW_MAX); - goto out; + goto unlock; case UI_SET_PROPBIT: retval = uinput_set_bit(arg, propbit, INPUT_PROP_MAX); - goto out; + goto unlock; case UI_SET_PHYS: if (udev->state == UIST_CREATED) { retval = -EINVAL; - goto out; + goto unlock; } phys = strndup_user(p, 1024); if (IS_ERR(phys)) { retval = PTR_ERR(phys); - goto out; + goto unlock; } kfree(udev->dev->phys); udev->dev->phys = phys; - goto out; + goto unlock; case UI_BEGIN_FF_UPLOAD: retval = uinput_ff_upload_from_user(p, &ff_up); if (retval) - goto out; + goto unlock; req = uinput_request_find(udev, ff_up.request_id); if (!req || req->code != UI_FF_UPLOAD || !req->u.upload.effect) { retval = -EINVAL; - goto out; + goto unlock; } ff_up.retval = 0; @@ -811,60 +811,60 @@ static long uinput_ioctl_handler(struct file *file, unsigned int cmd, memset(&ff_up.old, 0, sizeof(struct ff_effect)); retval = uinput_ff_upload_to_user(p, &ff_up); - goto out; + goto unlock; case UI_BEGIN_FF_ERASE: if (copy_from_user(&ff_erase, p, sizeof(ff_erase))) { retval = -EFAULT; - goto out; + goto unlock; } req = uinput_request_find(udev, ff_erase.request_id); if (!req || req->code != UI_FF_ERASE) { retval = -EINVAL; - goto out; + goto unlock; } ff_erase.retval = 0; ff_erase.effect_id = req->u.effect_id; if (copy_to_user(p, &ff_erase, sizeof(ff_erase))) { retval = -EFAULT; - goto out; + goto unlock; } - goto out; + goto unlock; case UI_END_FF_UPLOAD: retval = uinput_ff_upload_from_user(p, &ff_up); if (retval) - goto out; + goto unlock; req = uinput_request_find(udev, ff_up.request_id); if (!req || req->code != UI_FF_UPLOAD || !req->u.upload.effect) { retval = -EINVAL; - goto out; + goto unlock; } req->retval = ff_up.retval; uinput_request_done(udev, req); - goto out; + goto unlock; case UI_END_FF_ERASE: if (copy_from_user(&ff_erase, p, sizeof(ff_erase))) { retval = -EFAULT; - goto out; + goto unlock; } req = uinput_request_find(udev, ff_erase.request_id); if (!req || req->code != UI_FF_ERASE) { retval = -EINVAL; - goto out; + goto unlock; } req->retval = ff_erase.retval; uinput_request_done(udev, req); - goto out; + goto unlock; } size = _IOC_SIZE(cmd); @@ -874,15 +874,15 @@ static long uinput_ioctl_handler(struct file *file, unsigned int cmd, case UI_GET_SYSNAME(0): if (udev->state != UIST_CREATED) { retval = -ENOENT; - goto out; + goto unlock; } name = dev_name(&udev->dev->dev); retval = uinput_str_to_user(p, name, size); - goto out; + goto unlock; } retval = -EINVAL; - out: + unlock: mutex_unlock(&udev->mutex); return retval; } -- 2.6.3 From mboxrd@z Thu Jan 1 00:00:00 1970 From: SF Markus Elfring Date: Sat, 12 Dec 2015 09:16:34 +0000 Subject: [PATCH] uinput: Rename a jump label in uinput_ioctl_handler() Message-Id: <566BE5F2.9070909@users.sourceforge.net> List-Id: References: <566ABCD9.1060404@users.sourceforge.net> In-Reply-To: <566ABCD9.1060404@users.sourceforge.net> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: LKML , linux-input@vger.kernel.org, Dmitry Torokhov Cc: kernel-janitors@vger.kernel.org, Julia Lawall From: Markus Elfring Date: Sat, 12 Dec 2015 10:06:00 +0100 This issue was detected by using the Coccinelle software. Choose a jump label according to the current Linux coding style convention. Signed-off-by: Markus Elfring --- drivers/input/misc/uinput.c | 66 ++++++++++++++++++++++----------------------- 1 file changed, 33 insertions(+), 33 deletions(-) diff --git a/drivers/input/misc/uinput.c b/drivers/input/misc/uinput.c index 5adbced..466f62d 100644 --- a/drivers/input/misc/uinput.c +++ b/drivers/input/misc/uinput.c @@ -717,7 +717,7 @@ static long uinput_ioctl_handler(struct file *file, unsigned int cmd, if (!udev->dev) { retval = uinput_allocate_device(udev); if (retval) - goto out; + goto unlock; } switch (cmd) { @@ -725,82 +725,82 @@ static long uinput_ioctl_handler(struct file *file, unsigned int cmd, if (put_user(UINPUT_VERSION, (unsigned int __user *)p)) retval = -EFAULT; - goto out; + goto unlock; case UI_DEV_CREATE: retval = uinput_create_device(udev); - goto out; + goto unlock; case UI_DEV_DESTROY: uinput_destroy_device(udev); - goto out; + goto unlock; case UI_SET_EVBIT: retval = uinput_set_bit(arg, evbit, EV_MAX); - goto out; + goto unlock; case UI_SET_KEYBIT: retval = uinput_set_bit(arg, keybit, KEY_MAX); - goto out; + goto unlock; case UI_SET_RELBIT: retval = uinput_set_bit(arg, relbit, REL_MAX); - goto out; + goto unlock; case UI_SET_ABSBIT: retval = uinput_set_bit(arg, absbit, ABS_MAX); - goto out; + goto unlock; case UI_SET_MSCBIT: retval = uinput_set_bit(arg, mscbit, MSC_MAX); - goto out; + goto unlock; case UI_SET_LEDBIT: retval = uinput_set_bit(arg, ledbit, LED_MAX); - goto out; + goto unlock; case UI_SET_SNDBIT: retval = uinput_set_bit(arg, sndbit, SND_MAX); - goto out; + goto unlock; case UI_SET_FFBIT: retval = uinput_set_bit(arg, ffbit, FF_MAX); - goto out; + goto unlock; case UI_SET_SWBIT: retval = uinput_set_bit(arg, swbit, SW_MAX); - goto out; + goto unlock; case UI_SET_PROPBIT: retval = uinput_set_bit(arg, propbit, INPUT_PROP_MAX); - goto out; + goto unlock; case UI_SET_PHYS: if (udev->state = UIST_CREATED) { retval = -EINVAL; - goto out; + goto unlock; } phys = strndup_user(p, 1024); if (IS_ERR(phys)) { retval = PTR_ERR(phys); - goto out; + goto unlock; } kfree(udev->dev->phys); udev->dev->phys = phys; - goto out; + goto unlock; case UI_BEGIN_FF_UPLOAD: retval = uinput_ff_upload_from_user(p, &ff_up); if (retval) - goto out; + goto unlock; req = uinput_request_find(udev, ff_up.request_id); if (!req || req->code != UI_FF_UPLOAD || !req->u.upload.effect) { retval = -EINVAL; - goto out; + goto unlock; } ff_up.retval = 0; @@ -811,60 +811,60 @@ static long uinput_ioctl_handler(struct file *file, unsigned int cmd, memset(&ff_up.old, 0, sizeof(struct ff_effect)); retval = uinput_ff_upload_to_user(p, &ff_up); - goto out; + goto unlock; case UI_BEGIN_FF_ERASE: if (copy_from_user(&ff_erase, p, sizeof(ff_erase))) { retval = -EFAULT; - goto out; + goto unlock; } req = uinput_request_find(udev, ff_erase.request_id); if (!req || req->code != UI_FF_ERASE) { retval = -EINVAL; - goto out; + goto unlock; } ff_erase.retval = 0; ff_erase.effect_id = req->u.effect_id; if (copy_to_user(p, &ff_erase, sizeof(ff_erase))) { retval = -EFAULT; - goto out; + goto unlock; } - goto out; + goto unlock; case UI_END_FF_UPLOAD: retval = uinput_ff_upload_from_user(p, &ff_up); if (retval) - goto out; + goto unlock; req = uinput_request_find(udev, ff_up.request_id); if (!req || req->code != UI_FF_UPLOAD || !req->u.upload.effect) { retval = -EINVAL; - goto out; + goto unlock; } req->retval = ff_up.retval; uinput_request_done(udev, req); - goto out; + goto unlock; case UI_END_FF_ERASE: if (copy_from_user(&ff_erase, p, sizeof(ff_erase))) { retval = -EFAULT; - goto out; + goto unlock; } req = uinput_request_find(udev, ff_erase.request_id); if (!req || req->code != UI_FF_ERASE) { retval = -EINVAL; - goto out; + goto unlock; } req->retval = ff_erase.retval; uinput_request_done(udev, req); - goto out; + goto unlock; } size = _IOC_SIZE(cmd); @@ -874,15 +874,15 @@ static long uinput_ioctl_handler(struct file *file, unsigned int cmd, case UI_GET_SYSNAME(0): if (udev->state != UIST_CREATED) { retval = -ENOENT; - goto out; + goto unlock; } name = dev_name(&udev->dev->dev); retval = uinput_str_to_user(p, name, size); - goto out; + goto unlock; } retval = -EINVAL; - out: + unlock: mutex_unlock(&udev->mutex); return retval; } -- 2.6.3