OSDN > Finden Software > Linux Kernel Documents > SCM > git > linux-2.4.36 > Commit

Linux Kernel Documents
Fork
linux-2.6
linux-2.4.36

linux-2.4.36: Commit

2.4.36-stable kernel tree

Merge of rsync://rsync.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.4

--- a/arch/sparc64/kernel/sparc64_ksyms.c

+++ b/arch/sparc64/kernel/sparc64_ksyms.c

		@@ -63,7 +63,6 @@ extern unsigned prom_cpu_nodes[64];
63	63	extern void die_if_kernel(char str, struct pt_regs regs);
64	64	void _sigpause_common (unsigned int set, struct pt_regs *);
65	65	extern void __bzero(void , size_t);
66		-extern void __bzero_noasi(void , size_t);
67	66	extern void __memscan_zero(void , size_t);
68	67	extern void __memscan_generic(void , int, size_t);
69	68	extern int __memcmp(const void , const void , __kernel_size_t);

--- a/arch/sparc64/solaris/socket.c

+++ b/arch/sparc64/solaris/socket.c

		@@ -410,8 +410,10 @@ asmlinkage int solaris_sendmsg(int fd, struct sol_nmsghdr *user_msg, unsigned us
410	410	unsigned long *kcmsg;
411	411	__kernel_size_t32 cmlen;
412	412
413		- if(kern_msg.msg_controllen > sizeof(ctl) &&
414		- kern_msg.msg_controllen <= 256) {
	413	+ if (kern_msg.msg_controllen <= sizeof(__kernel_size_t32))
	414	+ return -EINVAL;
	415	+
	416	+ if(kern_msg.msg_controllen > sizeof(ctl)) {
415	417	err = -ENOBUFS;
416	418	ctl_buf = kmalloc(kern_msg.msg_controllen, GFP_KERNEL);
417	419	if(!ctl_buf)

--- a/include/asm-sparc64/uaccess.h

+++ b/include/asm-sparc64/uaccess.h

		@@ -294,10 +294,10 @@ static inline unsigned long copy_in_user(void to, void from,
294	294	}
295	295	#define __copy_in_user copy_in_user
296	296
	297	+extern __kernel_size_t __bzero_noasi(void *addr, __kernel_size_t size);
	298	+
297	299	extern __inline__ __kernel_size_t __clear_user(void *addr, __kernel_size_t size)
298	300	{
299		- extern __kernel_size_t __bzero_noasi(void *addr, __kernel_size_t size);
300		-
301	301	return __bzero_noasi(addr, size);
302	302	}
303	303