mirror of
https://github.com/Fishwaldo/Star64_linux.git
synced 2025-03-30 11:04:25 +00:00
[NET] socket: code style cleanup
Make socket.c conform to current style: * run through Lindent * get rid of unneeded casts * split assignment and comparsion where possible Signed-off-by: Stephen Hemminger <shemminger@osdl.org> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Stephen Hemminger
David S. Miller
parent
53fad3cbff
commit
89bddce58e
1 changed files with 388 additions and 341 deletions
269
net/socket.c
269
net/socket.c
|
|
@ -104,8 +104,7 @@ static int sock_mmap(struct file *file, struct vm_area_struct * vma);
|
|||
static int sock_close(struct inode *inode, struct file *file);
|
||||
static unsigned int sock_poll(struct file *file,
|
||||
struct poll_table_struct *wait);
|
||||
static long sock_ioctl(struct file *file,
|
||||
unsigned int cmd, unsigned long arg);
|
||||
static long sock_ioctl(struct file *file, unsigned int cmd, unsigned long arg);
|
||||
#ifdef CONFIG_COMPAT
|
||||
static long compat_sock_ioctl(struct file *file,
|
||||
unsigned int cmd, unsigned long arg);
|
||||
|
|
@ -193,7 +192,6 @@ static __inline__ void net_family_read_unlock(void)
|
|||
#define net_family_read_unlock() do { } while(0)
|
||||
#endif
|
||||
|
||||
|
||||
/*
|
||||
* Statistics counters of the socket lists
|
||||
*/
|
||||
|
|
@ -201,7 +199,8 @@ static __inline__ void net_family_read_unlock(void)
|
|||
static DEFINE_PER_CPU(int, sockets_in_use) = 0;
|
||||
|
||||
/*
|
||||
* Support routines. Move socket addresses back and forth across the kernel/user
|
||||
* Support routines.
|
||||
* Move socket addresses back and forth across the kernel/user
|
||||
* divide and look after the messy bits.
|
||||
*/
|
||||
|
||||
|
|
@ -253,19 +252,20 @@ int move_addr_to_kernel(void __user *uaddr, int ulen, void *kaddr)
|
|||
* specified. Zero is returned for a success.
|
||||
*/
|
||||
|
||||
int move_addr_to_user(void *kaddr, int klen, void __user *uaddr, int __user *ulen)
|
||||
int move_addr_to_user(void *kaddr, int klen, void __user *uaddr,
|
||||
int __user *ulen)
|
||||
{
|
||||
int err;
|
||||
int len;
|
||||
|
||||
if((err=get_user(len, ulen)))
|
||||
err = get_user(len, ulen);
|
||||
if (err)
|
||||
return err;
|
||||
if (len > klen)
|
||||
len = klen;
|
||||
if (len < 0 || len > MAX_SOCK_ADDR)
|
||||
return -EINVAL;
|
||||
if(len)
|
||||
{
|
||||
if (len) {
|
||||
if (audit_sockaddr(klen, kaddr))
|
||||
return -ENOMEM;
|
||||
if (copy_to_user(uaddr, kaddr, len))
|
||||
|
|
@ -285,7 +285,8 @@ static kmem_cache_t * sock_inode_cachep __read_mostly;
|
|||
static struct inode *sock_alloc_inode(struct super_block *sb)
|
||||
{
|
||||
struct socket_alloc *ei;
|
||||
ei = (struct socket_alloc *)kmem_cache_alloc(sock_inode_cachep, SLAB_KERNEL);
|
||||
|
||||
ei = kmem_cache_alloc(sock_inode_cachep, SLAB_KERNEL);
|
||||
if (!ei)
|
||||
return NULL;
|
||||
init_waitqueue_head(&ei->socket.wait);
|
||||
|
|
@ -311,8 +312,8 @@ static void init_once(void * foo, kmem_cache_t * cachep, unsigned long flags)
|
|||
{
|
||||
struct socket_alloc *ei = (struct socket_alloc *)foo;
|
||||
|
||||
if ((flags & (SLAB_CTOR_VERIFY|SLAB_CTOR_CONSTRUCTOR)) ==
|
||||
SLAB_CTOR_CONSTRUCTOR)
|
||||
if ((flags & (SLAB_CTOR_VERIFY|SLAB_CTOR_CONSTRUCTOR))
|
||||
== SLAB_CTOR_CONSTRUCTOR)
|
||||
inode_init_once(&ei->vfs_inode);
|
||||
}
|
||||
|
||||
|
|
@ -320,9 +321,12 @@ static int init_inodecache(void)
|
|||
{
|
||||
sock_inode_cachep = kmem_cache_create("sock_inode_cache",
|
||||
sizeof(struct socket_alloc),
|
||||
0, (SLAB_HWCACHE_ALIGN|SLAB_RECLAIM_ACCOUNT|
|
||||
0,
|
||||
(SLAB_HWCACHE_ALIGN |
|
||||
SLAB_RECLAIM_ACCOUNT |
|
||||
SLAB_MEM_SPREAD),
|
||||
init_once, NULL);
|
||||
init_once,
|
||||
NULL);
|
||||
if (sock_inode_cachep == NULL)
|
||||
return -ENOMEM;
|
||||
return 0;
|
||||
|
|
@ -335,7 +339,8 @@ static struct super_operations sockfs_ops = {
|
|||
};
|
||||
|
||||
static int sockfs_get_sb(struct file_system_type *fs_type,
|
||||
int flags, const char *dev_name, void *data, struct vfsmount *mnt)
|
||||
int flags, const char *dev_name, void *data,
|
||||
struct vfsmount *mnt)
|
||||
{
|
||||
return get_sb_pseudo(fs_type, "socket:", &sockfs_ops, SOCKFS_MAGIC,
|
||||
mnt);
|
||||
|
|
@ -348,6 +353,7 @@ static struct file_system_type sock_fs_type = {
|
|||
.get_sb = sockfs_get_sb,
|
||||
.kill_sb = kill_anon_super,
|
||||
};
|
||||
|
||||
static int sockfs_delete_dentry(struct dentry *dentry)
|
||||
{
|
||||
return 1;
|
||||
|
|
@ -477,10 +483,12 @@ struct socket *sockfd_lookup(int fd, int *err)
|
|||
struct file *file;
|
||||
struct socket *sock;
|
||||
|
||||
if (!(file = fget(fd))) {
|
||||
file = fget(fd);
|
||||
if (!file) {
|
||||
*err = -EBADF;
|
||||
return NULL;
|
||||
}
|
||||
|
||||
sock = sock_from_file(file, err);
|
||||
if (!sock)
|
||||
fput(file);
|
||||
|
|
@ -621,7 +629,7 @@ int kernel_sendmsg(struct socket *sock, struct msghdr *msg,
|
|||
* the following is safe, since for compiler definitions of kvec and
|
||||
* iovec are identical, yielding the same in-core layout and alignment
|
||||
*/
|
||||
msg->msg_iov = (struct iovec *)vec,
|
||||
msg->msg_iov = (struct iovec *)vec;
|
||||
msg->msg_iovlen = num;
|
||||
result = sock_sendmsg(sock, msg, size);
|
||||
set_fs(oldfs);
|
||||
|
|
@ -663,8 +671,7 @@ int sock_recvmsg(struct socket *sock, struct msghdr *msg,
|
|||
}
|
||||
|
||||
int kernel_recvmsg(struct socket *sock, struct msghdr *msg,
|
||||
struct kvec *vec, size_t num,
|
||||
size_t size, int flags)
|
||||
struct kvec *vec, size_t num, size_t size, int flags)
|
||||
{
|
||||
mm_segment_t oldfs = get_fs();
|
||||
int result;
|
||||
|
|
@ -674,8 +681,7 @@ int kernel_recvmsg(struct socket *sock, struct msghdr *msg,
|
|||
* the following is safe, since for compiler definitions of kvec and
|
||||
* iovec are identical, yielding the same in-core layout and alignment
|
||||
*/
|
||||
msg->msg_iov = (struct iovec *)vec,
|
||||
msg->msg_iovlen = num;
|
||||
msg->msg_iov = (struct iovec *)vec, msg->msg_iovlen = num;
|
||||
result = sock_recvmsg(sock, msg, size, flags);
|
||||
set_fs(oldfs);
|
||||
return result;
|
||||
|
|
@ -702,7 +708,8 @@ static ssize_t sock_sendpage(struct file *file, struct page *page,
|
|||
}
|
||||
|
||||
static struct sock_iocb *alloc_sock_iocb(struct kiocb *iocb,
|
||||
char __user *ubuf, size_t size, struct sock_iocb *siocb)
|
||||
char __user *ubuf, size_t size,
|
||||
struct sock_iocb *siocb)
|
||||
{
|
||||
if (!is_sync_kiocb(iocb)) {
|
||||
siocb = kmalloc(sizeof(*siocb), GFP_KERNEL);
|
||||
|
|
@ -720,7 +727,8 @@ static struct sock_iocb *alloc_sock_iocb(struct kiocb *iocb,
|
|||
}
|
||||
|
||||
static ssize_t do_sock_read(struct msghdr *msg, struct kiocb *iocb,
|
||||
struct file *file, struct iovec *iov, unsigned long nr_segs)
|
||||
struct file *file, struct iovec *iov,
|
||||
unsigned long nr_segs)
|
||||
{
|
||||
struct socket *sock = file->private_data;
|
||||
size_t size = 0;
|
||||
|
|
@ -775,7 +783,8 @@ static ssize_t sock_aio_read(struct kiocb *iocb, char __user *ubuf,
|
|||
}
|
||||
|
||||
static ssize_t do_sock_write(struct msghdr *msg, struct kiocb *iocb,
|
||||
struct file *file, struct iovec *iov, unsigned long nr_segs)
|
||||
struct file *file, struct iovec *iov,
|
||||
unsigned long nr_segs)
|
||||
{
|
||||
struct socket *sock = file->private_data;
|
||||
size_t size = 0;
|
||||
|
|
@ -832,7 +841,6 @@ static ssize_t sock_aio_write(struct kiocb *iocb, const char __user *ubuf,
|
|||
&x->async_iov, 1);
|
||||
}
|
||||
|
||||
|
||||
/*
|
||||
* Atomic setting of ioctl hooks to avoid race
|
||||
* with module unload.
|
||||
|
|
@ -847,6 +855,7 @@ void brioctl_set(int (*hook)(unsigned int, void __user *))
|
|||
br_ioctl_hook = hook;
|
||||
mutex_unlock(&br_ioctl_mutex);
|
||||
}
|
||||
|
||||
EXPORT_SYMBOL(brioctl_set);
|
||||
|
||||
static DEFINE_MUTEX(vlan_ioctl_mutex);
|
||||
|
|
@ -858,6 +867,7 @@ void vlan_ioctl_set(int (*hook)(void __user *))
|
|||
vlan_ioctl_hook = hook;
|
||||
mutex_unlock(&vlan_ioctl_mutex);
|
||||
}
|
||||
|
||||
EXPORT_SYMBOL(vlan_ioctl_set);
|
||||
|
||||
static DEFINE_MUTEX(dlci_ioctl_mutex);
|
||||
|
|
@ -869,6 +879,7 @@ void dlci_ioctl_set(int (*hook)(unsigned int, void __user *))
|
|||
dlci_ioctl_hook = hook;
|
||||
mutex_unlock(&dlci_ioctl_mutex);
|
||||
}
|
||||
|
||||
EXPORT_SYMBOL(dlci_ioctl_set);
|
||||
|
||||
/*
|
||||
|
|
@ -901,7 +912,8 @@ static long sock_ioctl(struct file *file, unsigned cmd, unsigned long arg)
|
|||
break;
|
||||
case FIOGETOWN:
|
||||
case SIOCGPGRP:
|
||||
err = put_user(sock->file->f_owner.pid, (int __user *)argp);
|
||||
err = put_user(sock->file->f_owner.pid,
|
||||
(int __user *)argp);
|
||||
break;
|
||||
case SIOCGIFBR:
|
||||
case SIOCSIFBR:
|
||||
|
|
@ -1013,8 +1025,7 @@ static int sock_close(struct inode *inode, struct file *filp)
|
|||
* closing an unfinished socket.
|
||||
*/
|
||||
|
||||
if (!inode)
|
||||
{
|
||||
if (!inode) {
|
||||
printk(KERN_DEBUG "sock_close: NULL inode\n");
|
||||
return 0;
|
||||
}
|
||||
|
|
@ -1044,8 +1055,7 @@ static int sock_fasync(int fd, struct file *filp, int on)
|
|||
struct socket *sock;
|
||||
struct sock *sk;
|
||||
|
||||
if (on)
|
||||
{
|
||||
if (on) {
|
||||
fna = kmalloc(sizeof(struct fasync_struct), GFP_KERNEL);
|
||||
if (fna == NULL)
|
||||
return -ENOMEM;
|
||||
|
|
@ -1053,7 +1063,8 @@ static int sock_fasync(int fd, struct file *filp, int on)
|
|||
|
||||
sock = filp->private_data;
|
||||
|
||||
if ((sk=sock->sk) == NULL) {
|
||||
sk = sock->sk;
|
||||
if (sk == NULL) {
|
||||
kfree(fna);
|
||||
return -EINVAL;
|
||||
}
|
||||
|
|
@ -1066,10 +1077,8 @@ static int sock_fasync(int fd, struct file *filp, int on)
|
|||
if (fa->fa_file == filp)
|
||||
break;
|
||||
|
||||
if(on)
|
||||
{
|
||||
if(fa!=NULL)
|
||||
{
|
||||
if (on) {
|
||||
if (fa != NULL) {
|
||||
write_lock_bh(&sk->sk_callback_lock);
|
||||
fa->fa_fd = fd;
|
||||
write_unlock_bh(&sk->sk_callback_lock);
|
||||
|
|
@ -1084,11 +1093,8 @@ static int sock_fasync(int fd, struct file *filp, int on)
|
|||
write_lock_bh(&sk->sk_callback_lock);
|
||||
sock->fasync_list = fna;
|
||||
write_unlock_bh(&sk->sk_callback_lock);
|
||||
}
|
||||
else
|
||||
{
|
||||
if (fa!=NULL)
|
||||
{
|
||||
} else {
|
||||
if (fa != NULL) {
|
||||
write_lock_bh(&sk->sk_callback_lock);
|
||||
*prev = fa->fa_next;
|
||||
write_unlock_bh(&sk->sk_callback_lock);
|
||||
|
|
@ -1107,8 +1113,7 @@ int sock_wake_async(struct socket *sock, int how, int band)
|
|||
{
|
||||
if (!sock || !sock->fasync_list)
|
||||
return -1;
|
||||
switch (how)
|
||||
{
|
||||
switch (how) {
|
||||
case 1:
|
||||
|
||||
if (test_bit(SOCK_ASYNC_WAITDATA, &sock->flags))
|
||||
|
|
@ -1128,7 +1133,8 @@ int sock_wake_async(struct socket *sock, int how, int band)
|
|||
return 0;
|
||||
}
|
||||
|
||||
static int __sock_create(int family, int type, int protocol, struct socket **res, int kern)
|
||||
static int __sock_create(int family, int type, int protocol,
|
||||
struct socket **res, int kern)
|
||||
{
|
||||
int err;
|
||||
struct socket *sock;
|
||||
|
|
@ -1150,7 +1156,8 @@ static int __sock_create(int family, int type, int protocol, struct socket **res
|
|||
static int warned;
|
||||
if (!warned) {
|
||||
warned = 1;
|
||||
printk(KERN_INFO "%s uses obsolete (PF_INET,SOCK_PACKET)\n", current->comm);
|
||||
printk(KERN_INFO "%s uses obsolete (PF_INET,SOCK_PACKET)\n",
|
||||
current->comm);
|
||||
}
|
||||
family = PF_PACKET;
|
||||
}
|
||||
|
|
@ -1166,8 +1173,7 @@ static int __sock_create(int family, int type, int protocol, struct socket **res
|
|||
* requested real, full-featured networking support upon configuration.
|
||||
* Otherwise module support will break!
|
||||
*/
|
||||
if (net_families[family]==NULL)
|
||||
{
|
||||
if (net_families[family] == NULL) {
|
||||
request_module("net-pf-%d", family);
|
||||
}
|
||||
#endif
|
||||
|
|
@ -1271,7 +1277,8 @@ out_release:
|
|||
* Create a pair of connected sockets.
|
||||
*/
|
||||
|
||||
asmlinkage long sys_socketpair(int family, int type, int protocol, int __user *usockvec)
|
||||
asmlinkage long sys_socketpair(int family, int type, int protocol,
|
||||
int __user *usockvec)
|
||||
{
|
||||
struct socket *sock1, *sock2;
|
||||
int fd1, fd2, err;
|
||||
|
|
@ -1332,7 +1339,6 @@ out:
|
|||
return err;
|
||||
}
|
||||
|
||||
|
||||
/*
|
||||
* Bind a name to a socket. Nothing much to do here since it's
|
||||
* the protocol's responsibility to handle the local address.
|
||||
|
|
@ -1347,20 +1353,23 @@ asmlinkage long sys_bind(int fd, struct sockaddr __user *umyaddr, int addrlen)
|
|||
char address[MAX_SOCK_ADDR];
|
||||
int err, fput_needed;
|
||||
|
||||
if((sock = sockfd_lookup_light(fd, &err, &fput_needed))!=NULL)
|
||||
{
|
||||
if((err=move_addr_to_kernel(umyaddr,addrlen,address))>=0) {
|
||||
err = security_socket_bind(sock, (struct sockaddr *)address, addrlen);
|
||||
sock = sockfd_lookup_light(fd, &err, &fput_needed);
|
||||
if(sock) {
|
||||
err = move_addr_to_kernel(umyaddr, addrlen, address);
|
||||
if (err >= 0) {
|
||||
err = security_socket_bind(sock,
|
||||
(struct sockaddr *)address,
|
||||
addrlen);
|
||||
if (!err)
|
||||
err = sock->ops->bind(sock,
|
||||
(struct sockaddr *)address, addrlen);
|
||||
(struct sockaddr *)
|
||||
address, addrlen);
|
||||
}
|
||||
fput_light(sock->file, fput_needed);
|
||||
}
|
||||
return err;
|
||||
}
|
||||
|
||||
|
||||
/*
|
||||
* Perform a listen. Basically, we allow the protocol to do anything
|
||||
* necessary for a listen, and if that works, we mark the socket as
|
||||
|
|
@ -1374,7 +1383,8 @@ asmlinkage long sys_listen(int fd, int backlog)
|
|||
struct socket *sock;
|
||||
int err, fput_needed;
|
||||
|
||||
if ((sock = sockfd_lookup_light(fd, &err, &fput_needed)) != NULL) {
|
||||
sock = sockfd_lookup_light(fd, &err, &fput_needed);
|
||||
if (sock) {
|
||||
if ((unsigned)backlog > sysctl_somaxconn)
|
||||
backlog = sysctl_somaxconn;
|
||||
|
||||
|
|
@ -1387,7 +1397,6 @@ asmlinkage long sys_listen(int fd, int backlog)
|
|||
return err;
|
||||
}
|
||||
|
||||
|
||||
/*
|
||||
* For accept, we attempt to create a new socket, set up the link
|
||||
* with the client, wake up the client, then return the new
|
||||
|
|
@ -1400,7 +1409,8 @@ asmlinkage long sys_listen(int fd, int backlog)
|
|||
* clean when we restucture accept also.
|
||||
*/
|
||||
|
||||
asmlinkage long sys_accept(int fd, struct sockaddr __user *upeer_sockaddr, int __user *upeer_addrlen)
|
||||
asmlinkage long sys_accept(int fd, struct sockaddr __user *upeer_sockaddr,
|
||||
int __user *upeer_addrlen)
|
||||
{
|
||||
struct socket *sock, *newsock;
|
||||
struct file *newfile;
|
||||
|
|
@ -1444,11 +1454,13 @@ asmlinkage long sys_accept(int fd, struct sockaddr __user *upeer_sockaddr, int _
|
|||
goto out_fd;
|
||||
|
||||
if (upeer_sockaddr) {
|
||||
if(newsock->ops->getname(newsock, (struct sockaddr *)address, &len, 2)<0) {
|
||||
if (newsock->ops->getname(newsock, (struct sockaddr *)address,
|
||||
&len, 2) < 0) {
|
||||
err = -ECONNABORTED;
|
||||
goto out_fd;
|
||||
}
|
||||
err = move_addr_to_user(address, len, upeer_sockaddr, upeer_addrlen);
|
||||
err = move_addr_to_user(address, len, upeer_sockaddr,
|
||||
upeer_addrlen);
|
||||
if (err < 0)
|
||||
goto out_fd;
|
||||
}
|
||||
|
|
@ -1470,7 +1482,6 @@ out_fd:
|
|||
goto out_put;
|
||||
}
|
||||
|
||||
|
||||
/*
|
||||
* Attempt to connect to a socket with the server address. The address
|
||||
* is in user space so we verify it is OK and move it to kernel space.
|
||||
|
|
@ -1483,7 +1494,8 @@ out_fd:
|
|||
* include the -EINPROGRESS status for such sockets.
|
||||
*/
|
||||
|
||||
asmlinkage long sys_connect(int fd, struct sockaddr __user *uservaddr, int addrlen)
|
||||
asmlinkage long sys_connect(int fd, struct sockaddr __user *uservaddr,
|
||||
int addrlen)
|
||||
{
|
||||
struct socket *sock;
|
||||
char address[MAX_SOCK_ADDR];
|
||||
|
|
@ -1496,7 +1508,8 @@ asmlinkage long sys_connect(int fd, struct sockaddr __user *uservaddr, int addrl
|
|||
if (err < 0)
|
||||
goto out_put;
|
||||
|
||||
err = security_socket_connect(sock, (struct sockaddr *)address, addrlen);
|
||||
err =
|
||||
security_socket_connect(sock, (struct sockaddr *)address, addrlen);
|
||||
if (err)
|
||||
goto out_put;
|
||||
|
||||
|
|
@ -1513,7 +1526,8 @@ out:
|
|||
* name to user space.
|
||||
*/
|
||||
|
||||
asmlinkage long sys_getsockname(int fd, struct sockaddr __user *usockaddr, int __user *usockaddr_len)
|
||||
asmlinkage long sys_getsockname(int fd, struct sockaddr __user *usockaddr,
|
||||
int __user *usockaddr_len)
|
||||
{
|
||||
struct socket *sock;
|
||||
char address[MAX_SOCK_ADDR];
|
||||
|
|
@ -1543,22 +1557,27 @@ out:
|
|||
* name to user space.
|
||||
*/
|
||||
|
||||
asmlinkage long sys_getpeername(int fd, struct sockaddr __user *usockaddr, int __user *usockaddr_len)
|
||||
asmlinkage long sys_getpeername(int fd, struct sockaddr __user *usockaddr,
|
||||
int __user *usockaddr_len)
|
||||
{
|
||||
struct socket *sock;
|
||||
char address[MAX_SOCK_ADDR];
|
||||
int len, err, fput_needed;
|
||||
|
||||
if ((sock = sockfd_lookup_light(fd, &err, &fput_needed)) != NULL) {
|
||||
sock = sockfd_lookup_light(fd, &err, &fput_needed);
|
||||
if (sock != NULL) {
|
||||
err = security_socket_getpeername(sock);
|
||||
if (err) {
|
||||
fput_light(sock->file, fput_needed);
|
||||
return err;
|
||||
}
|
||||
|
||||
err = sock->ops->getname(sock, (struct sockaddr *)address, &len, 1);
|
||||
err =
|
||||
sock->ops->getname(sock, (struct sockaddr *)address, &len,
|
||||
1);
|
||||
if (!err)
|
||||
err=move_addr_to_user(address,len, usockaddr, usockaddr_len);
|
||||
err = move_addr_to_user(address, len, usockaddr,
|
||||
usockaddr_len);
|
||||
fput_light(sock->file, fput_needed);
|
||||
}
|
||||
return err;
|
||||
|
|
@ -1570,8 +1589,9 @@ asmlinkage long sys_getpeername(int fd, struct sockaddr __user *usockaddr, int _
|
|||
* the protocol.
|
||||
*/
|
||||
|
||||
asmlinkage long sys_sendto(int fd, void __user * buff, size_t len, unsigned flags,
|
||||
struct sockaddr __user *addr, int addr_len)
|
||||
asmlinkage long sys_sendto(int fd, void __user *buff, size_t len,
|
||||
unsigned flags, struct sockaddr __user *addr,
|
||||
int addr_len)
|
||||
{
|
||||
struct socket *sock;
|
||||
char address[MAX_SOCK_ADDR];
|
||||
|
|
@ -1628,8 +1648,9 @@ asmlinkage long sys_send(int fd, void __user * buff, size_t len, unsigned flags)
|
|||
* sender address from kernel to user space.
|
||||
*/
|
||||
|
||||
asmlinkage long sys_recvfrom(int fd, void __user * ubuf, size_t size, unsigned flags,
|
||||
struct sockaddr __user *addr, int __user *addr_len)
|
||||
asmlinkage long sys_recvfrom(int fd, void __user *ubuf, size_t size,
|
||||
unsigned flags, struct sockaddr __user *addr,
|
||||
int __user *addr_len)
|
||||
{
|
||||
struct socket *sock;
|
||||
struct iovec iov;
|
||||
|
|
@ -1659,8 +1680,7 @@ asmlinkage long sys_recvfrom(int fd, void __user * ubuf, size_t size, unsigned f
|
|||
flags |= MSG_DONTWAIT;
|
||||
err = sock_recvmsg(sock, &msg, size, flags);
|
||||
|
||||
if(err >= 0 && addr != NULL)
|
||||
{
|
||||
if (err >= 0 && addr != NULL) {
|
||||
err2 = move_addr_to_user(address, msg.msg_namelen, addr, addr_len);
|
||||
if (err2 < 0)
|
||||
err = err2;
|
||||
|
|
@ -1674,7 +1694,8 @@ out:
|
|||
* Receive a datagram from a socket.
|
||||
*/
|
||||
|
||||
asmlinkage long sys_recv(int fd, void __user * ubuf, size_t size, unsigned flags)
|
||||
asmlinkage long sys_recv(int fd, void __user *ubuf, size_t size,
|
||||
unsigned flags)
|
||||
{
|
||||
return sys_recvfrom(fd, ubuf, size, flags, NULL, NULL);
|
||||
}
|
||||
|
|
@ -1684,7 +1705,8 @@ asmlinkage long sys_recv(int fd, void __user * ubuf, size_t size, unsigned flags
|
|||
* to pass the user mode parameter for the protocols to sort out.
|
||||
*/
|
||||
|
||||
asmlinkage long sys_setsockopt(int fd, int level, int optname, char __user *optval, int optlen)
|
||||
asmlinkage long sys_setsockopt(int fd, int level, int optname,
|
||||
char __user *optval, int optlen)
|
||||
{
|
||||
int err, fput_needed;
|
||||
struct socket *sock;
|
||||
|
|
@ -1692,16 +1714,20 @@ asmlinkage long sys_setsockopt(int fd, int level, int optname, char __user *optv
|
|||
if (optlen < 0)
|
||||
return -EINVAL;
|
||||
|
||||
if ((sock = sockfd_lookup_light(fd, &err, &fput_needed)) != NULL)
|
||||
{
|
||||
sock = sockfd_lookup_light(fd, &err, &fput_needed);
|
||||
if (sock != NULL) {
|
||||
err = security_socket_setsockopt(sock, level, optname);
|
||||
if (err)
|
||||
goto out_put;
|
||||
|
||||
if (level == SOL_SOCKET)
|
||||
err=sock_setsockopt(sock,level,optname,optval,optlen);
|
||||
err =
|
||||
sock_setsockopt(sock, level, optname, optval,
|
||||
optlen);
|
||||
else
|
||||
err=sock->ops->setsockopt(sock, level, optname, optval, optlen);
|
||||
err =
|
||||
sock->ops->setsockopt(sock, level, optname, optval,
|
||||
optlen);
|
||||
out_put:
|
||||
fput_light(sock->file, fput_needed);
|
||||
}
|
||||
|
|
@ -1713,27 +1739,32 @@ out_put:
|
|||
* to pass a user mode parameter for the protocols to sort out.
|
||||
*/
|
||||
|
||||
asmlinkage long sys_getsockopt(int fd, int level, int optname, char __user *optval, int __user *optlen)
|
||||
asmlinkage long sys_getsockopt(int fd, int level, int optname,
|
||||
char __user *optval, int __user *optlen)
|
||||
{
|
||||
int err, fput_needed;
|
||||
struct socket *sock;
|
||||
|
||||
if ((sock = sockfd_lookup_light(fd, &err, &fput_needed)) != NULL) {
|
||||
sock = sockfd_lookup_light(fd, &err, &fput_needed);
|
||||
if (sock != NULL) {
|
||||
err = security_socket_getsockopt(sock, level, optname);
|
||||
if (err)
|
||||
goto out_put;
|
||||
|
||||
if (level == SOL_SOCKET)
|
||||
err=sock_getsockopt(sock,level,optname,optval,optlen);
|
||||
err =
|
||||
sock_getsockopt(sock, level, optname, optval,
|
||||
optlen);
|
||||
else
|
||||
err=sock->ops->getsockopt(sock, level, optname, optval, optlen);
|
||||
err =
|
||||
sock->ops->getsockopt(sock, level, optname, optval,
|
||||
optlen);
|
||||
out_put:
|
||||
fput_light(sock->file, fput_needed);
|
||||
}
|
||||
return err;
|
||||
}
|
||||
|
||||
|
||||
/*
|
||||
* Shutdown a socket.
|
||||
*/
|
||||
|
|
@ -1743,8 +1774,8 @@ asmlinkage long sys_shutdown(int fd, int how)
|
|||
int err, fput_needed;
|
||||
struct socket *sock;
|
||||
|
||||
if ((sock = sockfd_lookup_light(fd, &err, &fput_needed))!=NULL)
|
||||
{
|
||||
sock = sockfd_lookup_light(fd, &err, &fput_needed);
|
||||
if (sock != NULL) {
|
||||
err = security_socket_shutdown(sock, how);
|
||||
if (!err)
|
||||
err = sock->ops->shutdown(sock, how);
|
||||
|
|
@ -1760,14 +1791,14 @@ asmlinkage long sys_shutdown(int fd, int how)
|
|||
#define COMPAT_NAMELEN(msg) COMPAT_MSG(msg, msg_namelen)
|
||||
#define COMPAT_FLAGS(msg) COMPAT_MSG(msg, msg_flags)
|
||||
|
||||
|
||||
/*
|
||||
* BSD sendmsg interface
|
||||
*/
|
||||
|
||||
asmlinkage long sys_sendmsg(int fd, struct msghdr __user *msg, unsigned flags)
|
||||
{
|
||||
struct compat_msghdr __user *msg_compat = (struct compat_msghdr __user *)msg;
|
||||
struct compat_msghdr __user *msg_compat =
|
||||
(struct compat_msghdr __user *)msg;
|
||||
struct socket *sock;
|
||||
char address[MAX_SOCK_ADDR];
|
||||
struct iovec iovstack[UIO_FASTIOV], *iov = iovstack;
|
||||
|
|
@ -1783,7 +1814,8 @@ asmlinkage long sys_sendmsg(int fd, struct msghdr __user *msg, unsigned flags)
|
|||
if (MSG_CMSG_COMPAT & flags) {
|
||||
if (get_compat_msghdr(&msg_sys, msg_compat))
|
||||
return -EFAULT;
|
||||
} else if (copy_from_user(&msg_sys, msg, sizeof(struct msghdr)))
|
||||
}
|
||||
else if (copy_from_user(&msg_sys, msg, sizeof(struct msghdr)))
|
||||
return -EFAULT;
|
||||
|
||||
sock = sockfd_lookup_light(fd, &err, &fput_needed);
|
||||
|
|
@ -1819,14 +1851,15 @@ asmlinkage long sys_sendmsg(int fd, struct msghdr __user *msg, unsigned flags)
|
|||
goto out_freeiov;
|
||||
ctl_len = msg_sys.msg_controllen;
|
||||
if ((MSG_CMSG_COMPAT & flags) && ctl_len) {
|
||||
err = cmsghdr_from_user_compat_to_kern(&msg_sys, sock->sk, ctl, sizeof(ctl));
|
||||
err =
|
||||
cmsghdr_from_user_compat_to_kern(&msg_sys, sock->sk, ctl,
|
||||
sizeof(ctl));
|
||||
if (err)
|
||||
goto out_freeiov;
|
||||
ctl_buf = msg_sys.msg_control;
|
||||
ctl_len = msg_sys.msg_controllen;
|
||||
} else if (ctl_len) {
|
||||
if (ctl_len > sizeof(ctl))
|
||||
{
|
||||
if (ctl_len > sizeof(ctl)) {
|
||||
ctl_buf = sock_kmalloc(sock->sk, ctl_len, GFP_KERNEL);
|
||||
if (ctl_buf == NULL)
|
||||
goto out_freeiov;
|
||||
|
|
@ -1837,7 +1870,8 @@ asmlinkage long sys_sendmsg(int fd, struct msghdr __user *msg, unsigned flags)
|
|||
* Afterwards, it will be a kernel pointer. Thus the compiler-assisted
|
||||
* checking falls down on this.
|
||||
*/
|
||||
if (copy_from_user(ctl_buf, (void __user *) msg_sys.msg_control, ctl_len))
|
||||
if (copy_from_user(ctl_buf, (void __user *)msg_sys.msg_control,
|
||||
ctl_len))
|
||||
goto out_freectl;
|
||||
msg_sys.msg_control = ctl_buf;
|
||||
}
|
||||
|
|
@ -1863,9 +1897,11 @@ out:
|
|||
* BSD recvmsg interface
|
||||
*/
|
||||
|
||||
asmlinkage long sys_recvmsg(int fd, struct msghdr __user *msg, unsigned int flags)
|
||||
asmlinkage long sys_recvmsg(int fd, struct msghdr __user *msg,
|
||||
unsigned int flags)
|
||||
{
|
||||
struct compat_msghdr __user *msg_compat = (struct compat_msghdr __user *)msg;
|
||||
struct compat_msghdr __user *msg_compat =
|
||||
(struct compat_msghdr __user *)msg;
|
||||
struct socket *sock;
|
||||
struct iovec iovstack[UIO_FASTIOV];
|
||||
struct iovec *iov = iovstack;
|
||||
|
|
@ -1884,8 +1920,8 @@ asmlinkage long sys_recvmsg(int fd, struct msghdr __user *msg, unsigned int flag
|
|||
if (MSG_CMSG_COMPAT & flags) {
|
||||
if (get_compat_msghdr(&msg_sys, msg_compat))
|
||||
return -EFAULT;
|
||||
} else
|
||||
if (copy_from_user(&msg_sys,msg,sizeof(struct msghdr)))
|
||||
}
|
||||
else if (copy_from_user(&msg_sys, msg, sizeof(struct msghdr)))
|
||||
return -EFAULT;
|
||||
|
||||
sock = sockfd_lookup_light(fd, &err, &fput_needed);
|
||||
|
|
@ -1933,7 +1969,8 @@ asmlinkage long sys_recvmsg(int fd, struct msghdr __user *msg, unsigned int flag
|
|||
len = err;
|
||||
|
||||
if (uaddr != NULL) {
|
||||
err = move_addr_to_user(addr, msg_sys.msg_namelen, uaddr, uaddr_len);
|
||||
err = move_addr_to_user(addr, msg_sys.msg_namelen, uaddr,
|
||||
uaddr_len);
|
||||
if (err < 0)
|
||||
goto out_freeiov;
|
||||
}
|
||||
|
|
@ -1964,9 +2001,12 @@ out:
|
|||
|
||||
/* Argument list sizes for sys_socketcall */
|
||||
#define AL(x) ((x) * sizeof(unsigned long))
|
||||
static unsigned char nargs[18]={AL(0),AL(3),AL(3),AL(3),AL(2),AL(3),
|
||||
static const unsigned char nargs[18]={
|
||||
AL(0),AL(3),AL(3),AL(3),AL(2),AL(3),
|
||||
AL(3),AL(3),AL(4),AL(4),AL(4),AL(6),
|
||||
AL(6),AL(2),AL(5),AL(5),AL(3),AL(3)};
|
||||
AL(6),AL(2),AL(5),AL(5),AL(3),AL(3)
|
||||
};
|
||||
|
||||
#undef AL
|
||||
|
||||
/*
|
||||
|
|
@ -1997,8 +2037,7 @@ asmlinkage long sys_socketcall(int call, unsigned long __user *args)
|
|||
a0 = a[0];
|
||||
a1 = a[1];
|
||||
|
||||
switch(call)
|
||||
{
|
||||
switch (call) {
|
||||
case SYS_SOCKET:
|
||||
err = sys_socket(a0, a1, a[2]);
|
||||
break;
|
||||
|
|
@ -2012,13 +2051,19 @@ asmlinkage long sys_socketcall(int call, unsigned long __user *args)
|
|||
err = sys_listen(a0, a1);
|
||||
break;
|
||||
case SYS_ACCEPT:
|
||||
err = sys_accept(a0,(struct sockaddr __user *)a1, (int __user *)a[2]);
|
||||
err =
|
||||
sys_accept(a0, (struct sockaddr __user *)a1,
|
||||
(int __user *)a[2]);
|
||||
break;
|
||||
case SYS_GETSOCKNAME:
|
||||
err = sys_getsockname(a0,(struct sockaddr __user *)a1, (int __user *)a[2]);
|
||||
err =
|
||||
sys_getsockname(a0, (struct sockaddr __user *)a1,
|
||||
(int __user *)a[2]);
|
||||
break;
|
||||
case SYS_GETPEERNAME:
|
||||
err = sys_getpeername(a0, (struct sockaddr __user *)a1, (int __user *)a[2]);
|
||||
err =
|
||||
sys_getpeername(a0, (struct sockaddr __user *)a1,
|
||||
(int __user *)a[2]);
|
||||
break;
|
||||
case SYS_SOCKETPAIR:
|
||||
err = sys_socketpair(a0, a1, a[2], (int __user *)a[3]);
|
||||
|
|
@ -2035,7 +2080,8 @@ asmlinkage long sys_socketcall(int call, unsigned long __user *args)
|
|||
break;
|
||||
case SYS_RECVFROM:
|
||||
err = sys_recvfrom(a0, (void __user *)a1, a[2], a[3],
|
||||
(struct sockaddr __user *)a[4], (int __user *)a[5]);
|
||||
(struct sockaddr __user *)a[4],
|
||||
(int __user *)a[5]);
|
||||
break;
|
||||
case SYS_SHUTDOWN:
|
||||
err = sys_shutdown(a0, a1);
|
||||
|
|
@ -2044,7 +2090,9 @@ asmlinkage long sys_socketcall(int call, unsigned long __user *args)
|
|||
err = sys_setsockopt(a0, a1, a[2], (char __user *)a[3], a[4]);
|
||||
break;
|
||||
case SYS_GETSOCKOPT:
|
||||
err = sys_getsockopt(a0, a1, a[2], (char __user *)a[3], (int __user *)a[4]);
|
||||
err =
|
||||
sys_getsockopt(a0, a1, a[2], (char __user *)a[3],
|
||||
(int __user *)a[4]);
|
||||
break;
|
||||
case SYS_SENDMSG:
|
||||
err = sys_sendmsg(a0, (struct msghdr __user *)a1, a[2]);
|
||||
|
|
@ -2072,7 +2120,8 @@ int sock_register(struct net_proto_family *ops)
|
|||
int err;
|
||||
|
||||
if (ops->family >= NPROTO) {
|
||||
printk(KERN_CRIT "protocol %d >= NPROTO(%d)\n", ops->family, NPROTO);
|
||||
printk(KERN_CRIT "protocol %d >= NPROTO(%d)\n", ops->family,
|
||||
NPROTO);
|
||||
return -ENOBUFS;
|
||||
}
|
||||
net_family_write_lock();
|
||||
|
|
@ -2082,8 +2131,7 @@ int sock_register(struct net_proto_family *ops)
|
|||
err = 0;
|
||||
}
|
||||
net_family_write_unlock();
|
||||
printk(KERN_INFO "NET: Registered protocol family %d\n",
|
||||
ops->family);
|
||||
printk(KERN_INFO "NET: Registered protocol family %d\n", ops->family);
|
||||
return err;
|
||||
}
|
||||
|
||||
|
|
@ -2101,8 +2149,7 @@ int sock_unregister(int family)
|
|||
net_family_write_lock();
|
||||
net_families[family] = NULL;
|
||||
net_family_write_unlock();
|
||||
printk(KERN_INFO "NET: Unregistered protocol family %d\n",
|
||||
family);
|
||||
printk(KERN_INFO "NET: Unregistered protocol family %d\n", family);
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue