Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 675a53bd authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

parents abd40774 232365f6

arch/arm/kernel/sys_oabi-compat.c

+2 −2
Original line number Diff line number Diff line
@@ -400,7 +400,7 @@ asmlinkage long sys_oabi_sendto(int fd, void __user *buff, 
	return sys_sendto(fd, buff, len, flags, addr, addrlen);

}



asmlinkage long sys_oabi_sendmsg(int fd, struct msghdr __user *msg, unsigned flags)

asmlinkage long sys_oabi_sendmsg(int fd, struct user_msghdr __user *msg, unsigned flags)

{

	struct sockaddr __user *addr;

	int msg_namelen;
@@ -446,7 +446,7 @@ asmlinkage long sys_oabi_socketcall(int call, unsigned long __user *args) 
		break;

	case SYS_SENDMSG:

		if (copy_from_user(a, args, 3 * sizeof(long)) == 0)

			r = sys_oabi_sendmsg(a[0], (struct msghdr __user *)a[1], a[2]);

			r = sys_oabi_sendmsg(a[0], (struct user_msghdr __user *)a[1], a[2]);

		break;

	default:

		r = sys_socketcall(call, args);

include/linux/socket.h

+13 −4
Original line number Diff line number Diff line
@@ -54,9 +54,19 @@ struct msghdr { 
	unsigned int	msg_flags;	/* flags on received message */

};

 

struct user_msghdr {

	void		__user *msg_name;	/* ptr to socket address structure */

	int		msg_namelen;		/* size of socket address structure */

	struct iovec	__user *msg_iov;	/* scatter/gather array */

	__kernel_size_t	msg_iovlen;		/* # elements in msg_iov */

	void		__user *msg_control;	/* ancillary data */

	__kernel_size_t	msg_controllen;		/* ancillary data buffer length */

	unsigned int	msg_flags;		/* flags on received message */

};



/* For recvmmsg/sendmmsg */

struct mmsghdr {

	struct msghdr   msg_hdr;

	struct user_msghdr  msg_hdr;

	unsigned int        msg_len;

};
@@ -312,15 +322,14 @@ extern int csum_partial_copy_fromiovecend(unsigned char *kdata, 
extern unsigned long iov_pages(const struct iovec *iov, int offset,

			       unsigned long nr_segs);



extern int verify_iovec(struct msghdr *m, struct iovec *iov, struct sockaddr_storage *address, int mode);

extern int move_addr_to_kernel(void __user *uaddr, int ulen, struct sockaddr_storage *kaddr);

extern int put_cmsg(struct msghdr*, int level, int type, int len, void *data);



struct timespec;



/* The __sys_...msg variants allow MSG_CMSG_COMPAT */

extern long __sys_recvmsg(int fd, struct msghdr __user *msg, unsigned flags);

extern long __sys_sendmsg(int fd, struct msghdr __user *msg, unsigned flags);

extern long __sys_recvmsg(int fd, struct user_msghdr __user *msg, unsigned flags);

extern long __sys_sendmsg(int fd, struct user_msghdr __user *msg, unsigned flags);

extern int __sys_recvmmsg(int fd, struct mmsghdr __user *mmsg, unsigned int vlen,

			  unsigned int flags, struct timespec *timeout);

extern int __sys_sendmmsg(int fd, struct mmsghdr __user *mmsg,

include/linux/syscalls.h

+3 −3
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ struct linux_dirent64; 
struct list_head;

struct mmap_arg_struct;

struct msgbuf;

struct msghdr;

struct user_msghdr;

struct mmsghdr;

struct msqid_ds;

struct new_utsname;
@@ -601,13 +601,13 @@ asmlinkage long sys_getpeername(int, struct sockaddr __user *, int __user *); 
asmlinkage long sys_send(int, void __user *, size_t, unsigned);

asmlinkage long sys_sendto(int, void __user *, size_t, unsigned,

				struct sockaddr __user *, int);

asmlinkage long sys_sendmsg(int fd, struct msghdr __user *msg, unsigned flags);

asmlinkage long sys_sendmsg(int fd, struct user_msghdr __user *msg, unsigned flags);

asmlinkage long sys_sendmmsg(int fd, struct mmsghdr __user *msg,

			     unsigned int vlen, unsigned flags);

asmlinkage long sys_recv(int, void __user *, size_t, unsigned);

asmlinkage long sys_recvfrom(int, void __user *, size_t, unsigned,

				struct sockaddr __user *, int __user *);

asmlinkage long sys_recvmsg(int fd, struct msghdr __user *msg, unsigned flags);

asmlinkage long sys_recvmsg(int fd, struct user_msghdr __user *msg, unsigned flags);

asmlinkage long sys_recvmmsg(int fd, struct mmsghdr __user *msg,

			     unsigned int vlen, unsigned flags,

			     struct timespec __user *timeout);

include/net/compat.h

+2 −3
Original line number Diff line number Diff line
@@ -40,9 +40,8 @@ int compat_sock_get_timestampns(struct sock *, struct timespec __user *); 
#define compat_mmsghdr	mmsghdr

#endif /* defined(CONFIG_COMPAT) */



int get_compat_msghdr(struct msghdr *, struct compat_msghdr __user *);

int verify_compat_iovec(struct msghdr *, struct iovec *,

			struct sockaddr_storage *, int);

ssize_t get_compat_msghdr(struct msghdr *, struct compat_msghdr __user *,

		      struct sockaddr __user **, struct iovec **);

asmlinkage long compat_sys_sendmsg(int, struct compat_msghdr __user *,

				   unsigned int);

asmlinkage long compat_sys_sendmmsg(int, struct compat_mmsghdr __user *,

include/net/sock.h

+0 −23
Original line number Diff line number Diff line
@@ -1884,29 +1884,6 @@ static inline int skb_copy_to_page_nocache(struct sock *sk, char __user *from, 
	return 0;

}



static inline int skb_copy_to_page(struct sock *sk, char __user *from,

				   struct sk_buff *skb, struct page *page,

				   int off, int copy)

{

	if (skb->ip_summed == CHECKSUM_NONE) {

		int err = 0;

		__wsum csum = csum_and_copy_from_user(from,

						     page_address(page) + off,

							    copy, 0, &err);

		if (err)

			return err;

		skb->csum = csum_block_add(skb->csum, csum, skb->len);

	} else if (copy_from_user(page_address(page) + off, from, copy))

		return -EFAULT;



	skb->len	     += copy;

	skb->data_len	     += copy;

	skb->truesize	     += copy;

	sk->sk_wmem_queued   += copy;

	sk_mem_charge(sk, copy);

	return 0;

}



/**

 * sk_wmem_alloc_get - returns write allocations

 * @sk: socket