2017-12-12 03:39:13

by Stephen Rothwell

Subject: linux-next: build warning after merge of the char-misc tree

Hi all,

After merging the char-misc tree, today's linux-next build
(x86_64_allmodconfig) produced this warning:

drivers/misc/mic/vop/vop_vringh.c: In function 'vop_ioctl':
drivers/misc/mic/vop/vop_vringh.c:1001:1: warning: label 'done' defined but not used [-Wunused-label]
done:
^

Introduced by commit

30b7a2c19e29 ("misc: mic: Use memdup_user() as a cleanup")

--
Cheers,
Stephen Rothwell

2017-12-12 10:41:15

by Vasyl Gomonovych

Subject: [PATCH v2] misc: mic: Use memdup_user() as a cleanup

Fix coccicheck warning which recommends to use memdup_user():

drivers/misc/mic/vop/vop_vringh.c:940:14-21: WARNING opportunity for memdup_user
drivers/misc/mic/vop/vop_vringh.c:998:8-15: WARNING opportunity for memdup_user

Generated by: scripts/coccinelle/memdup_user/memdup_user.cocci

Changelog:
- v1:
- Replace kzalloc + copy_from_user on memdup_user
- v2:
- Clear forgotten done label
After merging the char-misc tree, today's linux-next build
(x86_64_allmodconfig) produced this warning:
drivers/misc/mic/vop/vop_vringh.c: In function 'vop_ioctl':
drivers/misc/mic/vop/vop_vringh.c:1001:1: warning: label 'done' defined but not used [-Wunused-label]

Signed-off-by: Vasyl Gomonovych <[email protected]>
---
drivers/misc/mic/vop/vop_vringh.c | 22 +++++++---------------
1 file changed, 7 insertions(+), 15 deletions(-)

diff --git a/drivers/misc/mic/vop/vop_vringh.c b/drivers/misc/mic/vop/vop_vringh.c
index fed992e..27db64e 100644
--- a/drivers/misc/mic/vop/vop_vringh.c
+++ b/drivers/misc/mic/vop/vop_vringh.c
@@ -937,13 +937,10 @@ static long vop_ioctl(struct file *f, unsigned int cmd, unsigned long arg)
dd.num_vq > MIC_MAX_VRINGS)
return -EINVAL;

- dd_config = kzalloc(mic_desc_size(&dd), GFP_KERNEL);
- if (!dd_config)
- return -ENOMEM;
- if (copy_from_user(dd_config, argp, mic_desc_size(&dd))) {
- ret = -EFAULT;
- goto free_ret;
- }
+ dd_config = memdup_user(argp, mic_desc_size(&dd));
+ if (IS_ERR(dd_config))
+ return PTR_ERR(dd_config);
+
/* Ensure desc has not changed between the two reads */
if (memcmp(&dd, dd_config, sizeof(dd))) {
ret = -EINVAL;
@@ -995,17 +992,12 @@ static long vop_ioctl(struct file *f, unsigned int cmd, unsigned long arg)
ret = vop_vdev_inited(vdev);
if (ret)
goto __unlock_ret;
- buf = kzalloc(vdev->dd->config_len, GFP_KERNEL);
- if (!buf) {
- ret = -ENOMEM;
+ buf = memdup_user(argp, vdev->dd->config_len);
+ if (IS_ERR(buf)) {
+ ret = PTR_ERR(buf);
goto __unlock_ret;
}
- if (copy_from_user(buf, argp, vdev->dd->config_len)) {
- ret = -EFAULT;
- goto done;
- }
ret = vop_virtio_config_change(vdev, buf);
-done:
kfree(buf);
__unlock_ret:
mutex_unlock(&vdev->vdev_mutex);
--
1.9.1

2017-12-12 11:49:32

by Greg KH

Subject: Re: [PATCH v2] misc: mic: Use memdup_user() as a cleanup

On Tue, Dec 12, 2017 at 11:40:58AM +0100, Vasyl Gomonovych wrote:
> Fix coccicheck warning which recommends to use memdup_user():
>
> drivers/misc/mic/vop/vop_vringh.c:940:14-21: WARNING opportunity for memdup_user
> drivers/misc/mic/vop/vop_vringh.c:998:8-15: WARNING opportunity for memdup_user
>
> Generated by: scripts/coccinelle/memdup_user/memdup_user.cocci
>
> Changelog:
> - v1:
> - Replace kzalloc + copy_from_user on memdup_user
> - v2:
> - Clear forgotten done label
> After merging the char-misc tree, today's linux-next build
> (x86_64_allmodconfig) produced this warning:
> drivers/misc/mic/vop/vop_vringh.c: In function 'vop_ioctl':
> drivers/misc/mic/vop/vop_vringh.c:1001:1: warning: label 'done' defined but not used [-Wunused-label]

Will not work as I already have taken v1.

Also, put the changelog below the --- line please.

thanks,

greg k-h

2017-12-12 11:49:51

by Greg KH

Subject: Re: linux-next: build warning after merge of the char-misc tree

On Tue, Dec 12, 2017 at 02:39:10PM +1100, Stephen Rothwell wrote:
> Hi all,
>
> After merging the char-misc tree, today's linux-next build
> (x86_64_allmodconfig) produced this warning:
>
> drivers/misc/mic/vop/vop_vringh.c: In function 'vop_ioctl':
> drivers/misc/mic/vop/vop_vringh.c:1001:1: warning: label 'done' defined but not used [-Wunused-label]
> done:
> ^
>
> Introduced by commit
>
> 30b7a2c19e29 ("misc: mic: Use memdup_user() as a cleanup")

Thanks, Colin sent a patch for this, will queue it up later today.

greg k-h

2017-12-12 13:23:12

by Vasyl Gomonovych

Subject: Re: [PATCH v2] misc: mic: Use memdup_user() as a cleanup

Hi,
Thanks.
Should I prepare fix patch only for missed label?

Regards Vasyl.

On Tue, Dec 12, 2017 at 12:49 PM, Greg KH <[email protected]> wrote:
> On Tue, Dec 12, 2017 at 11:40:58AM +0100, Vasyl Gomonovych wrote:
>> Fix coccicheck warning which recommends to use memdup_user():
>>
>> drivers/misc/mic/vop/vop_vringh.c:940:14-21: WARNING opportunity for memdup_user
>> drivers/misc/mic/vop/vop_vringh.c:998:8-15: WARNING opportunity for memdup_user
>>
>> Generated by: scripts/coccinelle/memdup_user/memdup_user.cocci
>>
>> Changelog:
>> - v1:
>> - Replace kzalloc + copy_from_user on memdup_user
>> - v2:
>> - Clear forgotten done label
>> After merging the char-misc tree, today's linux-next build
>> (x86_64_allmodconfig) produced this warning:
>> drivers/misc/mic/vop/vop_vringh.c: In function 'vop_ioctl':
>> drivers/misc/mic/vop/vop_vringh.c:1001:1: warning: label 'done' defined but not used [-Wunused-label]
>
> Will not work as I already have taken v1.
>
> Also, put the changelog below the --- line please.
>
> thanks,
>
> greg k-h



--
Доброї вам пори дня.

2017-12-13 09:31:09

by Greg KH

Subject: Re: [PATCH v2] misc: mic: Use memdup_user() as a cleanup

On Tue, Dec 12, 2017 at 02:22:41PM +0100, Gomonovych, Vasyl wrote:
> Hi,
> Thanks.
> Should I prepare fix patch only for missed label?

I have no context here at all, sorry...

2017-12-13 22:02:20

by Vasyl Gomonovych

Subject: [PATCH v3] misc: mic: Use memdup_user() as a cleanup

Fix coccicheck warning which recommends to use memdup_user():

drivers/misc/mic/vop/vop_vringh.c:940:14-21: WARNING opportunity for memdup_user
drivers/misc/mic/vop/vop_vringh.c:998:8-15: WARNING opportunity for memdup_user
Generated by: scripts/coccinelle/memdup_user/memdup_user.cocci

Signed-off-by: Vasyl Gomonovych <[email protected]>
---
I'm not sure if this still valid, maybe warning was fixed already.
In that case sorry for this disturbing noise.

Changelog:
- v1:
- Replace kzalloc + copy_from_user by memdup_user
- v2:
- Sorry for this disturb
- Fix warning: label done defined but not used
Introduced by previous commit misc: mic: Use memdup_user() as a cleanup
drivers/misc/mic/vop/vop_vringh.c:1001:1: warning: label 'done' defined but not used [-Wunused-label]

drivers/misc/mic/vop/vop_vringh.c | 22 +++++++---------------
1 file changed, 7 insertions(+), 15 deletions(-)

diff --git a/drivers/misc/mic/vop/vop_vringh.c b/drivers/misc/mic/vop/vop_vringh.c
index fed992e2c258..27db64ec9efe 100644
--- a/drivers/misc/mic/vop/vop_vringh.c
+++ b/drivers/misc/mic/vop/vop_vringh.c
@@ -937,13 +937,10 @@ static long vop_ioctl(struct file *f, unsigned int cmd, unsigned long arg)
dd.num_vq > MIC_MAX_VRINGS)
return -EINVAL;

- dd_config = kzalloc(mic_desc_size(&dd), GFP_KERNEL);
- if (!dd_config)
- return -ENOMEM;
- if (copy_from_user(dd_config, argp, mic_desc_size(&dd))) {
- ret = -EFAULT;
- goto free_ret;
- }
+ dd_config = memdup_user(argp, mic_desc_size(&dd));
+ if (IS_ERR(dd_config))
+ return PTR_ERR(dd_config);
+
/* Ensure desc has not changed between the two reads */
if (memcmp(&dd, dd_config, sizeof(dd))) {
ret = -EINVAL;
@@ -995,17 +992,12 @@ static long vop_ioctl(struct file *f, unsigned int cmd, unsigned long arg)
ret = vop_vdev_inited(vdev);
if (ret)
goto __unlock_ret;
- buf = kzalloc(vdev->dd->config_len, GFP_KERNEL);
- if (!buf) {
- ret = -ENOMEM;
+ buf = memdup_user(argp, vdev->dd->config_len);
+ if (IS_ERR(buf)) {
+ ret = PTR_ERR(buf);
goto __unlock_ret;
}
- if (copy_from_user(buf, argp, vdev->dd->config_len)) {
- ret = -EFAULT;
- goto done;
- }
ret = vop_virtio_config_change(vdev, buf);
-done:
kfree(buf);
__unlock_ret:
mutex_unlock(&vdev->vdev_mutex);
--
1.9.1

2017-12-19 09:17:22

by Greg Kroah-Hartman

Subject: Re: [PATCH v3] misc: mic: Use memdup_user() as a cleanup

On Wed, Dec 13, 2017 at 11:01:08PM +0100, Vasyl Gomonovych wrote:
> Fix coccicheck warning which recommends to use memdup_user():
>
> drivers/misc/mic/vop/vop_vringh.c:940:14-21: WARNING opportunity for memdup_user
> drivers/misc/mic/vop/vop_vringh.c:998:8-15: WARNING opportunity for memdup_user
> Generated by: scripts/coccinelle/memdup_user/memdup_user.cocci
>
> Signed-off-by: Vasyl Gomonovych <[email protected]>
> ---
> I'm not sure if this still valid, maybe warning was fixed already.
> In that case sorry for this disturbing noise.

Seems to already be in the tree.

thanks,

greg k-h