2013-04-24 06:34:22

by Asias He

[permalink] [raw]
Subject: [PATCH] VSOCK: Fix misc device registration

When we call vsock_core_init to init VSOCK the second time,
vsock_device.minor still points to the old dynamically allocated minor
number. misc_register will allocate it for us successfully as if we were
asking for a static one. However, when other user call misc_register to
allocate a dynamic minor number, it will give the one used by
vsock_core_init(), causing this:

[ 405.470687] WARNING: at fs/sysfs/dir.c:536 sysfs_add_one+0xcc/0xf0()
[ 405.470689] Hardware name: OptiPlex 790
[ 405.470690] sysfs: cannot create duplicate filename '/dev/char/10:54'

Always set vsock_device.minor to MISC_DYNAMIC_MINOR before we
register.

Cc: "David S. Miller" <[email protected]>
Cc: Andy King <[email protected]>
Cc: Dmitry Torokhov <[email protected]>
Cc: Reilly Grant <[email protected]>
Cc: [email protected]
Cc: [email protected]
Signed-off-by: Asias He <[email protected]>
---
net/vmw_vsock/af_vsock.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net/vmw_vsock/af_vsock.c b/net/vmw_vsock/af_vsock.c
index 7f93e2a..4b4db18 100644
--- a/net/vmw_vsock/af_vsock.c
+++ b/net/vmw_vsock/af_vsock.c
@@ -1932,7 +1932,6 @@ static const struct file_operations vsock_device_ops = {

static struct miscdevice vsock_device = {
.name = "vsock",
- .minor = MISC_DYNAMIC_MINOR,
.fops = &vsock_device_ops,
};

@@ -1942,6 +1941,7 @@ static int __vsock_core_init(void)

vsock_init_tables();

+ vsock_device.minor = MISC_DYNAMIC_MINOR;
err = misc_register(&vsock_device);
if (err) {
pr_err("Failed to register misc device\n");
--
1.8.1.4


2013-04-24 15:46:34

by Dmitry Torokhov

[permalink] [raw]
Subject: Re: [PATCH] VSOCK: Fix misc device registration

On Wed, Apr 24, 2013 at 02:33:52PM +0800, Asias He wrote:
> When we call vsock_core_init to init VSOCK the second time,
> vsock_device.minor still points to the old dynamically allocated minor
> number. misc_register will allocate it for us successfully as if we were
> asking for a static one. However, when other user call misc_register to
> allocate a dynamic minor number, it will give the one used by
> vsock_core_init(), causing this:
>
> [ 405.470687] WARNING: at fs/sysfs/dir.c:536 sysfs_add_one+0xcc/0xf0()
> [ 405.470689] Hardware name: OptiPlex 790
> [ 405.470690] sysfs: cannot create duplicate filename '/dev/char/10:54'
>
> Always set vsock_device.minor to MISC_DYNAMIC_MINOR before we
> register.
>
> Cc: "David S. Miller" <[email protected]>
> Cc: Andy King <[email protected]>
> Cc: Dmitry Torokhov <[email protected]>
> Cc: Reilly Grant <[email protected]>
> Cc: [email protected]
> Cc: [email protected]
> Signed-off-by: Asias He <[email protected]>

Well spotted.

Acked-by: Dmitry Torokhov <[email protected]>

> ---
> net/vmw_vsock/af_vsock.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/net/vmw_vsock/af_vsock.c b/net/vmw_vsock/af_vsock.c
> index 7f93e2a..4b4db18 100644
> --- a/net/vmw_vsock/af_vsock.c
> +++ b/net/vmw_vsock/af_vsock.c
> @@ -1932,7 +1932,6 @@ static const struct file_operations vsock_device_ops = {
>
> static struct miscdevice vsock_device = {
> .name = "vsock",
> - .minor = MISC_DYNAMIC_MINOR,
> .fops = &vsock_device_ops,
> };
>
> @@ -1942,6 +1941,7 @@ static int __vsock_core_init(void)
>
> vsock_init_tables();
>
> + vsock_device.minor = MISC_DYNAMIC_MINOR;
> err = misc_register(&vsock_device);
> if (err) {
> pr_err("Failed to register misc device\n");
> --
> 1.8.1.4

2013-04-25 08:22:33

by David Miller

[permalink] [raw]
Subject: Re: [PATCH] VSOCK: Fix misc device registration

From: Asias He <[email protected]>
Date: Wed, 24 Apr 2013 14:33:52 +0800

> When we call vsock_core_init to init VSOCK the second time,
> vsock_device.minor still points to the old dynamically allocated minor
> number. misc_register will allocate it for us successfully as if we were
> asking for a static one. However, when other user call misc_register to
> allocate a dynamic minor number, it will give the one used by
> vsock_core_init(), causing this:
>
> [ 405.470687] WARNING: at fs/sysfs/dir.c:536 sysfs_add_one+0xcc/0xf0()
> [ 405.470689] Hardware name: OptiPlex 790
> [ 405.470690] sysfs: cannot create duplicate filename '/dev/char/10:54'
>
> Always set vsock_device.minor to MISC_DYNAMIC_MINOR before we
> register.
>
> Cc: "David S. Miller" <[email protected]>
> Cc: Andy King <[email protected]>
> Cc: Dmitry Torokhov <[email protected]>
> Cc: Reilly Grant <[email protected]>
> Cc: [email protected]
> Cc: [email protected]
> Signed-off-by: Asias He <[email protected]>

Applied.