X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=fs%2Fbinfmt_som.c;h=fdc36bfd6a7beb8d1b63b91520ece0a7d2a347b7;hb=441dbb500b4344a8e3125e5aabab4f9dbf72514f;hp=00a91dc25d164154fac1326f39129257bc72c94f;hpb=dad2ad82c5f058367df79de022bd12d36afcd065;p=linux-2.6

diff --git a/fs/binfmt_som.c b/fs/binfmt_som.c
index 00a91dc25d..fdc36bfd6a 100644
--- a/fs/binfmt_som.c
+++ b/fs/binfmt_som.c
@@ -32,7 +32,6 @@
 #include <asm/uaccess.h>
 #include <asm/pgtable.h>
 
-#include <linux/config.h>
 
 #include <linux/elf.h>
 
@@ -44,7 +43,7 @@ static int load_som_library(struct file *);
  * don't even try.
  */
 #if 0
-static int som_core_dump(long signr, struct pt_regs * regs);
+static int som_core_dump(long signr, struct pt_regs *regs, unsigned long limit);
 #else
 #define som_core_dump	NULL
 #endif
@@ -209,15 +208,18 @@ load_som_binary(struct linux_binprm * bprm, struct pt_regs * regs)
 	size = som_ex->aux_header_size;
 	if (size > SOM_PAGESIZE)
 		goto out;
-	hpuxhdr = (struct som_exec_auxhdr *) kmalloc(size, GFP_KERNEL);
+	hpuxhdr = kmalloc(size, GFP_KERNEL);
 	if (!hpuxhdr)
 		goto out;
 
 	retval = kernel_read(bprm->file, som_ex->aux_header_location,
 			(char *) hpuxhdr, size);
-	if (retval < 0)
+	if (retval != size) {
+		if (retval >= 0)
+			retval = -EIO;
 		goto out_free;
-#error "Fix security hole before enabling me"
+	}
+
 	retval = get_unused_fd();
 	if (retval < 0)
 		goto out_free;