iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[DLCI]: Fix tiny race between module unload and sock_ioctl.

Browse Source 
This is a narrow pedantry :) but the dlci_ioctl_hook check and call
should not be parted with the mutex lock.

Signed-off-by: Pavel Emelyanov <xemul@openvz.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Pavel Emelyanov 2008-03-21 15:58:52 -07:00 committed by David S. Miller
parent 1233823b08
commit 7512cbf6ef
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
net/socket.c
View File

@ -909,11 +909,10 @@ static long sock_ioctl(struct file *file, unsigned cmd, unsigned long arg)
if (!dlci_ioctl_hook) if (!dlci_ioctl_hook)
request_module("dlci"); request_module("dlci");
if (dlci_ioctl_hook) { mutex_lock(&dlci_ioctl_mutex);
mutex_lock(&dlci_ioctl_mutex); if (dlci_ioctl_hook)
err = dlci_ioctl_hook(cmd, argp); err = dlci_ioctl_hook(cmd, argp);
mutex_unlock(&dlci_ioctl_mutex); mutex_unlock(&dlci_ioctl_mutex);
}
break; break;
default: default:
err = sock->ops->ioctl(sock, cmd, arg); err = sock->ops->ioctl(sock, cmd, arg);