Remove the redundant and confusing fill_copy(). Also add copy_msg() check for error. In this case exit from the function have to be done instead of break, because further code interprets any error as EAGAIN. Also define copy_msg() for the case when CONFIG_CHECKPOINT_RESTORE is disabled. Signed-off-by: Stanislav Kinsbursky <skinsbursky@parallels.com> Cc: "Eric W. Biederman" <ebiederm@xmission.com> Cc: James Morris <jmorris@namei.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
		
			
				
	
	
		
			189 lines
		
	
	
	
		
			3.6 KiB
			
		
	
	
	
		
			C
		
	
	
	
	
	
			
		
		
	
	
			189 lines
		
	
	
	
		
			3.6 KiB
			
		
	
	
	
		
			C
		
	
	
	
	
	
/*
 | 
						|
 * linux/ipc/msgutil.c
 | 
						|
 * Copyright (C) 1999, 2004 Manfred Spraul
 | 
						|
 *
 | 
						|
 * This file is released under GNU General Public Licence version 2 or
 | 
						|
 * (at your option) any later version.
 | 
						|
 *
 | 
						|
 * See the file COPYING for more details.
 | 
						|
 */
 | 
						|
 | 
						|
#include <linux/spinlock.h>
 | 
						|
#include <linux/init.h>
 | 
						|
#include <linux/security.h>
 | 
						|
#include <linux/slab.h>
 | 
						|
#include <linux/ipc.h>
 | 
						|
#include <linux/msg.h>
 | 
						|
#include <linux/ipc_namespace.h>
 | 
						|
#include <linux/utsname.h>
 | 
						|
#include <linux/proc_fs.h>
 | 
						|
#include <asm/uaccess.h>
 | 
						|
 | 
						|
#include "util.h"
 | 
						|
 | 
						|
DEFINE_SPINLOCK(mq_lock);
 | 
						|
 | 
						|
/*
 | 
						|
 * The next 2 defines are here bc this is the only file
 | 
						|
 * compiled when either CONFIG_SYSVIPC and CONFIG_POSIX_MQUEUE
 | 
						|
 * and not CONFIG_IPC_NS.
 | 
						|
 */
 | 
						|
struct ipc_namespace init_ipc_ns = {
 | 
						|
	.count		= ATOMIC_INIT(1),
 | 
						|
	.user_ns = &init_user_ns,
 | 
						|
	.proc_inum = PROC_IPC_INIT_INO,
 | 
						|
};
 | 
						|
 | 
						|
atomic_t nr_ipc_ns = ATOMIC_INIT(1);
 | 
						|
 | 
						|
struct msg_msgseg {
 | 
						|
	struct msg_msgseg* next;
 | 
						|
	/* the next part of the message follows immediately */
 | 
						|
};
 | 
						|
 | 
						|
#define DATALEN_MSG	(PAGE_SIZE-sizeof(struct msg_msg))
 | 
						|
#define DATALEN_SEG	(PAGE_SIZE-sizeof(struct msg_msgseg))
 | 
						|
 | 
						|
struct msg_msg *load_msg(const void __user *src, int len)
 | 
						|
{
 | 
						|
	struct msg_msg *msg;
 | 
						|
	struct msg_msgseg **pseg;
 | 
						|
	int err;
 | 
						|
	int alen;
 | 
						|
 | 
						|
	alen = len;
 | 
						|
	if (alen > DATALEN_MSG)
 | 
						|
		alen = DATALEN_MSG;
 | 
						|
 | 
						|
	msg = kmalloc(sizeof(*msg) + alen, GFP_KERNEL);
 | 
						|
	if (msg == NULL)
 | 
						|
		return ERR_PTR(-ENOMEM);
 | 
						|
 | 
						|
	msg->next = NULL;
 | 
						|
	msg->security = NULL;
 | 
						|
 | 
						|
	if (copy_from_user(msg + 1, src, alen)) {
 | 
						|
		err = -EFAULT;
 | 
						|
		goto out_err;
 | 
						|
	}
 | 
						|
 | 
						|
	len -= alen;
 | 
						|
	src = ((char __user *)src) + alen;
 | 
						|
	pseg = &msg->next;
 | 
						|
	while (len > 0) {
 | 
						|
		struct msg_msgseg *seg;
 | 
						|
		alen = len;
 | 
						|
		if (alen > DATALEN_SEG)
 | 
						|
			alen = DATALEN_SEG;
 | 
						|
		seg = kmalloc(sizeof(*seg) + alen,
 | 
						|
						 GFP_KERNEL);
 | 
						|
		if (seg == NULL) {
 | 
						|
			err = -ENOMEM;
 | 
						|
			goto out_err;
 | 
						|
		}
 | 
						|
		*pseg = seg;
 | 
						|
		seg->next = NULL;
 | 
						|
		if (copy_from_user(seg + 1, src, alen)) {
 | 
						|
			err = -EFAULT;
 | 
						|
			goto out_err;
 | 
						|
		}
 | 
						|
		pseg = &seg->next;
 | 
						|
		len -= alen;
 | 
						|
		src = ((char __user *)src) + alen;
 | 
						|
	}
 | 
						|
 | 
						|
	err = security_msg_msg_alloc(msg);
 | 
						|
	if (err)
 | 
						|
		goto out_err;
 | 
						|
 | 
						|
	return msg;
 | 
						|
 | 
						|
out_err:
 | 
						|
	free_msg(msg);
 | 
						|
	return ERR_PTR(err);
 | 
						|
}
 | 
						|
#ifdef CONFIG_CHECKPOINT_RESTORE
 | 
						|
struct msg_msg *copy_msg(struct msg_msg *src, struct msg_msg *dst)
 | 
						|
{
 | 
						|
	struct msg_msgseg *dst_pseg, *src_pseg;
 | 
						|
	int len = src->m_ts;
 | 
						|
	int alen;
 | 
						|
 | 
						|
	BUG_ON(dst == NULL);
 | 
						|
	if (src->m_ts > dst->m_ts)
 | 
						|
		return ERR_PTR(-EINVAL);
 | 
						|
 | 
						|
	alen = len;
 | 
						|
	if (alen > DATALEN_MSG)
 | 
						|
		alen = DATALEN_MSG;
 | 
						|
 | 
						|
	dst->next = NULL;
 | 
						|
	dst->security = NULL;
 | 
						|
 | 
						|
	memcpy(dst + 1, src + 1, alen);
 | 
						|
 | 
						|
	len -= alen;
 | 
						|
	dst_pseg = dst->next;
 | 
						|
	src_pseg = src->next;
 | 
						|
	while (len > 0) {
 | 
						|
		alen = len;
 | 
						|
		if (alen > DATALEN_SEG)
 | 
						|
			alen = DATALEN_SEG;
 | 
						|
		memcpy(dst_pseg + 1, src_pseg + 1, alen);
 | 
						|
		dst_pseg = dst_pseg->next;
 | 
						|
		len -= alen;
 | 
						|
		src_pseg = src_pseg->next;
 | 
						|
	}
 | 
						|
 | 
						|
	dst->m_type = src->m_type;
 | 
						|
	dst->m_ts = src->m_ts;
 | 
						|
 | 
						|
	return dst;
 | 
						|
}
 | 
						|
#else
 | 
						|
struct msg_msg *copy_msg(struct msg_msg *src, struct msg_msg *dst)
 | 
						|
{
 | 
						|
	return ERR_PTR(-ENOSYS);
 | 
						|
}
 | 
						|
#endif
 | 
						|
int store_msg(void __user *dest, struct msg_msg *msg, int len)
 | 
						|
{
 | 
						|
	int alen;
 | 
						|
	struct msg_msgseg *seg;
 | 
						|
 | 
						|
	alen = len;
 | 
						|
	if (alen > DATALEN_MSG)
 | 
						|
		alen = DATALEN_MSG;
 | 
						|
	if (copy_to_user(dest, msg + 1, alen))
 | 
						|
		return -1;
 | 
						|
 | 
						|
	len -= alen;
 | 
						|
	dest = ((char __user *)dest) + alen;
 | 
						|
	seg = msg->next;
 | 
						|
	while (len > 0) {
 | 
						|
		alen = len;
 | 
						|
		if (alen > DATALEN_SEG)
 | 
						|
			alen = DATALEN_SEG;
 | 
						|
		if (copy_to_user(dest, seg + 1, alen))
 | 
						|
			return -1;
 | 
						|
		len -= alen;
 | 
						|
		dest = ((char __user *)dest) + alen;
 | 
						|
		seg = seg->next;
 | 
						|
	}
 | 
						|
	return 0;
 | 
						|
}
 | 
						|
 | 
						|
void free_msg(struct msg_msg *msg)
 | 
						|
{
 | 
						|
	struct msg_msgseg *seg;
 | 
						|
 | 
						|
	security_msg_msg_free(msg);
 | 
						|
 | 
						|
	seg = msg->next;
 | 
						|
	kfree(msg);
 | 
						|
	while (seg != NULL) {
 | 
						|
		struct msg_msgseg *tmp = seg->next;
 | 
						|
		kfree(seg);
 | 
						|
		seg = tmp;
 | 
						|
	}
 | 
						|
}
 |