Commit abb3438d authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'm68knommu-for-v5.9-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu 

Pull m68knommu fix from Greg Ungerer:
 "Only a single fix for the binfmt_flat loader (reverting a recent
  change)"

* tag 'm68knommu-for-v5.9-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu:
  binfmt_flat: revert "binfmt_flat: don't offset the data start"
parents d7d1f235 2217b982

fs/binfmt_flat.c

+12 −8
Original line number Diff line number Diff line
@@ -576,7 +576,7 @@ static int load_flat_file(struct linux_binprm *bprm, 
			goto err;

		}



		len = data_len + extra;

		len = data_len + extra + MAX_SHARED_LIBS * sizeof(unsigned long);

		len = PAGE_ALIGN(len);

		realdatastart = vm_mmap(NULL, 0, len,

			PROT_READ|PROT_WRITE|PROT_EXEC, MAP_PRIVATE, 0);
@@ -590,7 +590,9 @@ static int load_flat_file(struct linux_binprm *bprm, 
			vm_munmap(textpos, text_len);

			goto err;

		}

		datapos = ALIGN(realdatastart, FLAT_DATA_ALIGN);

		datapos = ALIGN(realdatastart +

				MAX_SHARED_LIBS * sizeof(unsigned long),

				FLAT_DATA_ALIGN);



		pr_debug("Allocated data+bss+stack (%u bytes): %lx\n",

			 data_len + bss_len + stack_len, datapos);
@@ -620,7 +622,7 @@ static int load_flat_file(struct linux_binprm *bprm, 
		memp_size = len;

	} else {



		len = text_len + data_len + extra;

		len = text_len + data_len + extra + MAX_SHARED_LIBS * sizeof(u32);

		len = PAGE_ALIGN(len);

		textpos = vm_mmap(NULL, 0, len,

			PROT_READ | PROT_EXEC | PROT_WRITE, MAP_PRIVATE, 0);
@@ -635,7 +637,9 @@ static int load_flat_file(struct linux_binprm *bprm, 
		}



		realdatastart = textpos + ntohl(hdr->data_start);

		datapos = ALIGN(realdatastart, FLAT_DATA_ALIGN);

		datapos = ALIGN(realdatastart +

				MAX_SHARED_LIBS * sizeof(u32),

				FLAT_DATA_ALIGN);



		reloc = (__be32 __user *)

			(datapos + (ntohl(hdr->reloc_start) - text_len));
@@ -652,7 +656,6 @@ static int load_flat_file(struct linux_binprm *bprm, 
					 (text_len + full_data

						  - sizeof(struct flat_hdr)),

					 0);

			if (datapos != realdatastart)

			memmove((void *) datapos, (void *) realdatastart,

					full_data);

#else
@@ -710,7 +713,8 @@ static int load_flat_file(struct linux_binprm *bprm, 
		if (IS_ERR_VALUE(result)) {

			ret = result;

			pr_err("Unable to read code+data+bss, errno %d\n", ret);

			vm_munmap(textpos, text_len + data_len + extra);

			vm_munmap(textpos, text_len + data_len + extra +

				MAX_SHARED_LIBS * sizeof(u32));

			goto err;

		}

	}

CRA Git | Maintained and supported by SUSTech CRA and CCSE