Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 53112488 authored by Kirill A. Shutemov's avatar Kirill A. Shutemov Committed by Linus Torvalds
Browse files

alpha: introduce field 'taso' into struct linux_binprm 



This change is Alpha-specific.  It adds field 'taso' into struct
linux_binprm to remember if the application is TASO.  Previously, field
sh_bang was used for this purpose.

Signed-off-by: default avatarKirill A. Shutemov <kirill@shutemov.name>
Cc: Richard Henderson <rth@twiddle.net>
Cc: Ivan Kokshaysky <ink@jurassic.park.msu.ru>
Cc: Pavel Emelyanov <xemul@openvz.org>
Cc: Alexander Viro <viro@zeniv.linux.org.uk>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent cde162c2

arch/alpha/include/asm/a.out.h

+1 −1
Original line number Diff line number Diff line
@@ -95,7 +95,7 @@ struct exec 
   Worse, we have to notice the start address before swapping to use

   /sbin/loader, which of course is _not_ a TASO application.  */

#define SET_AOUT_PERSONALITY(BFPM, EX) \

	set_personality (((BFPM->sh_bang || EX.ah.entry < 0x100000000L \

	set_personality (((BFPM->taso || EX.ah.entry < 0x100000000L \

			   ? ADDR_LIMIT_32BIT : 0) | PER_OSF4))



#endif /* __KERNEL__ */

fs/exec.c

+1 −1
Original line number Diff line number Diff line
@@ -1189,7 +1189,7 @@ int search_binary_handler(struct linux_binprm *bprm,struct pt_regs *regs) 
			return retval;



		/* Remember if the application is TASO.  */

		bprm->sh_bang = eh->ah.entry < 0x100000000UL;

		bprm->taso = eh->ah.entry < 0x100000000UL;



		bprm->file = file;

		bprm->loader = loader;

include/linux/binfmts.h

+3 −0
Original line number Diff line number Diff line
@@ -36,6 +36,9 @@ struct linux_binprm{ 
	unsigned long p; /* current top of mem */

	unsigned int sh_bang:1,

		     misc_bang:1;

#ifdef __alpha__

	unsigned int taso:1;

#endif

	struct file * file;

	int e_uid, e_gid;

	kernel_cap_t cap_post_exec_permitted;