Skip to content

L
linux-davinci
Commit 89bddce5 authored by Stephen Hemminger's avatar Stephen Hemminger Committed by David S. Miller
Browse files
Options

[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: default avatarStephen Hemminger <shemminger@osdl.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 53fad3cb
Hide whitespace changes
Inline Side-by-side
Showing with 388 additions and 341 deletions
net/socket.c
View file @ 89bddce5
...@@ -42,7 +42,7 @@ ...@@ -42,7 +42,7 @@
* Andi Kleen : Some small cleanups, optimizations, * Andi Kleen : Some small cleanups, optimizations,
* and fixed a copy_from_user() bug. * and fixed a copy_from_user() bug.
* Tigran Aivazian : sys_send(args) calls sys_sendto(args, NULL, 0) * Tigran Aivazian : sys_send(args) calls sys_sendto(args, NULL, 0)
* Tigran Aivazian : Made listen(2) backlog sanity checks * Tigran Aivazian : Made listen(2) backlog sanity checks
* protocol-independent * protocol-independent
* *
* *
...@@ -53,7 +53,7 @@ ...@@ -53,7 +53,7 @@
* *
* *
* This module is effectively the top level interface to the BSD socket * This module is effectively the top level interface to the BSD socket
* paradigm. * paradigm.
* *
* Based upon Swansea University Computer Society NET3.039 * Based upon Swansea University Computer Society NET3.039
*/ */
...@@ -96,25 +96,24 @@ ...@@ -96,25 +96,24 @@
static int sock_no_open(struct inode *irrelevant, struct file *dontcare); static int sock_no_open(struct inode *irrelevant, struct file *dontcare);
static ssize_t sock_aio_read(struct kiocb *iocb, char __user *buf, static ssize_t sock_aio_read(struct kiocb *iocb, char __user *buf,
size_t size, loff_t pos); size_t size, loff_t pos);
static ssize_t sock_aio_write(struct kiocb *iocb, const char __user *buf, static ssize_t sock_aio_write(struct kiocb *iocb, const char __user *buf,
size_t size, loff_t pos); size_t size, loff_t pos);
static int sock_mmap(struct file *file, struct vm_area_struct * vma); static int sock_mmap(struct file *file, struct vm_area_struct *vma);
static int sock_close(struct inode *inode, struct file *file); static int sock_close(struct inode *inode, struct file *file);
static unsigned int sock_poll(struct file *file, static unsigned int sock_poll(struct file *file,
struct poll_table_struct *wait); struct poll_table_struct *wait);
static long sock_ioctl(struct file *file, static long sock_ioctl(struct file *file, unsigned int cmd, unsigned long arg);
unsigned int cmd, unsigned long arg);
#ifdef CONFIG_COMPAT #ifdef CONFIG_COMPAT
static long compat_sock_ioctl(struct file *file, static long compat_sock_ioctl(struct file *file,
unsigned int cmd, unsigned long arg); unsigned int cmd, unsigned long arg);
#endif #endif
static int sock_fasync(int fd, struct file *filp, int on); static int sock_fasync(int fd, struct file *filp, int on);
static ssize_t sock_readv(struct file *file, const struct iovec *vector, static ssize_t sock_readv(struct file *file, const struct iovec *vector,
unsigned long count, loff_t *ppos); unsigned long count, loff_t *ppos);
static ssize_t sock_writev(struct file *file, const struct iovec *vector, static ssize_t sock_writev(struct file *file, const struct iovec *vector,
unsigned long count, loff_t *ppos); unsigned long count, loff_t *ppos);
static ssize_t sock_sendpage(struct file *file, struct page *page, static ssize_t sock_sendpage(struct file *file, struct page *page,
int offset, size_t size, loff_t *ppos, int more); int offset, size_t size, loff_t *ppos, int more);
...@@ -193,7 +192,6 @@ static __inline__ void net_family_read_unlock(void) ...@@ -193,7 +192,6 @@ static __inline__ void net_family_read_unlock(void)
#define net_family_read_unlock() do { } while(0) #define net_family_read_unlock() do { } while(0)
#endif #endif
/* /*
* Statistics counters of the socket lists * Statistics counters of the socket lists
*/ */
...@@ -201,19 +199,20 @@ static __inline__ void net_family_read_unlock(void) ...@@ -201,19 +199,20 @@ static __inline__ void net_family_read_unlock(void)
static DEFINE_PER_CPU(int, sockets_in_use) = 0; static DEFINE_PER_CPU(int, sockets_in_use) = 0;
/* /*
* Support routines. Move socket addresses back and forth across the kernel/user * Support routines.
* divide and look after the messy bits. * Move socket addresses back and forth across the kernel/user
* divide and look after the messy bits.
*/ */
#define MAX_SOCK_ADDR 128 /* 108 for Unix domain - #define MAX_SOCK_ADDR 128 /* 108 for Unix domain -
16 for IP, 16 for IPX, 16 for IP, 16 for IPX,
24 for IPv6, 24 for IPv6,
about 80 for AX.25 about 80 for AX.25
must be at least one bigger than must be at least one bigger than
the AF_UNIX size (see net/unix/af_unix.c the AF_UNIX size (see net/unix/af_unix.c
:unix_mkname()). :unix_mkname()).
*/ */
/** /**
* move_addr_to_kernel - copy a socket address into kernel space * move_addr_to_kernel - copy a socket address into kernel space
* @uaddr: Address in user space * @uaddr: Address in user space
...@@ -227,11 +226,11 @@ static DEFINE_PER_CPU(int, sockets_in_use) = 0; ...@@ -227,11 +226,11 @@ static DEFINE_PER_CPU(int, sockets_in_use) = 0;
int move_addr_to_kernel(void __user *uaddr, int ulen, void *kaddr) int move_addr_to_kernel(void __user *uaddr, int ulen, void *kaddr)
{ {
if(ulen<0||ulen>MAX_SOCK_ADDR) if (ulen < 0 || ulen > MAX_SOCK_ADDR)
return -EINVAL; return -EINVAL;
if(ulen==0) if (ulen == 0)
return 0; return 0;
if(copy_from_user(kaddr,uaddr,ulen)) if (copy_from_user(kaddr, uaddr, ulen))
return -EFAULT; return -EFAULT;
return audit_sockaddr(ulen, kaddr); return audit_sockaddr(ulen, kaddr);
} }
...@@ -252,44 +251,46 @@ int move_addr_to_kernel(void __user *uaddr, int ulen, void *kaddr) ...@@ -252,44 +251,46 @@ int move_addr_to_kernel(void __user *uaddr, int ulen, void *kaddr)
* length of the data is written over the length limit the user * length of the data is written over the length limit the user
* specified. Zero is returned for a success. * 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 err;
int len; int len;
if((err=get_user(len, ulen))) err = get_user(len, ulen);
if (err)
return err; return err;
if(len>klen) if (len > klen)
len=klen; len = klen;
if(len<0 || len> MAX_SOCK_ADDR) if (len < 0 || len > MAX_SOCK_ADDR)
return -EINVAL; return -EINVAL;
if(len) if (len) {
{
if (audit_sockaddr(klen, kaddr)) if (audit_sockaddr(klen, kaddr))
return -ENOMEM; return -ENOMEM;
if(copy_to_user(uaddr,kaddr,len)) if (copy_to_user(uaddr, kaddr, len))
return -EFAULT; return -EFAULT;
} }
/* /*
* "fromlen shall refer to the value before truncation.." * "fromlen shall refer to the value before truncation.."
* 1003.1g * 1003.1g
*/ */
return __put_user(klen, ulen); return __put_user(klen, ulen);
} }
#define SOCKFS_MAGIC 0x534F434B #define SOCKFS_MAGIC 0x534F434B
static kmem_cache_t * sock_inode_cachep __read_mostly; static kmem_cache_t *sock_inode_cachep __read_mostly;
static struct inode *sock_alloc_inode(struct super_block *sb) static struct inode *sock_alloc_inode(struct super_block *sb)
{ {
struct socket_alloc *ei; 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) if (!ei)
return NULL; return NULL;
init_waitqueue_head(&ei->socket.wait); init_waitqueue_head(&ei->socket.wait);
ei->socket.fasync_list = NULL; ei->socket.fasync_list = NULL;
ei->socket.state = SS_UNCONNECTED; ei->socket.state = SS_UNCONNECTED;
ei->socket.flags = 0; ei->socket.flags = 0;
...@@ -307,22 +308,25 @@ static void sock_destroy_inode(struct inode *inode) ...@@ -307,22 +308,25 @@ static void sock_destroy_inode(struct inode *inode)
container_of(inode, struct socket_alloc, vfs_inode)); container_of(inode, struct socket_alloc, vfs_inode));
} }
static void init_once(void * foo, kmem_cache_t * cachep, unsigned long flags) static void init_once(void *foo, kmem_cache_t *cachep, unsigned long flags)
{ {
struct socket_alloc *ei = (struct socket_alloc *) foo; struct socket_alloc *ei = (struct socket_alloc *)foo;
if ((flags & (SLAB_CTOR_VERIFY|SLAB_CTOR_CONSTRUCTOR)) == if ((flags & (SLAB_CTOR_VERIFY|SLAB_CTOR_CONSTRUCTOR))
SLAB_CTOR_CONSTRUCTOR) == SLAB_CTOR_CONSTRUCTOR)
inode_init_once(&ei->vfs_inode); inode_init_once(&ei->vfs_inode);
} }
static int init_inodecache(void) static int init_inodecache(void)
{ {
sock_inode_cachep = kmem_cache_create("sock_inode_cache", sock_inode_cachep = kmem_cache_create("sock_inode_cache",
sizeof(struct socket_alloc), sizeof(struct socket_alloc),
0, (SLAB_HWCACHE_ALIGN|SLAB_RECLAIM_ACCOUNT| 0,
SLAB_MEM_SPREAD), (SLAB_HWCACHE_ALIGN |
init_once, NULL); SLAB_RECLAIM_ACCOUNT |
SLAB_MEM_SPREAD),
init_once,
NULL);
if (sock_inode_cachep == NULL) if (sock_inode_cachep == NULL)
return -ENOMEM; return -ENOMEM;
return 0; return 0;
...@@ -335,7 +339,8 @@ static struct super_operations sockfs_ops = { ...@@ -335,7 +339,8 @@ static struct super_operations sockfs_ops = {
}; };
static int sockfs_get_sb(struct file_system_type *fs_type, 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, return get_sb_pseudo(fs_type, "socket:", &sockfs_ops, SOCKFS_MAGIC,
mnt); mnt);
...@@ -348,12 +353,13 @@ static struct file_system_type sock_fs_type = { ...@@ -348,12 +353,13 @@ static struct file_system_type sock_fs_type = {
.get_sb = sockfs_get_sb, .get_sb = sockfs_get_sb,
.kill_sb = kill_anon_super, .kill_sb = kill_anon_super,
}; };
static int sockfs_delete_dentry(struct dentry *dentry) static int sockfs_delete_dentry(struct dentry *dentry)
{ {
return 1; return 1;
} }
static struct dentry_operations sockfs_dentry_operations = { static struct dentry_operations sockfs_dentry_operations = {
.d_delete = sockfs_delete_dentry, .d_delete = sockfs_delete_dentry,
}; };
/* /*
...@@ -477,10 +483,12 @@ struct socket *sockfd_lookup(int fd, int *err) ...@@ -477,10 +483,12 @@ struct socket *sockfd_lookup(int fd, int *err)
struct file *file; struct file *file;
struct socket *sock; struct socket *sock;
if (!(file = fget(fd))) { file = fget(fd);
if (!file) {
*err = -EBADF; *err = -EBADF;
return NULL; return NULL;
} }
sock = sock_from_file(file, err); sock = sock_from_file(file, err);
if (!sock) if (!sock)
fput(file); fput(file);
...@@ -505,7 +513,7 @@ static struct socket *sockfd_lookup_light(int fd, int *err, int *fput_needed) ...@@ -505,7 +513,7 @@ static struct socket *sockfd_lookup_light(int fd, int *err, int *fput_needed)
/** /**
* sock_alloc - allocate a socket * sock_alloc - allocate a socket
* *
* Allocate a new inode and socket object. The two are bound together * Allocate a new inode and socket object. The two are bound together
* and initialised. The socket is then returned. If we are out of inodes * and initialised. The socket is then returned. If we are out of inodes
* NULL is returned. * NULL is returned.
...@@ -513,8 +521,8 @@ static struct socket *sockfd_lookup_light(int fd, int *err, int *fput_needed) ...@@ -513,8 +521,8 @@ static struct socket *sockfd_lookup_light(int fd, int *err, int *fput_needed)
static struct socket *sock_alloc(void) static struct socket *sock_alloc(void)
{ {
struct inode * inode; struct inode *inode;
struct socket * sock; struct socket *sock;
inode = new_inode(sock_mnt->mnt_sb); inode = new_inode(sock_mnt->mnt_sb);
if (!inode) if (!inode)
...@@ -522,7 +530,7 @@ static struct socket *sock_alloc(void) ...@@ -522,7 +530,7 @@ static struct socket *sock_alloc(void)
sock = SOCKET_I(inode); sock = SOCKET_I(inode);
inode->i_mode = S_IFSOCK|S_IRWXUGO; inode->i_mode = S_IFSOCK | S_IRWXUGO;
inode->i_uid = current->fsuid; inode->i_uid = current->fsuid;
inode->i_gid = current->fsgid; inode->i_gid = current->fsgid;
...@@ -536,7 +544,7 @@ static struct socket *sock_alloc(void) ...@@ -536,7 +544,7 @@ static struct socket *sock_alloc(void)
* a back door. Remember to keep it shut otherwise you'll let the * a back door. Remember to keep it shut otherwise you'll let the
* creepy crawlies in. * creepy crawlies in.
*/ */
static int sock_no_open(struct inode *irrelevant, struct file *dontcare) static int sock_no_open(struct inode *irrelevant, struct file *dontcare)
{ {
return -ENXIO; return -ENXIO;
...@@ -553,9 +561,9 @@ const struct file_operations bad_sock_fops = { ...@@ -553,9 +561,9 @@ const struct file_operations bad_sock_fops = {
* *
* The socket is released from the protocol stack if it has a release * The socket is released from the protocol stack if it has a release
* callback, and the inode is then released if the socket is bound to * callback, and the inode is then released if the socket is bound to
* an inode not a file. * an inode not a file.
*/ */
void sock_release(struct socket *sock) void sock_release(struct socket *sock)
{ {
if (sock->ops) { if (sock->ops) {
...@@ -575,10 +583,10 @@ void sock_release(struct socket *sock) ...@@ -575,10 +583,10 @@ void sock_release(struct socket *sock)
iput(SOCK_INODE(sock)); iput(SOCK_INODE(sock));
return; return;
} }
sock->file=NULL; sock->file = NULL;
} }
static inline int __sock_sendmsg(struct kiocb *iocb, struct socket *sock, static inline int __sock_sendmsg(struct kiocb *iocb, struct socket *sock,
struct msghdr *msg, size_t size) struct msghdr *msg, size_t size)
{ {
struct sock_iocb *si = kiocb_to_siocb(iocb); struct sock_iocb *si = kiocb_to_siocb(iocb);
...@@ -621,14 +629,14 @@ int kernel_sendmsg(struct socket *sock, struct msghdr *msg, ...@@ -621,14 +629,14 @@ int kernel_sendmsg(struct socket *sock, struct msghdr *msg,
* the following is safe, since for compiler definitions of kvec and * the following is safe, since for compiler definitions of kvec and
* iovec are identical, yielding the same in-core layout and alignment * 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; msg->msg_iovlen = num;
result = sock_sendmsg(sock, msg, size); result = sock_sendmsg(sock, msg, size);
set_fs(oldfs); set_fs(oldfs);
return result; return result;
} }
static inline int __sock_recvmsg(struct kiocb *iocb, struct socket *sock, static inline int __sock_recvmsg(struct kiocb *iocb, struct socket *sock,
struct msghdr *msg, size_t size, int flags) struct msghdr *msg, size_t size, int flags)
{ {
int err; int err;
...@@ -647,14 +655,14 @@ static inline int __sock_recvmsg(struct kiocb *iocb, struct socket *sock, ...@@ -647,14 +655,14 @@ static inline int __sock_recvmsg(struct kiocb *iocb, struct socket *sock,
return sock->ops->recvmsg(iocb, sock, msg, size, flags); return sock->ops->recvmsg(iocb, sock, msg, size, flags);
} }
int sock_recvmsg(struct socket *sock, struct msghdr *msg, int sock_recvmsg(struct socket *sock, struct msghdr *msg,
size_t size, int flags) size_t size, int flags)
{ {
struct kiocb iocb; struct kiocb iocb;
struct sock_iocb siocb; struct sock_iocb siocb;
int ret; int ret;
init_sync_kiocb(&iocb, NULL); init_sync_kiocb(&iocb, NULL);
iocb.private = &siocb; iocb.private = &siocb;
ret = __sock_recvmsg(&iocb, sock, msg, size, flags); ret = __sock_recvmsg(&iocb, sock, msg, size, flags);
if (-EIOCBQUEUED == ret) if (-EIOCBQUEUED == ret)
...@@ -662,9 +670,8 @@ int sock_recvmsg(struct socket *sock, struct msghdr *msg, ...@@ -662,9 +670,8 @@ int sock_recvmsg(struct socket *sock, struct msghdr *msg,
return ret; return ret;
} }
int kernel_recvmsg(struct socket *sock, struct msghdr *msg, int kernel_recvmsg(struct socket *sock, struct msghdr *msg,
struct kvec *vec, size_t num, struct kvec *vec, size_t num, size_t size, int flags)
size_t size, int flags)
{ {
mm_segment_t oldfs = get_fs(); mm_segment_t oldfs = get_fs();
int result; int result;
...@@ -674,8 +681,7 @@ int kernel_recvmsg(struct socket *sock, struct msghdr *msg, ...@@ -674,8 +681,7 @@ int kernel_recvmsg(struct socket *sock, struct msghdr *msg,
* the following is safe, since for compiler definitions of kvec and * the following is safe, since for compiler definitions of kvec and
* iovec are identical, yielding the same in-core layout and alignment * 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;
msg->msg_iovlen = num;
result = sock_recvmsg(sock, msg, size, flags); result = sock_recvmsg(sock, msg, size, flags);
set_fs(oldfs); set_fs(oldfs);
return result; return result;
...@@ -702,7 +708,8 @@ static ssize_t sock_sendpage(struct file *file, struct page *page, ...@@ -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, 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)) { if (!is_sync_kiocb(iocb)) {
siocb = kmalloc(sizeof(*siocb), GFP_KERNEL); siocb = kmalloc(sizeof(*siocb), GFP_KERNEL);
...@@ -720,20 +727,21 @@ static struct sock_iocb *alloc_sock_iocb(struct kiocb *iocb, ...@@ -720,20 +727,21 @@ static struct sock_iocb *alloc_sock_iocb(struct kiocb *iocb,
} }
static ssize_t do_sock_read(struct msghdr *msg, 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; struct socket *sock = file->private_data;
size_t size = 0; size_t size = 0;
int i; int i;
for (i = 0 ; i < nr_segs ; i++) for (i = 0; i < nr_segs; i++)
size += iov[i].iov_len; size += iov[i].iov_len;
msg->msg_name = NULL; msg->msg_name = NULL;
msg->msg_namelen = 0; msg->msg_namelen = 0;
msg->msg_control = NULL; msg->msg_control = NULL;
msg->msg_controllen = 0; msg->msg_controllen = 0;
msg->msg_iov = (struct iovec *) iov; msg->msg_iov = (struct iovec *)iov;
msg->msg_iovlen = nr_segs; msg->msg_iovlen = nr_segs;
msg->msg_flags = (file->f_flags & O_NONBLOCK) ? MSG_DONTWAIT : 0; msg->msg_flags = (file->f_flags & O_NONBLOCK) ? MSG_DONTWAIT : 0;
...@@ -748,7 +756,7 @@ static ssize_t sock_readv(struct file *file, const struct iovec *iov, ...@@ -748,7 +756,7 @@ static ssize_t sock_readv(struct file *file, const struct iovec *iov,
struct msghdr msg; struct msghdr msg;
int ret; int ret;
init_sync_kiocb(&iocb, NULL); init_sync_kiocb(&iocb, NULL);
iocb.private = &siocb; iocb.private = &siocb;
ret = do_sock_read(&msg, &iocb, file, (struct iovec *)iov, nr_segs); ret = do_sock_read(&msg, &iocb, file, (struct iovec *)iov, nr_segs);
...@@ -758,7 +766,7 @@ static ssize_t sock_readv(struct file *file, const struct iovec *iov, ...@@ -758,7 +766,7 @@ static ssize_t sock_readv(struct file *file, const struct iovec *iov,
} }
static ssize_t sock_aio_read(struct kiocb *iocb, char __user *ubuf, static ssize_t sock_aio_read(struct kiocb *iocb, char __user *ubuf,
size_t count, loff_t pos) size_t count, loff_t pos)
{ {
struct sock_iocb siocb, *x; struct sock_iocb siocb, *x;
...@@ -771,24 +779,25 @@ static ssize_t sock_aio_read(struct kiocb *iocb, char __user *ubuf, ...@@ -771,24 +779,25 @@ static ssize_t sock_aio_read(struct kiocb *iocb, char __user *ubuf,
if (!x) if (!x)
return -ENOMEM; return -ENOMEM;
return do_sock_read(&x->async_msg, iocb, iocb->ki_filp, return do_sock_read(&x->async_msg, iocb, iocb->ki_filp,
&x->async_iov, 1); &x->async_iov, 1);
} }
static ssize_t do_sock_write(struct msghdr *msg, struct kiocb *iocb, 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; struct socket *sock = file->private_data;
size_t size = 0; size_t size = 0;
int i; int i;
for (i = 0 ; i < nr_segs ; i++) for (i = 0; i < nr_segs; i++)
size += iov[i].iov_len; size += iov[i].iov_len;
msg->msg_name = NULL; msg->msg_name = NULL;
msg->msg_namelen = 0; msg->msg_namelen = 0;
msg->msg_control = NULL; msg->msg_control = NULL;
msg->msg_controllen = 0; msg->msg_controllen = 0;
msg->msg_iov = (struct iovec *) iov; msg->msg_iov = (struct iovec *)iov;
msg->msg_iovlen = nr_segs; msg->msg_iovlen = nr_segs;
msg->msg_flags = (file->f_flags & O_NONBLOCK) ? MSG_DONTWAIT : 0; msg->msg_flags = (file->f_flags & O_NONBLOCK) ? MSG_DONTWAIT : 0;
if (sock->type == SOCK_SEQPACKET) if (sock->type == SOCK_SEQPACKET)
...@@ -815,7 +824,7 @@ static ssize_t sock_writev(struct file *file, const struct iovec *iov, ...@@ -815,7 +824,7 @@ static ssize_t sock_writev(struct file *file, const struct iovec *iov,
} }
static ssize_t sock_aio_write(struct kiocb *iocb, const char __user *ubuf, static ssize_t sock_aio_write(struct kiocb *iocb, const char __user *ubuf,
size_t count, loff_t pos) size_t count, loff_t pos)
{ {
struct sock_iocb siocb, *x; struct sock_iocb siocb, *x;
...@@ -829,46 +838,48 @@ static ssize_t sock_aio_write(struct kiocb *iocb, const char __user *ubuf, ...@@ -829,46 +838,48 @@ static ssize_t sock_aio_write(struct kiocb *iocb, const char __user *ubuf,
return -ENOMEM; return -ENOMEM;
return do_sock_write(&x->async_msg, iocb, iocb->ki_filp, return do_sock_write(&x->async_msg, iocb, iocb->ki_filp,
&x->async_iov, 1); &x->async_iov, 1);
} }
/* /*
* Atomic setting of ioctl hooks to avoid race * Atomic setting of ioctl hooks to avoid race
* with module unload. * with module unload.
*/ */
static DEFINE_MUTEX(br_ioctl_mutex); static DEFINE_MUTEX(br_ioctl_mutex);
static int (*br_ioctl_hook)(unsigned int cmd, void __user *arg) = NULL; static int (*br_ioctl_hook) (unsigned int cmd, void __user *arg) = NULL;
void brioctl_set(int (*hook)(unsigned int, void __user *)) void brioctl_set(int (*hook) (unsigned int, void __user *))
{ {
mutex_lock(&br_ioctl_mutex); mutex_lock(&br_ioctl_mutex);
br_ioctl_hook = hook; br_ioctl_hook = hook;
mutex_unlock(&br_ioctl_mutex); mutex_unlock(&br_ioctl_mutex);
} }
EXPORT_SYMBOL(brioctl_set); EXPORT_SYMBOL(brioctl_set);
static DEFINE_MUTEX(vlan_ioctl_mutex); static DEFINE_MUTEX(vlan_ioctl_mutex);
static int (*vlan_ioctl_hook)(void __user *arg); static int (*vlan_ioctl_hook) (void __user *arg);
void vlan_ioctl_set(int (*hook)(void __user *)) void vlan_ioctl_set(int (*hook) (void __user *))
{ {
mutex_lock(&vlan_ioctl_mutex); mutex_lock(&vlan_ioctl_mutex);
vlan_ioctl_hook = hook; vlan_ioctl_hook = hook;
mutex_unlock(&vlan_ioctl_mutex); mutex_unlock(&vlan_ioctl_mutex);
} }
EXPORT_SYMBOL(vlan_ioctl_set); EXPORT_SYMBOL(vlan_ioctl_set);
static DEFINE_MUTEX(dlci_ioctl_mutex); static DEFINE_MUTEX(dlci_ioctl_mutex);
static int (*dlci_ioctl_hook)(unsigned int, void __user *); static int (*dlci_ioctl_hook) (unsigned int, void __user *);
void dlci_ioctl_set(int (*hook)(unsigned int, void __user *)) void dlci_ioctl_set(int (*hook) (unsigned int, void __user *))
{ {
mutex_lock(&dlci_ioctl_mutex); mutex_lock(&dlci_ioctl_mutex);
dlci_ioctl_hook = hook; dlci_ioctl_hook = hook;
mutex_unlock(&dlci_ioctl_mutex); mutex_unlock(&dlci_ioctl_mutex);
} }
EXPORT_SYMBOL(dlci_ioctl_set); EXPORT_SYMBOL(dlci_ioctl_set);
/* /*
...@@ -890,8 +901,8 @@ static long sock_ioctl(struct file *file, unsigned cmd, unsigned long arg) ...@@ -890,8 +901,8 @@ static long sock_ioctl(struct file *file, unsigned cmd, unsigned long arg)
if (cmd >= SIOCIWFIRST && cmd <= SIOCIWLAST) { if (cmd >= SIOCIWFIRST && cmd <= SIOCIWLAST) {
err = dev_ioctl(cmd, argp); err = dev_ioctl(cmd, argp);
} else } else
#endif /* CONFIG_WIRELESS_EXT */ #endif /* CONFIG_WIRELESS_EXT */
switch (cmd) { switch (cmd) {
case FIOSETOWN: case FIOSETOWN:
case SIOCSPGRP: case SIOCSPGRP:
err = -EFAULT; err = -EFAULT;
...@@ -901,7 +912,8 @@ static long sock_ioctl(struct file *file, unsigned cmd, unsigned long arg) ...@@ -901,7 +912,8 @@ static long sock_ioctl(struct file *file, unsigned cmd, unsigned long arg)
break; break;
case FIOGETOWN: case FIOGETOWN:
case SIOCGPGRP: 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; break;
case SIOCGIFBR: case SIOCGIFBR:
case SIOCSIFBR: case SIOCSIFBR:
...@@ -912,7 +924,7 @@ static long sock_ioctl(struct file *file, unsigned cmd, unsigned long arg) ...@@ -912,7 +924,7 @@ static long sock_ioctl(struct file *file, unsigned cmd, unsigned long arg)
request_module("bridge"); request_module("bridge");
mutex_lock(&br_ioctl_mutex); mutex_lock(&br_ioctl_mutex);
if (br_ioctl_hook) if (br_ioctl_hook)
err = br_ioctl_hook(cmd, argp); err = br_ioctl_hook(cmd, argp);
mutex_unlock(&br_ioctl_mutex); mutex_unlock(&br_ioctl_mutex);
break; break;
...@@ -929,7 +941,7 @@ static long sock_ioctl(struct file *file, unsigned cmd, unsigned long arg) ...@@ -929,7 +941,7 @@ static long sock_ioctl(struct file *file, unsigned cmd, unsigned long arg)
break; break;
case SIOCGIFDIVERT: case SIOCGIFDIVERT:
case SIOCSIFDIVERT: case SIOCSIFDIVERT:
/* Convert this to call through a hook */ /* Convert this to call through a hook */
err = divert_ioctl(cmd, argp); err = divert_ioctl(cmd, argp);
break; break;
case SIOCADDDLCI: case SIOCADDDLCI:
...@@ -954,7 +966,7 @@ static long sock_ioctl(struct file *file, unsigned cmd, unsigned long arg) ...@@ -954,7 +966,7 @@ static long sock_ioctl(struct file *file, unsigned cmd, unsigned long arg)
if (err == -ENOIOCTLCMD) if (err == -ENOIOCTLCMD)
err = dev_ioctl(cmd, argp); err = dev_ioctl(cmd, argp);
break; break;
} }
return err; return err;
} }
...@@ -962,7 +974,7 @@ int sock_create_lite(int family, int type, int protocol, struct socket **res) ...@@ -962,7 +974,7 @@ int sock_create_lite(int family, int type, int protocol, struct socket **res)
{ {
int err; int err;
struct socket *sock = NULL; struct socket *sock = NULL;
err = security_socket_create(family, type, protocol, 1); err = security_socket_create(family, type, protocol, 1);
if (err) if (err)
goto out; goto out;
...@@ -988,18 +1000,18 @@ out_release: ...@@ -988,18 +1000,18 @@ out_release:
} }
/* No kernel lock held - perfect */ /* No kernel lock held - perfect */
static unsigned int sock_poll(struct file *file, poll_table * wait) static unsigned int sock_poll(struct file *file, poll_table *wait)
{ {
struct socket *sock; struct socket *sock;
/* /*
* We can't return errors to poll, so it's either yes or no. * We can't return errors to poll, so it's either yes or no.
*/ */
sock = file->private_data; sock = file->private_data;
return sock->ops->poll(file, sock, wait); return sock->ops->poll(file, sock, wait);
} }
static int sock_mmap(struct file * file, struct vm_area_struct * vma) static int sock_mmap(struct file *file, struct vm_area_struct *vma)
{ {
struct socket *sock = file->private_data; struct socket *sock = file->private_data;
...@@ -1009,12 +1021,11 @@ static int sock_mmap(struct file * file, struct vm_area_struct * vma) ...@@ -1009,12 +1021,11 @@ static int sock_mmap(struct file * file, struct vm_area_struct * vma)
static int sock_close(struct inode *inode, struct file *filp) static int sock_close(struct inode *inode, struct file *filp)
{ {
/* /*
* It was possible the inode is NULL we were * It was possible the inode is NULL we were
* closing an unfinished socket. * closing an unfinished socket.
*/ */
if (!inode) if (!inode) {
{
printk(KERN_DEBUG "sock_close: NULL inode\n"); printk(KERN_DEBUG "sock_close: NULL inode\n");
return 0; return 0;
} }
...@@ -1040,57 +1051,52 @@ static int sock_close(struct inode *inode, struct file *filp) ...@@ -1040,57 +1051,52 @@ static int sock_close(struct inode *inode, struct file *filp)
static int sock_fasync(int fd, struct file *filp, int on) static int sock_fasync(int fd, struct file *filp, int on)
{ {
struct fasync_struct *fa, *fna=NULL, **prev; struct fasync_struct *fa, *fna = NULL, **prev;
struct socket *sock; struct socket *sock;
struct sock *sk; struct sock *sk;
if (on) if (on) {
{
fna = kmalloc(sizeof(struct fasync_struct), GFP_KERNEL); fna = kmalloc(sizeof(struct fasync_struct), GFP_KERNEL);
if(fna==NULL) if (fna == NULL)
return -ENOMEM; return -ENOMEM;
} }
sock = filp->private_data; sock = filp->private_data;
if ((sk=sock->sk) == NULL) { sk = sock->sk;
if (sk == NULL) {
kfree(fna); kfree(fna);
return -EINVAL; return -EINVAL;
} }
lock_sock(sk); lock_sock(sk);
prev=&(sock->fasync_list); prev = &(sock->fasync_list);
for (fa=*prev; fa!=NULL; prev=&fa->fa_next,fa=*prev) for (fa = *prev; fa != NULL; prev = &fa->fa_next, fa = *prev)
if (fa->fa_file==filp) if (fa->fa_file == filp)
break; break;
if(on) if (on) {
{ if (fa != NULL) {
if(fa!=NULL)
{
write_lock_bh(&sk->sk_callback_lock); write_lock_bh(&sk->sk_callback_lock);
fa->fa_fd=fd; fa->fa_fd = fd;
write_unlock_bh(&sk->sk_callback_lock); write_unlock_bh(&sk->sk_callback_lock);
kfree(fna); kfree(fna);
goto out; goto out;
} }
fna->fa_file=filp; fna->fa_file = filp;
fna->fa_fd=fd; fna->fa_fd = fd;
fna->magic=FASYNC_MAGIC; fna->magic = FASYNC_MAGIC;
fna->fa_next=sock->fasync_list; fna->fa_next = sock->fasync_list;
write_lock_bh(&sk->sk_callback_lock); write_lock_bh(&sk->sk_callback_lock);
sock->fasync_list=fna; sock->fasync_list = fna;
write_unlock_bh(&sk->sk_callback_lock); write_unlock_bh(&sk->sk_callback_lock);
} } else {
else if (fa != NULL) {
{
if (fa!=NULL)
{
write_lock_bh(&sk->sk_callback_lock); write_lock_bh(&sk->sk_callback_lock);
*prev=fa->fa_next; *prev = fa->fa_next;
write_unlock_bh(&sk->sk_callback_lock); write_unlock_bh(&sk->sk_callback_lock);
kfree(fa); kfree(fa);
} }
...@@ -1107,10 +1113,9 @@ int sock_wake_async(struct socket *sock, int how, int band) ...@@ -1107,10 +1113,9 @@ int sock_wake_async(struct socket *sock, int how, int band)
{ {
if (!sock || !sock->fasync_list) if (!sock || !sock->fasync_list)
return -1; return -1;
switch (how) switch (how) {
{
case 1: case 1:
if (test_bit(SOCK_ASYNC_WAITDATA, &sock->flags)) if (test_bit(SOCK_ASYNC_WAITDATA, &sock->flags))
break; break;
goto call_kill; goto call_kill;
...@@ -1119,7 +1124,7 @@ int sock_wake_async(struct socket *sock, int how, int band) ...@@ -1119,7 +1124,7 @@ int sock_wake_async(struct socket *sock, int how, int band)
break; break;
/* fall through */ /* fall through */
case 0: case 0:
call_kill: call_kill:
__kill_fasync(sock->fasync_list, SIGIO, band); __kill_fasync(sock->fasync_list, SIGIO, band);
break; break;
case 3: case 3:
...@@ -1128,13 +1133,14 @@ int sock_wake_async(struct socket *sock, int how, int band) ...@@ -1128,13 +1133,14 @@ int sock_wake_async(struct socket *sock, int how, int band)
return 0; 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; int err;
struct socket *sock; struct socket *sock;
/* /*
* Check protocol is in range * Check protocol is in range
*/ */
if (family < 0 || family >= NPROTO) if (family < 0 || family >= NPROTO)
return -EAFNOSUPPORT; return -EAFNOSUPPORT;
...@@ -1147,10 +1153,11 @@ static int __sock_create(int family, int type, int protocol, struct socket **res ...@@ -1147,10 +1153,11 @@ static int __sock_create(int family, int type, int protocol, struct socket **res
deadlock in module load. deadlock in module load.
*/ */
if (family == PF_INET && type == SOCK_PACKET) { if (family == PF_INET && type == SOCK_PACKET) {
static int warned; static int warned;
if (!warned) { if (!warned) {
warned = 1; 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; family = PF_PACKET;
} }
...@@ -1158,17 +1165,16 @@ static int __sock_create(int family, int type, int protocol, struct socket **res ...@@ -1158,17 +1165,16 @@ static int __sock_create(int family, int type, int protocol, struct socket **res
err = security_socket_create(family, type, protocol, kern); err = security_socket_create(family, type, protocol, kern);
if (err) if (err)
return err; return err;
#if defined(CONFIG_KMOD) #if defined(CONFIG_KMOD)
/* Attempt to load a protocol module if the find failed. /* Attempt to load a protocol module if the find failed.
* *
* 12/09/1996 Marcin: But! this makes REALLY only sense, if the user * 12/09/1996 Marcin: But! this makes REALLY only sense, if the user
* requested real, full-featured networking support upon configuration. * requested real, full-featured networking support upon configuration.
* Otherwise module support will break! * Otherwise module support will break!
*/ */
if (net_families[family]==NULL) if (net_families[family] == NULL) {
{ request_module("net-pf-%d", family);
request_module("net-pf-%d",family);
} }
#endif #endif
...@@ -1187,12 +1193,12 @@ static int __sock_create(int family, int type, int protocol, struct socket **res ...@@ -1187,12 +1193,12 @@ static int __sock_create(int family, int type, int protocol, struct socket **res
if (!(sock = sock_alloc())) { if (!(sock = sock_alloc())) {
if (net_ratelimit()) if (net_ratelimit())
printk(KERN_WARNING "socket: no more sockets\n"); printk(KERN_WARNING "socket: no more sockets\n");
err = -ENFILE; /* Not exactly a match, but its the err = -ENFILE; /* Not exactly a match, but its the
closest posix thing */ closest posix thing */
goto out; goto out;
} }
sock->type = type; sock->type = type;
/* /*
* We will call the ->create function, that possibly is in a loadable * We will call the ->create function, that possibly is in a loadable
...@@ -1271,7 +1277,8 @@ out_release: ...@@ -1271,7 +1277,8 @@ out_release:
* Create a pair of connected sockets. * 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; struct socket *sock1, *sock2;
int fd1, fd2, err; int fd1, fd2, err;
...@@ -1290,7 +1297,7 @@ asmlinkage long sys_socketpair(int family, int type, int protocol, int __user *u ...@@ -1290,7 +1297,7 @@ asmlinkage long sys_socketpair(int family, int type, int protocol, int __user *u
goto out_release_1; goto out_release_1;
err = sock1->ops->socketpair(sock1, sock2); err = sock1->ops->socketpair(sock1, sock2);
if (err < 0) if (err < 0)
goto out_release_both; goto out_release_both;
fd1 = fd2 = -1; fd1 = fd2 = -1;
...@@ -1309,7 +1316,7 @@ asmlinkage long sys_socketpair(int family, int type, int protocol, int __user *u ...@@ -1309,7 +1316,7 @@ asmlinkage long sys_socketpair(int family, int type, int protocol, int __user *u
* Not kernel problem. * Not kernel problem.
*/ */
err = put_user(fd1, &usockvec[0]); err = put_user(fd1, &usockvec[0]);
if (!err) if (!err)
err = put_user(fd2, &usockvec[1]); err = put_user(fd2, &usockvec[1]);
if (!err) if (!err)
...@@ -1320,19 +1327,18 @@ asmlinkage long sys_socketpair(int family, int type, int protocol, int __user *u ...@@ -1320,19 +1327,18 @@ asmlinkage long sys_socketpair(int family, int type, int protocol, int __user *u
return err; return err;
out_close_1: out_close_1:
sock_release(sock2); sock_release(sock2);
sys_close(fd1); sys_close(fd1);
return err; return err;
out_release_both: out_release_both:
sock_release(sock2); sock_release(sock2);
out_release_1: out_release_1:
sock_release(sock1); sock_release(sock1);
out: out:
return err; return err;
} }
/* /*
* Bind a name to a socket. Nothing much to do here since it's * Bind a name to a socket. Nothing much to do here since it's
* the protocol's responsibility to handle the local address. * 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) ...@@ -1347,20 +1353,23 @@ asmlinkage long sys_bind(int fd, struct sockaddr __user *umyaddr, int addrlen)
char address[MAX_SOCK_ADDR]; char address[MAX_SOCK_ADDR];
int err, fput_needed; 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((err=move_addr_to_kernel(umyaddr,addrlen,address))>=0) { err = move_addr_to_kernel(umyaddr, addrlen, address);
err = security_socket_bind(sock, (struct sockaddr *)address, addrlen); if (err >= 0) {
err = security_socket_bind(sock,
(struct sockaddr *)address,
addrlen);
if (!err) if (!err)
err = sock->ops->bind(sock, err = sock->ops->bind(sock,
(struct sockaddr *)address, addrlen); (struct sockaddr *)
address, addrlen);
} }
fput_light(sock->file, fput_needed); fput_light(sock->file, fput_needed);
} }
return err; return err;
} }
/* /*
* Perform a listen. Basically, we allow the protocol to do anything * Perform a listen. Basically, we allow the protocol to do anything
* necessary for a listen, and if that works, we mark the socket as * necessary for a listen, and if that works, we mark the socket as
...@@ -1373,9 +1382,10 @@ asmlinkage long sys_listen(int fd, int backlog) ...@@ -1373,9 +1382,10 @@ asmlinkage long sys_listen(int fd, int backlog)
{ {
struct socket *sock; struct socket *sock;
int err, fput_needed; int err, fput_needed;
if ((sock = sockfd_lookup_light(fd, &err, &fput_needed)) != NULL) { sock = sockfd_lookup_light(fd, &err, &fput_needed);
if ((unsigned) backlog > sysctl_somaxconn) if (sock) {
if ((unsigned)backlog > sysctl_somaxconn)
backlog = sysctl_somaxconn; backlog = sysctl_somaxconn;
err = security_socket_listen(sock, backlog); err = security_socket_listen(sock, backlog);
...@@ -1387,7 +1397,6 @@ asmlinkage long sys_listen(int fd, int backlog) ...@@ -1387,7 +1397,6 @@ asmlinkage long sys_listen(int fd, int backlog)
return err; return err;
} }
/* /*
* For accept, we attempt to create a new socket, set up the link * For accept, we attempt to create a new socket, set up the link
* with the client, wake up the client, then return the new * with the client, wake up the client, then return the new
...@@ -1400,7 +1409,8 @@ asmlinkage long sys_listen(int fd, int backlog) ...@@ -1400,7 +1409,8 @@ asmlinkage long sys_listen(int fd, int backlog)
* clean when we restucture accept also. * 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 socket *sock, *newsock;
struct file *newfile; struct file *newfile;
...@@ -1412,7 +1422,7 @@ asmlinkage long sys_accept(int fd, struct sockaddr __user *upeer_sockaddr, int _ ...@@ -1412,7 +1422,7 @@ asmlinkage long sys_accept(int fd, struct sockaddr __user *upeer_sockaddr, int _
goto out; goto out;
err = -ENFILE; err = -ENFILE;
if (!(newsock = sock_alloc())) if (!(newsock = sock_alloc()))
goto out_put; goto out_put;
newsock->type = sock->type; newsock->type = sock->type;
...@@ -1444,11 +1454,13 @@ asmlinkage long sys_accept(int fd, struct sockaddr __user *upeer_sockaddr, int _ ...@@ -1444,11 +1454,13 @@ asmlinkage long sys_accept(int fd, struct sockaddr __user *upeer_sockaddr, int _
goto out_fd; goto out_fd;
if (upeer_sockaddr) { 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; err = -ECONNABORTED;
goto out_fd; 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) if (err < 0)
goto out_fd; goto out_fd;
} }
...@@ -1470,7 +1482,6 @@ out_fd: ...@@ -1470,7 +1482,6 @@ out_fd:
goto out_put; goto out_put;
} }
/* /*
* Attempt to connect to a socket with the server address. The address * 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. * is in user space so we verify it is OK and move it to kernel space.
...@@ -1483,7 +1494,8 @@ out_fd: ...@@ -1483,7 +1494,8 @@ out_fd:
* include the -EINPROGRESS status for such sockets. * 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; struct socket *sock;
char address[MAX_SOCK_ADDR]; char address[MAX_SOCK_ADDR];
...@@ -1496,11 +1508,12 @@ asmlinkage long sys_connect(int fd, struct sockaddr __user *uservaddr, int addrl ...@@ -1496,11 +1508,12 @@ asmlinkage long sys_connect(int fd, struct sockaddr __user *uservaddr, int addrl
if (err < 0) if (err < 0)
goto out_put; goto out_put;
err = security_socket_connect(sock, (struct sockaddr *)address, addrlen); err =
security_socket_connect(sock, (struct sockaddr *)address, addrlen);
if (err) if (err)
goto out_put; goto out_put;
err = sock->ops->connect(sock, (struct sockaddr *) address, addrlen, err = sock->ops->connect(sock, (struct sockaddr *)address, addrlen,
sock->file->f_flags); sock->file->f_flags);
out_put: out_put:
fput_light(sock->file, fput_needed); fput_light(sock->file, fput_needed);
...@@ -1513,12 +1526,13 @@ out: ...@@ -1513,12 +1526,13 @@ out:
* name to user space. * 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; struct socket *sock;
char address[MAX_SOCK_ADDR]; char address[MAX_SOCK_ADDR];
int len, err, fput_needed; int len, err, fput_needed;
sock = sockfd_lookup_light(fd, &err, &fput_needed); sock = sockfd_lookup_light(fd, &err, &fput_needed);
if (!sock) if (!sock)
goto out; goto out;
...@@ -1543,22 +1557,27 @@ out: ...@@ -1543,22 +1557,27 @@ out:
* name to user space. * 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; struct socket *sock;
char address[MAX_SOCK_ADDR]; char address[MAX_SOCK_ADDR];
int len, err, fput_needed; 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); err = security_socket_getpeername(sock);
if (err) { if (err) {
fput_light(sock->file, fput_needed); fput_light(sock->file, fput_needed);
return err; return err;
} }
err = sock->ops->getname(sock, (struct sockaddr *)address, &len, 1); err =
sock->ops->getname(sock, (struct sockaddr *)address, &len,
1);
if (!err) 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); fput_light(sock->file, fput_needed);
} }
return err; return err;
...@@ -1570,8 +1589,9 @@ asmlinkage long sys_getpeername(int fd, struct sockaddr __user *usockaddr, int _ ...@@ -1570,8 +1589,9 @@ asmlinkage long sys_getpeername(int fd, struct sockaddr __user *usockaddr, int _
* the protocol. * the protocol.
*/ */
asmlinkage long sys_sendto(int fd, void __user * buff, size_t len, unsigned flags, asmlinkage long sys_sendto(int fd, void __user *buff, size_t len,
struct sockaddr __user *addr, int addr_len) unsigned flags, struct sockaddr __user *addr,
int addr_len)
{ {
struct socket *sock; struct socket *sock;
char address[MAX_SOCK_ADDR]; char address[MAX_SOCK_ADDR];
...@@ -1588,54 +1608,55 @@ asmlinkage long sys_sendto(int fd, void __user * buff, size_t len, unsigned flag ...@@ -1588,54 +1608,55 @@ asmlinkage long sys_sendto(int fd, void __user * buff, size_t len, unsigned flag
sock = sock_from_file(sock_file, &err); sock = sock_from_file(sock_file, &err);
if (!sock) if (!sock)
goto out_put; goto out_put;
iov.iov_base=buff; iov.iov_base = buff;
iov.iov_len=len; iov.iov_len = len;
msg.msg_name=NULL; msg.msg_name = NULL;
msg.msg_iov=&iov; msg.msg_iov = &iov;
msg.msg_iovlen=1; msg.msg_iovlen = 1;
msg.msg_control=NULL; msg.msg_control = NULL;
msg.msg_controllen=0; msg.msg_controllen = 0;
msg.msg_namelen=0; msg.msg_namelen = 0;
if (addr) { if (addr) {
err = move_addr_to_kernel(addr, addr_len, address); err = move_addr_to_kernel(addr, addr_len, address);
if (err < 0) if (err < 0)
goto out_put; goto out_put;
msg.msg_name=address; msg.msg_name = address;
msg.msg_namelen=addr_len; msg.msg_namelen = addr_len;
} }
if (sock->file->f_flags & O_NONBLOCK) if (sock->file->f_flags & O_NONBLOCK)
flags |= MSG_DONTWAIT; flags |= MSG_DONTWAIT;
msg.msg_flags = flags; msg.msg_flags = flags;
err = sock_sendmsg(sock, &msg, len); err = sock_sendmsg(sock, &msg, len);
out_put: out_put:
fput_light(sock_file, fput_needed); fput_light(sock_file, fput_needed);
return err; return err;
} }
/* /*
* Send a datagram down a socket. * Send a datagram down a socket.
*/ */
asmlinkage long sys_send(int fd, void __user * buff, size_t len, unsigned flags) asmlinkage long sys_send(int fd, void __user *buff, size_t len, unsigned flags)
{ {
return sys_sendto(fd, buff, len, flags, NULL, 0); return sys_sendto(fd, buff, len, flags, NULL, 0);
} }
/* /*
* Receive a frame from the socket and optionally record the address of the * Receive a frame from the socket and optionally record the address of the
* sender. We verify the buffers are writable and if needed move the * sender. We verify the buffers are writable and if needed move the
* sender address from kernel to user space. * sender address from kernel to user space.
*/ */
asmlinkage long sys_recvfrom(int fd, void __user * ubuf, size_t size, unsigned flags, asmlinkage long sys_recvfrom(int fd, void __user *ubuf, size_t size,
struct sockaddr __user *addr, int __user *addr_len) unsigned flags, struct sockaddr __user *addr,
int __user *addr_len)
{ {
struct socket *sock; struct socket *sock;
struct iovec iov; struct iovec iov;
struct msghdr msg; struct msghdr msg;
char address[MAX_SOCK_ADDR]; char address[MAX_SOCK_ADDR];
int err,err2; int err, err2;
struct file *sock_file; struct file *sock_file;
int fput_needed; int fput_needed;
...@@ -1647,23 +1668,22 @@ asmlinkage long sys_recvfrom(int fd, void __user * ubuf, size_t size, unsigned f ...@@ -1647,23 +1668,22 @@ asmlinkage long sys_recvfrom(int fd, void __user * ubuf, size_t size, unsigned f
if (!sock) if (!sock)
goto out; goto out;
msg.msg_control=NULL; msg.msg_control = NULL;
msg.msg_controllen=0; msg.msg_controllen = 0;
msg.msg_iovlen=1; msg.msg_iovlen = 1;
msg.msg_iov=&iov; msg.msg_iov = &iov;
iov.iov_len=size; iov.iov_len = size;
iov.iov_base=ubuf; iov.iov_base = ubuf;
msg.msg_name=address; msg.msg_name = address;
msg.msg_namelen=MAX_SOCK_ADDR; msg.msg_namelen = MAX_SOCK_ADDR;
if (sock->file->f_flags & O_NONBLOCK) if (sock->file->f_flags & O_NONBLOCK)
flags |= MSG_DONTWAIT; flags |= MSG_DONTWAIT;
err=sock_recvmsg(sock, &msg, size, flags); 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);
err2=move_addr_to_user(address, msg.msg_namelen, addr, addr_len); if (err2 < 0)
if(err2<0) err = err2;
err=err2;
} }
out: out:
fput_light(sock_file, fput_needed); fput_light(sock_file, fput_needed);
...@@ -1671,10 +1691,11 @@ out: ...@@ -1671,10 +1691,11 @@ out:
} }
/* /*
* Receive a datagram from a socket. * 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); return sys_recvfrom(fd, ubuf, size, flags, NULL, NULL);
} }
...@@ -1684,24 +1705,29 @@ asmlinkage long sys_recv(int fd, void __user * ubuf, size_t size, unsigned flags ...@@ -1684,24 +1705,29 @@ 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. * 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; int err, fput_needed;
struct socket *sock; struct socket *sock;
if (optlen < 0) if (optlen < 0)
return -EINVAL; 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); err = security_socket_setsockopt(sock, level, optname);
if (err) if (err)
goto out_put; goto out_put;
if (level == SOL_SOCKET) if (level == SOL_SOCKET)
err=sock_setsockopt(sock,level,optname,optval,optlen); err =
sock_setsockopt(sock, level, optname, optval,
optlen);
else else
err=sock->ops->setsockopt(sock, level, optname, optval, optlen); err =
sock->ops->setsockopt(sock, level, optname, optval,
optlen);
out_put: out_put:
fput_light(sock->file, fput_needed); fput_light(sock->file, fput_needed);
} }
...@@ -1713,27 +1739,32 @@ out_put: ...@@ -1713,27 +1739,32 @@ out_put:
* to pass a user mode parameter for the protocols to sort out. * 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; int err, fput_needed;
struct socket *sock; 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); err = security_socket_getsockopt(sock, level, optname);
if (err) if (err)
goto out_put; goto out_put;
if (level == SOL_SOCKET) if (level == SOL_SOCKET)
err=sock_getsockopt(sock,level,optname,optval,optlen); err =
sock_getsockopt(sock, level, optname, optval,
optlen);
else else
err=sock->ops->getsockopt(sock, level, optname, optval, optlen); err =
sock->ops->getsockopt(sock, level, optname, optval,
optlen);
out_put: out_put:
fput_light(sock->file, fput_needed); fput_light(sock->file, fput_needed);
} }
return err; return err;
} }
/* /*
* Shutdown a socket. * Shutdown a socket.
*/ */
...@@ -1743,8 +1774,8 @@ asmlinkage long sys_shutdown(int fd, int how) ...@@ -1743,8 +1774,8 @@ asmlinkage long sys_shutdown(int fd, int how)
int err, fput_needed; int err, fput_needed;
struct socket *sock; 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); err = security_socket_shutdown(sock, how);
if (!err) if (!err)
err = sock->ops->shutdown(sock, how); err = sock->ops->shutdown(sock, how);
...@@ -1753,41 +1784,42 @@ asmlinkage long sys_shutdown(int fd, int how) ...@@ -1753,41 +1784,42 @@ asmlinkage long sys_shutdown(int fd, int how)
return err; return err;
} }
/* A couple of helpful macros for getting the address of the 32/64 bit /* A couple of helpful macros for getting the address of the 32/64 bit
* fields which are the same type (int / unsigned) on our platforms. * fields which are the same type (int / unsigned) on our platforms.
*/ */
#define COMPAT_MSG(msg, member) ((MSG_CMSG_COMPAT & flags) ? &msg##_compat->member : &msg->member) #define COMPAT_MSG(msg, member) ((MSG_CMSG_COMPAT & flags) ? &msg##_compat->member : &msg->member)
#define COMPAT_NAMELEN(msg) COMPAT_MSG(msg, msg_namelen) #define COMPAT_NAMELEN(msg) COMPAT_MSG(msg, msg_namelen)
#define COMPAT_FLAGS(msg) COMPAT_MSG(msg, msg_flags) #define COMPAT_FLAGS(msg) COMPAT_MSG(msg, msg_flags)
/* /*
* BSD sendmsg interface * BSD sendmsg interface
*/ */
asmlinkage long sys_sendmsg(int fd, struct msghdr __user *msg, unsigned flags) 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; struct socket *sock;
char address[MAX_SOCK_ADDR]; char address[MAX_SOCK_ADDR];
struct iovec iovstack[UIO_FASTIOV], *iov = iovstack; struct iovec iovstack[UIO_FASTIOV], *iov = iovstack;
unsigned char ctl[sizeof(struct cmsghdr) + 20] unsigned char ctl[sizeof(struct cmsghdr) + 20]
__attribute__ ((aligned (sizeof(__kernel_size_t)))); __attribute__ ((aligned(sizeof(__kernel_size_t))));
/* 20 is size of ipv6_pktinfo */ /* 20 is size of ipv6_pktinfo */
unsigned char *ctl_buf = ctl; unsigned char *ctl_buf = ctl;
struct msghdr msg_sys; struct msghdr msg_sys;
int err, ctl_len, iov_size, total_len; int err, ctl_len, iov_size, total_len;
int fput_needed; int fput_needed;
err = -EFAULT; err = -EFAULT;
if (MSG_CMSG_COMPAT & flags) { if (MSG_CMSG_COMPAT & flags) {
if (get_compat_msghdr(&msg_sys, msg_compat)) if (get_compat_msghdr(&msg_sys, msg_compat))
return -EFAULT; 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; return -EFAULT;
sock = sockfd_lookup_light(fd, &err, &fput_needed); sock = sockfd_lookup_light(fd, &err, &fput_needed);
if (!sock) if (!sock)
goto out; goto out;
/* do not move before msg_sys is valid */ /* do not move before msg_sys is valid */
...@@ -1795,7 +1827,7 @@ asmlinkage long sys_sendmsg(int fd, struct msghdr __user *msg, unsigned flags) ...@@ -1795,7 +1827,7 @@ asmlinkage long sys_sendmsg(int fd, struct msghdr __user *msg, unsigned flags)
if (msg_sys.msg_iovlen > UIO_MAXIOV) if (msg_sys.msg_iovlen > UIO_MAXIOV)
goto out_put; goto out_put;
/* Check whether to allocate the iovec area*/ /* Check whether to allocate the iovec area */
err = -ENOMEM; err = -ENOMEM;
iov_size = msg_sys.msg_iovlen * sizeof(struct iovec); iov_size = msg_sys.msg_iovlen * sizeof(struct iovec);
if (msg_sys.msg_iovlen > UIO_FASTIOV) { if (msg_sys.msg_iovlen > UIO_FASTIOV) {
...@@ -1809,7 +1841,7 @@ asmlinkage long sys_sendmsg(int fd, struct msghdr __user *msg, unsigned flags) ...@@ -1809,7 +1841,7 @@ asmlinkage long sys_sendmsg(int fd, struct msghdr __user *msg, unsigned flags)
err = verify_compat_iovec(&msg_sys, iov, address, VERIFY_READ); err = verify_compat_iovec(&msg_sys, iov, address, VERIFY_READ);
} else } else
err = verify_iovec(&msg_sys, iov, address, VERIFY_READ); err = verify_iovec(&msg_sys, iov, address, VERIFY_READ);
if (err < 0) if (err < 0)
goto out_freeiov; goto out_freeiov;
total_len = err; total_len = err;
...@@ -1817,18 +1849,19 @@ asmlinkage long sys_sendmsg(int fd, struct msghdr __user *msg, unsigned flags) ...@@ -1817,18 +1849,19 @@ asmlinkage long sys_sendmsg(int fd, struct msghdr __user *msg, unsigned flags)
if (msg_sys.msg_controllen > INT_MAX) if (msg_sys.msg_controllen > INT_MAX)
goto out_freeiov; goto out_freeiov;
ctl_len = msg_sys.msg_controllen; ctl_len = msg_sys.msg_controllen;
if ((MSG_CMSG_COMPAT & flags) && ctl_len) { 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) if (err)
goto out_freeiov; goto out_freeiov;
ctl_buf = msg_sys.msg_control; ctl_buf = msg_sys.msg_control;
ctl_len = msg_sys.msg_controllen; ctl_len = msg_sys.msg_controllen;
} else if (ctl_len) { } else if (ctl_len) {
if (ctl_len > sizeof(ctl)) if (ctl_len > sizeof(ctl)) {
{
ctl_buf = sock_kmalloc(sock->sk, ctl_len, GFP_KERNEL); ctl_buf = sock_kmalloc(sock->sk, ctl_len, GFP_KERNEL);
if (ctl_buf == NULL) if (ctl_buf == NULL)
goto out_freeiov; goto out_freeiov;
} }
err = -EFAULT; err = -EFAULT;
...@@ -1837,7 +1870,8 @@ asmlinkage long sys_sendmsg(int fd, struct msghdr __user *msg, unsigned flags) ...@@ -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 * Afterwards, it will be a kernel pointer. Thus the compiler-assisted
* checking falls down on this. * 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; goto out_freectl;
msg_sys.msg_control = ctl_buf; msg_sys.msg_control = ctl_buf;
} }
...@@ -1848,14 +1882,14 @@ asmlinkage long sys_sendmsg(int fd, struct msghdr __user *msg, unsigned flags) ...@@ -1848,14 +1882,14 @@ asmlinkage long sys_sendmsg(int fd, struct msghdr __user *msg, unsigned flags)
err = sock_sendmsg(sock, &msg_sys, total_len); err = sock_sendmsg(sock, &msg_sys, total_len);
out_freectl: out_freectl:
if (ctl_buf != ctl) if (ctl_buf != ctl)
sock_kfree_s(sock->sk, ctl_buf, ctl_len); sock_kfree_s(sock->sk, ctl_buf, ctl_len);
out_freeiov: out_freeiov:
if (iov != iovstack) if (iov != iovstack)
sock_kfree_s(sock->sk, iov, iov_size); sock_kfree_s(sock->sk, iov, iov_size);
out_put: out_put:
fput_light(sock->file, fput_needed); fput_light(sock->file, fput_needed);
out: out:
return err; return err;
} }
...@@ -1863,12 +1897,14 @@ out: ...@@ -1863,12 +1897,14 @@ out:
* BSD recvmsg interface * 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 socket *sock;
struct iovec iovstack[UIO_FASTIOV]; struct iovec iovstack[UIO_FASTIOV];
struct iovec *iov=iovstack; struct iovec *iov = iovstack;
struct msghdr msg_sys; struct msghdr msg_sys;
unsigned long cmsg_ptr; unsigned long cmsg_ptr;
int err, iov_size, total_len, len; int err, iov_size, total_len, len;
...@@ -1880,13 +1916,13 @@ asmlinkage long sys_recvmsg(int fd, struct msghdr __user *msg, unsigned int flag ...@@ -1880,13 +1916,13 @@ asmlinkage long sys_recvmsg(int fd, struct msghdr __user *msg, unsigned int flag
/* user mode address pointers */ /* user mode address pointers */
struct sockaddr __user *uaddr; struct sockaddr __user *uaddr;
int __user *uaddr_len; int __user *uaddr_len;
if (MSG_CMSG_COMPAT & flags) { if (MSG_CMSG_COMPAT & flags) {
if (get_compat_msghdr(&msg_sys, msg_compat)) if (get_compat_msghdr(&msg_sys, msg_compat))
return -EFAULT; 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; return -EFAULT;
sock = sockfd_lookup_light(fd, &err, &fput_needed); sock = sockfd_lookup_light(fd, &err, &fput_needed);
if (!sock) if (!sock)
...@@ -1895,8 +1931,8 @@ asmlinkage long sys_recvmsg(int fd, struct msghdr __user *msg, unsigned int flag ...@@ -1895,8 +1931,8 @@ asmlinkage long sys_recvmsg(int fd, struct msghdr __user *msg, unsigned int flag
err = -EMSGSIZE; err = -EMSGSIZE;
if (msg_sys.msg_iovlen > UIO_MAXIOV) if (msg_sys.msg_iovlen > UIO_MAXIOV)
goto out_put; goto out_put;
/* Check whether to allocate the iovec area*/ /* Check whether to allocate the iovec area */
err = -ENOMEM; err = -ENOMEM;
iov_size = msg_sys.msg_iovlen * sizeof(struct iovec); iov_size = msg_sys.msg_iovlen * sizeof(struct iovec);
if (msg_sys.msg_iovlen > UIO_FASTIOV) { if (msg_sys.msg_iovlen > UIO_FASTIOV) {
...@@ -1906,11 +1942,11 @@ asmlinkage long sys_recvmsg(int fd, struct msghdr __user *msg, unsigned int flag ...@@ -1906,11 +1942,11 @@ asmlinkage long sys_recvmsg(int fd, struct msghdr __user *msg, unsigned int flag
} }
/* /*
* Save the user-mode address (verify_iovec will change the * Save the user-mode address (verify_iovec will change the
* kernel msghdr to use the kernel address space) * kernel msghdr to use the kernel address space)
*/ */
uaddr = (void __user *) msg_sys.msg_name; uaddr = (void __user *)msg_sys.msg_name;
uaddr_len = COMPAT_NAMELEN(msg); uaddr_len = COMPAT_NAMELEN(msg);
if (MSG_CMSG_COMPAT & flags) { if (MSG_CMSG_COMPAT & flags) {
err = verify_compat_iovec(&msg_sys, iov, addr, VERIFY_WRITE); err = verify_compat_iovec(&msg_sys, iov, addr, VERIFY_WRITE);
...@@ -1918,13 +1954,13 @@ asmlinkage long sys_recvmsg(int fd, struct msghdr __user *msg, unsigned int flag ...@@ -1918,13 +1954,13 @@ asmlinkage long sys_recvmsg(int fd, struct msghdr __user *msg, unsigned int flag
err = verify_iovec(&msg_sys, iov, addr, VERIFY_WRITE); err = verify_iovec(&msg_sys, iov, addr, VERIFY_WRITE);
if (err < 0) if (err < 0)
goto out_freeiov; goto out_freeiov;
total_len=err; total_len = err;
cmsg_ptr = (unsigned long)msg_sys.msg_control; cmsg_ptr = (unsigned long)msg_sys.msg_control;
msg_sys.msg_flags = 0; msg_sys.msg_flags = 0;
if (MSG_CMSG_COMPAT & flags) if (MSG_CMSG_COMPAT & flags)
msg_sys.msg_flags = MSG_CMSG_COMPAT; msg_sys.msg_flags = MSG_CMSG_COMPAT;
if (sock->file->f_flags & O_NONBLOCK) if (sock->file->f_flags & O_NONBLOCK)
flags |= MSG_DONTWAIT; flags |= MSG_DONTWAIT;
err = sock_recvmsg(sock, &msg_sys, total_len, flags); err = sock_recvmsg(sock, &msg_sys, total_len, flags);
...@@ -1933,7 +1969,8 @@ asmlinkage long sys_recvmsg(int fd, struct msghdr __user *msg, unsigned int flag ...@@ -1933,7 +1969,8 @@ asmlinkage long sys_recvmsg(int fd, struct msghdr __user *msg, unsigned int flag
len = err; len = err;
if (uaddr != NULL) { 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) if (err < 0)
goto out_freeiov; goto out_freeiov;
} }
...@@ -1942,10 +1979,10 @@ asmlinkage long sys_recvmsg(int fd, struct msghdr __user *msg, unsigned int flag ...@@ -1942,10 +1979,10 @@ asmlinkage long sys_recvmsg(int fd, struct msghdr __user *msg, unsigned int flag
if (err) if (err)
goto out_freeiov; goto out_freeiov;
if (MSG_CMSG_COMPAT & flags) if (MSG_CMSG_COMPAT & flags)
err = __put_user((unsigned long)msg_sys.msg_control-cmsg_ptr, err = __put_user((unsigned long)msg_sys.msg_control - cmsg_ptr,
&msg_compat->msg_controllen); &msg_compat->msg_controllen);
else else
err = __put_user((unsigned long)msg_sys.msg_control-cmsg_ptr, err = __put_user((unsigned long)msg_sys.msg_control - cmsg_ptr,
&msg->msg_controllen); &msg->msg_controllen);
if (err) if (err)
goto out_freeiov; goto out_freeiov;
...@@ -1964,102 +2001,113 @@ out: ...@@ -1964,102 +2001,113 @@ out:
/* Argument list sizes for sys_socketcall */ /* Argument list sizes for sys_socketcall */
#define AL(x) ((x) * sizeof(unsigned long)) #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(3),AL(3),AL(4),AL(4),AL(4),AL(6), AL(0),AL(3),AL(3),AL(3),AL(2),AL(3),
AL(6),AL(2),AL(5),AL(5),AL(3),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)
};
#undef AL #undef AL
/* /*
* System call vectors. * System call vectors.
* *
* Argument checking cleaned up. Saved 20% in size. * Argument checking cleaned up. Saved 20% in size.
* This function doesn't need to set the kernel lock because * This function doesn't need to set the kernel lock because
* it is set by the callees. * it is set by the callees.
*/ */
asmlinkage long sys_socketcall(int call, unsigned long __user *args) asmlinkage long sys_socketcall(int call, unsigned long __user *args)
{ {
unsigned long a[6]; unsigned long a[6];
unsigned long a0,a1; unsigned long a0, a1;
int err; int err;
if(call<1||call>SYS_RECVMSG) if (call < 1 || call > SYS_RECVMSG)
return -EINVAL; return -EINVAL;
/* copy_from_user should be SMP safe. */ /* copy_from_user should be SMP safe. */
if (copy_from_user(a, args, nargs[call])) if (copy_from_user(a, args, nargs[call]))
return -EFAULT; return -EFAULT;
err = audit_socketcall(nargs[call]/sizeof(unsigned long), a); err = audit_socketcall(nargs[call] / sizeof(unsigned long), a);
if (err) if (err)
return err; return err;
a0=a[0]; a0 = a[0];
a1=a[1]; a1 = a[1];
switch(call) switch (call) {
{ case SYS_SOCKET:
case SYS_SOCKET: err = sys_socket(a0, a1, a[2]);
err = sys_socket(a0,a1,a[2]); break;
break; case SYS_BIND:
case SYS_BIND: err = sys_bind(a0, (struct sockaddr __user *)a1, a[2]);
err = sys_bind(a0,(struct sockaddr __user *)a1, a[2]); break;
break; case SYS_CONNECT:
case SYS_CONNECT: err = sys_connect(a0, (struct sockaddr __user *)a1, a[2]);
err = sys_connect(a0, (struct sockaddr __user *)a1, a[2]); break;
break; case SYS_LISTEN:
case SYS_LISTEN: err = sys_listen(a0, a1);
err = sys_listen(a0,a1); break;
break; case SYS_ACCEPT:
case SYS_ACCEPT: err =
err = sys_accept(a0,(struct sockaddr __user *)a1, (int __user *)a[2]); sys_accept(a0, (struct sockaddr __user *)a1,
break; (int __user *)a[2]);
case SYS_GETSOCKNAME: break;
err = sys_getsockname(a0,(struct sockaddr __user *)a1, (int __user *)a[2]); case SYS_GETSOCKNAME:
break; err =
case SYS_GETPEERNAME: sys_getsockname(a0, (struct sockaddr __user *)a1,
err = sys_getpeername(a0, (struct sockaddr __user *)a1, (int __user *)a[2]); (int __user *)a[2]);
break; break;
case SYS_SOCKETPAIR: case SYS_GETPEERNAME:
err = sys_socketpair(a0,a1, a[2], (int __user *)a[3]); err =
break; sys_getpeername(a0, (struct sockaddr __user *)a1,
case SYS_SEND: (int __user *)a[2]);
err = sys_send(a0, (void __user *)a1, a[2], a[3]); break;
break; case SYS_SOCKETPAIR:
case SYS_SENDTO: err = sys_socketpair(a0, a1, a[2], (int __user *)a[3]);
err = sys_sendto(a0,(void __user *)a1, a[2], a[3], break;
(struct sockaddr __user *)a[4], a[5]); case SYS_SEND:
break; err = sys_send(a0, (void __user *)a1, a[2], a[3]);
case SYS_RECV: break;
err = sys_recv(a0, (void __user *)a1, a[2], a[3]); case SYS_SENDTO:
break; err = sys_sendto(a0, (void __user *)a1, a[2], a[3],
case SYS_RECVFROM: (struct sockaddr __user *)a[4], a[5]);
err = sys_recvfrom(a0, (void __user *)a1, a[2], a[3], break;
(struct sockaddr __user *)a[4], (int __user *)a[5]); case SYS_RECV:
break; err = sys_recv(a0, (void __user *)a1, a[2], a[3]);
case SYS_SHUTDOWN: break;
err = sys_shutdown(a0,a1); case SYS_RECVFROM:
break; err = sys_recvfrom(a0, (void __user *)a1, a[2], a[3],
case SYS_SETSOCKOPT: (struct sockaddr __user *)a[4],
err = sys_setsockopt(a0, a1, a[2], (char __user *)a[3], a[4]); (int __user *)a[5]);
break; break;
case SYS_GETSOCKOPT: case SYS_SHUTDOWN:
err = sys_getsockopt(a0, a1, a[2], (char __user *)a[3], (int __user *)a[4]); err = sys_shutdown(a0, a1);
break; break;
case SYS_SENDMSG: case SYS_SETSOCKOPT:
err = sys_sendmsg(a0, (struct msghdr __user *) a1, a[2]); err = sys_setsockopt(a0, a1, a[2], (char __user *)a[3], a[4]);
break; break;
case SYS_RECVMSG: case SYS_GETSOCKOPT:
err = sys_recvmsg(a0, (struct msghdr __user *) a1, a[2]); err =
break; sys_getsockopt(a0, a1, a[2], (char __user *)a[3],
default: (int __user *)a[4]);
err = -EINVAL; break;
break; case SYS_SENDMSG:
err = sys_sendmsg(a0, (struct msghdr __user *)a1, a[2]);
break;
case SYS_RECVMSG:
err = sys_recvmsg(a0, (struct msghdr __user *)a1, a[2]);
break;
default:
err = -EINVAL;
break;
} }
return err; return err;
} }
#endif /* __ARCH_WANT_SYS_SOCKETCALL */ #endif /* __ARCH_WANT_SYS_SOCKETCALL */
/* /*
* This function is called by a protocol handler that wants to * This function is called by a protocol handler that wants to
...@@ -2072,18 +2120,18 @@ int sock_register(struct net_proto_family *ops) ...@@ -2072,18 +2120,18 @@ int sock_register(struct net_proto_family *ops)
int err; int err;
if (ops->family >= NPROTO) { 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; return -ENOBUFS;
} }
net_family_write_lock(); net_family_write_lock();
err = -EEXIST; err = -EEXIST;
if (net_families[ops->family] == NULL) { if (net_families[ops->family] == NULL) {
net_families[ops->family]=ops; net_families[ops->family] = ops;
err = 0; err = 0;
} }
net_family_write_unlock(); net_family_write_unlock();
printk(KERN_INFO "NET: Registered protocol family %d\n", printk(KERN_INFO "NET: Registered protocol family %d\n", ops->family);
ops->family);
return err; return err;
} }
...@@ -2099,28 +2147,27 @@ int sock_unregister(int family) ...@@ -2099,28 +2147,27 @@ int sock_unregister(int family)
return -1; return -1;
net_family_write_lock(); net_family_write_lock();
net_families[family]=NULL; net_families[family] = NULL;
net_family_write_unlock(); net_family_write_unlock();
printk(KERN_INFO "NET: Unregistered protocol family %d\n", printk(KERN_INFO "NET: Unregistered protocol family %d\n", family);
family);
return 0; return 0;
} }
static int __init sock_init(void) static int __init sock_init(void)
{ {
/* /*
* Initialize sock SLAB cache. * Initialize sock SLAB cache.
*/ */
sk_init(); sk_init();
/* /*
* Initialize skbuff SLAB cache * Initialize skbuff SLAB cache
*/ */
skb_init(); skb_init();
/* /*
* Initialize the protocols module. * Initialize the protocols module.
*/ */
init_inodecache(); init_inodecache();
...@@ -2146,7 +2193,7 @@ void socket_seq_show(struct seq_file *seq) ...@@ -2146,7 +2193,7 @@ void socket_seq_show(struct seq_file *seq)
int counter = 0; int counter = 0;
for_each_possible_cpu(cpu) for_each_possible_cpu(cpu)
counter += per_cpu(sockets_in_use, cpu); counter += per_cpu(sockets_in_use, cpu);
/* It can be negative, by the way. 8) */ /* It can be negative, by the way. 8) */
if (counter < 0) if (counter < 0)
...@@ -2154,11 +2201,11 @@ void socket_seq_show(struct seq_file *seq) ...@@ -2154,11 +2201,11 @@ void socket_seq_show(struct seq_file *seq)
seq_printf(seq, "sockets: used %d\n", counter); seq_printf(seq, "sockets: used %d\n", counter);
} }
#endif /* CONFIG_PROC_FS */ #endif /* CONFIG_PROC_FS */
#ifdef CONFIG_COMPAT #ifdef CONFIG_COMPAT
static long compat_sock_ioctl(struct file *file, unsigned cmd, static long compat_sock_ioctl(struct file *file, unsigned cmd,
unsigned long arg) unsigned long arg)
{ {
struct socket *sock = file->private_data; struct socket *sock = file->private_data;
int ret = -ENOIOCTLCMD; int ret = -ENOIOCTLCMD;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment