diff -u --exclude-from /usr/src/exclude --new-file --recursive linux.vanilla/Makefile linux.25/Makefile --- old/Makefile Mon Mar 17 13:23:41 2003 +++ linux/Makefile Mon Mar 17 13:29:05 2003 @@ -1,6 +1,6 @@ VERSION = 2 PATCHLEVEL = 2 -SUBLEVEL = 24 +SUBLEVEL = 25 EXTRAVERSION = ARCH := $(shell uname -m | sed -e s/i.86/i386/ -e s/sun4u/sparc64/ -e s/arm.*/arm/ -e s/sa110/arm/) diff -u --exclude-from /usr/src/exclude --new-file --recursive linux.vanilla/kernel/kmod.c linux.25/kernel/kmod.c --- old/kernel/kmod.c Sun Mar 25 17:31:02 2001 +++ linux/kernel/kmod.c Mon Mar 17 13:28:41 2003 @@ -156,12 +156,18 @@ return -ENOMEM; } + { + int old=current->dumpable; + current->dumpable=0; /* block ptrace */ pid = kernel_thread(exec_modprobe, (void*) module_name, 0); if (pid < 0) { printk(KERN_ERR "request_module[%s]: fork failed, errno %d\n", module_name, -pid); atomic_dec(&kmod_concurrent); + current->dumpable=old; return pid; } + current->dumpable=old; + } /* Block everything but SIGKILL/SIGSTOP */ spin_lock_irq(¤t->sigmask_lock);