system/linux
system/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux synced 2024-10-15 07:47:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

binfmt_flat: add endianess annotations

Browse source 
Most binfmt_flat on-disk fields are big endian.  Use the proper __be32
type where applicable.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Tested-by: Vladimir Murzin <vladimir.murzin@arm.com>
Reviewed-by: Vladimir Murzin <vladimir.murzin@arm.com>
Signed-off-by: Greg Ungerer <gerg@linux-m68k.org>
This commit is contained in:
Christoph Hellwig 2019-06-13 09:08:56 +02:00 committed by Greg Ungerer
parent 34b4664ac4
commit 3b97771842
1 changed files with 16 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
fs/binfmt_flat.c
View file

@ -421,7 +421,8 @@ static int load_flat_file(struct linux_binprm *bprm,
unsigned long textpos, datapos, realdatastart; unsigned long textpos, datapos, realdatastart;
u32 text_len, data_len, bss_len, stack_len, full_data, flags; u32 text_len, data_len, bss_len, stack_len, full_data, flags;
unsigned long len, memp, memp_size, extra, rlim; unsigned long len, memp, memp_size, extra, rlim;
u32 __user *reloc, *rp; __be32 __user *reloc;
u32 __user *rp;
struct inode *inode; struct inode *inode;
int i, rev, relocs; int i, rev, relocs;
loff_t fpos; loff_t fpos;
@ -594,7 +595,7 @@ static int load_flat_file(struct linux_binprm *bprm,
goto err; goto err;
} }
reloc = (u32 __user *) reloc = (__be32 __user *)
(datapos + (ntohl(hdr->reloc_start) - text_len)); (datapos + (ntohl(hdr->reloc_start) - text_len));
memp = realdatastart; memp = realdatastart;
memp_size = len; memp_size = len;
@ -619,7 +620,7 @@ static int load_flat_file(struct linux_binprm *bprm,
MAX_SHARED_LIBS * sizeof(u32), MAX_SHARED_LIBS * sizeof(u32),
FLAT_DATA_ALIGN); FLAT_DATA_ALIGN);
reloc = (u32 __user *) reloc = (__be32 __user *)
(datapos + (ntohl(hdr->reloc_start) - text_len)); (datapos + (ntohl(hdr->reloc_start) - text_len));
memp = textpos; memp = textpos;
memp_size = len; memp_size = len;
@ -785,15 +786,16 @@ static int load_flat_file(struct linux_binprm *bprm,
u32 __maybe_unused persistent = 0; u32 __maybe_unused persistent = 0;
for (i = 0; i < relocs; i++) { for (i = 0; i < relocs; i++) {
u32 addr, relval; u32 addr, relval;
__be32 tmp;
/* /*
* Get the address of the pointer to be * Get the address of the pointer to be
* relocated (of course, the address has to be * relocated (of course, the address has to be
* relocated first). * relocated first).
*/ */
if (get_user(relval, reloc + i)) if (get_user(tmp, reloc + i))
return -EFAULT; return -EFAULT;
relval = ntohl(relval); relval = ntohl(tmp);
addr = flat_get_relocate_addr(relval); addr = flat_get_relocate_addr(relval);
rp = (u32 __user *)calc_reloc(addr, libinfo, id, 1); rp = (u32 __user *)calc_reloc(addr, libinfo, id, 1);
if (rp == (u32 __user *)RELOC_FAILED) { if (rp == (u32 __user *)RELOC_FAILED) {
@ -812,8 +814,13 @@ static int load_flat_file(struct linux_binprm *bprm,
* Do the relocation. PIC relocs in the data section are * Do the relocation. PIC relocs in the data section are
* already in target order * already in target order
*/ */
if ((flags & FLAT_FLAG_GOTPIC) == 0) if ((flags & FLAT_FLAG_GOTPIC) == 0) {
addr = ntohl(addr); /*
* Meh, the same value can have a different
* byte order based on a flag..
*/
addr = ntohl((__force __be32)addr);
}
addr = calc_reloc(addr, libinfo, id, 0); addr = calc_reloc(addr, libinfo, id, 0);
if (addr == RELOC_FAILED) { if (addr == RELOC_FAILED) {
ret = -ENOEXEC; ret = -ENOEXEC;
@ -828,11 +835,10 @@ static int load_flat_file(struct linux_binprm *bprm,
} }
} else { } else {
for (i = 0; i < relocs; i++) { for (i = 0; i < relocs; i++) {
u32 relval; __be32 relval;
if (get_user(relval, reloc + i)) if (get_user(relval, reloc + i))
return -EFAULT; return -EFAULT;
relval = ntohl(relval); old_reloc(ntohl(relval));
old_reloc(relval);
} }
} }