rpms/kernel/devel linux-2.6-execshield.patch,1.70,1.71

[Dave Jones (davej)]

Author: davej

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26460

Modified Files:
	linux-2.6-execshield.patch 
Log Message:
coding style police

linux-2.6-execshield.patch:

Index: linux-2.6-execshield.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-execshield.patch,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -r1.70 -r1.71
--- linux-2.6-execshield.patch	3 Aug 2007 00:12:39 -0000	1.70
+++ linux-2.6-execshield.patch	3 Aug 2007 16:45:32 -0000	1.71
@@ -146,7 +146,7 @@
 +
 +static int __init setup_exec_shield(char *str)
 +{
-+	get_option (&str, &exec_shield);
++	get_option(&str, &exec_shield);
 +
 +	return 1;
 +}
@@ -241,10 +241,10 @@
  	if (file && file->f_op && file->f_op->get_unmapped_area)
  		get_area = file->f_op->get_unmapped_area;
  	addr = get_area(file, addr, len, pgoff, flags);
-@@ -1393,7 +1405,73 @@ get_unmapped_area(struct file *file, uns
+@@ -1393,7 +1405,72 @@ get_unmapped_area(struct file *file, uns
  	return addr;
  }
- 
+-
 -EXPORT_SYMBOL(get_unmapped_area);
 +EXPORT_SYMBOL(get_unmapped_area_prot);
 +
@@ -293,8 +293,8 @@
 +			 */
 +			if (addr >= 0x01000000) {
 +				tmp = randomize_range(0x01000000,
-+					PAGE_ALIGN(max(mm->start_brk, (unsigned long)0x08000000)),
-+					len);
++					PAGE_ALIGN(max(mm->start_brk,
++					(unsigned long)0x08000000)), len);
 +				vma = find_vma(mm, tmp);
 +				if (TASK_SIZE - len >= tmp &&
 +				    (!vma || tmp + len <= vma->vm_start))
@@ -417,7 +417,7 @@
 +				error_code, error_code/8, regs->eip, smp_processor_id());
 +			printk(KERN_ERR "exec_limit: %08lx, user_cs: %08lx/%08lx, CPU_cs: %08lx/%08lx.\n",
 +				current->mm->context.exec_limit, desc1->a, desc1->b, desc2->a, desc2->b);
-+			}
++		}
 +		load_user_cs_desc(cpu, current->mm);
 +		return 1;
 +	}
@@ -436,18 +436,18 @@
 + */
 +fastcall void do_iret_error(struct pt_regs *regs, long error_code)
 +{
-+      int ok = check_lazy_exec_limit(get_cpu(), regs, error_code);
-+      put_cpu();
-+      if (!ok && notify_die(DIE_TRAP, "iret exception", regs,
-+                            error_code, 32, SIGSEGV) != NOTIFY_STOP) {
-+              siginfo_t info;
-+              info.si_signo = SIGSEGV;
-+              info.si_errno = 0;
-+              info.si_code = ILL_BADSTK;
-+              info.si_addr = 0;
-+              do_trap(32, SIGSEGV, "iret exception", 0, regs, error_code,
-+                      &info);
-+      }
++	int ok = check_lazy_exec_limit(get_cpu(), regs, error_code);
++	put_cpu();
++	if (!ok && notify_die(DIE_TRAP, "iret exception", regs,
++	    error_code, 32, SIGSEGV) != NOTIFY_STOP) {
++		siginfo_t info;
++		info.si_signo = SIGSEGV;
++		info.si_errno = 0;
++		info.si_code = ILL_BADSTK;
++		info.si_addr = 0;
++		do_trap(32, SIGSEGV, "iret exception", 0, regs, error_code,
++			&info);
++	}
 +}
 +
  
@@ -1380,7 +1380,7 @@
  
  static unsigned long
 -elf32_map (struct file *filep, unsigned long addr, struct elf_phdr *eppnt, int prot, int type)
-+elf32_map (struct file *filep, unsigned long addr, struct elf_phdr *eppnt, int prot, int type, unsigned long unused)
++elf32_map(struct file *filep, unsigned long addr, struct elf_phdr *eppnt, int prot, int type, unsigned long unused)
  {
  	unsigned long pgoff = (eppnt->p_vaddr) & ~IA32_PAGE_MASK;
  
@@ -1393,7 +1393,7 @@
  static int load_elf_binary(struct linux_binprm *bprm, struct pt_regs *regs);
  static int load_elf_library(struct file *);
 -static unsigned long elf_map (struct file *, unsigned long, struct elf_phdr *, int, int);
-+static unsigned long elf_map (struct file *, unsigned long, struct elf_phdr *, int, int, unsigned long);
++static unsigned long elf_map(struct file *, unsigned long, struct elf_phdr *, int, int, unsigned long);
  
  /*
   * If we don't support core dumping, then supply a NULL so we
@@ -1568,7 +1568,7 @@
  
  		error = elf_map(bprm->file, load_bias + vaddr, elf_ppnt,
 -				elf_prot, elf_flags);
-+				elf_prot, elf_flags,0);
++				elf_prot, elf_flags, 0);
  		if (BAD_ADDR(error)) {
  			send_sig(SIGKILL, current, 0);
  			retval = IS_ERR((void *)error) ?