 5cbded585d
			
		
	
	
	5cbded585d
	
	
	
		
			
			Run this: #!/bin/sh for f in $(grep -Erl "\([^\)]*\) *k[cmz]alloc" *) ; do echo "De-casting $f..." perl -pi -e "s/ ?= ?\([^\)]*\) *(k[cmz]alloc) *\(/ = \1\(/" $f done And then go through and reinstate those cases where code is casting pointers to non-pointers. And then drop a few hunks which conflicted with outstanding work. Cc: Russell King <rmk@arm.linux.org.uk>, Ian Molton <spyro@f2s.com> Cc: Mikael Starvik <starvik@axis.com> Cc: Yoshinori Sato <ysato@users.sourceforge.jp> Cc: Roman Zippel <zippel@linux-m68k.org> Cc: Geert Uytterhoeven <geert@linux-m68k.org> Cc: Ralf Baechle <ralf@linux-mips.org> Cc: Paul Mackerras <paulus@samba.org> Cc: Kyle McMartin <kyle@mcmartin.ca> Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org> Cc: Martin Schwidefsky <schwidefsky@de.ibm.com> Cc: "David S. Miller" <davem@davemloft.net> Cc: Jeff Dike <jdike@addtoit.com> Cc: Greg KH <greg@kroah.com> Cc: Jens Axboe <jens.axboe@oracle.com> Cc: Paul Fulghum <paulkf@microgate.com> Cc: Alan Cox <alan@lxorguk.ukuu.org.uk> Cc: Karsten Keil <kkeil@suse.de> Cc: Mauro Carvalho Chehab <mchehab@infradead.org> Cc: Jeff Garzik <jeff@garzik.org> Cc: James Bottomley <James.Bottomley@steeleye.com> Cc: Ian Kent <raven@themaw.net> Cc: Steven French <sfrench@us.ibm.com> Cc: David Woodhouse <dwmw2@infradead.org> Cc: Neil Brown <neilb@cse.unsw.edu.au> Cc: Jaroslav Kysela <perex@suse.cz> Cc: Takashi Iwai <tiwai@suse.de> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
		
			
				
	
	
		
			127 lines
		
	
	
	
		
			2.3 KiB
			
		
	
	
	
		
			C
		
	
	
	
	
	
			
		
		
	
	
			127 lines
		
	
	
	
		
			2.3 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 <asm/uaccess.h>
 | |
| 
 | |
| #include "util.h"
 | |
| 
 | |
| 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);
 | |
| }
 | |
| 
 | |
| 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;
 | |
| 	}
 | |
| }
 |