diff options
| author |   Geert Uytterhoeven <geert@linux-m68k.org> | 2021-09-05 11:30:34 +0200 |
|---|---|---|
| committer |   Linus Torvalds <torvalds@linux-foundation.org> | 2021-09-05 10:15:05 -0700 |
| commit | 0319b848b155185815724e1b46103c550627a845 (patch) | |
| tree | ad08827f8d344e2bcc5d158132f93ad17b1c411a /fs/binfmt_aout.c | |
| parent | Merge tag 'denywrite-for-5.15' of git://github.com/davidhildenbrand/linux (diff) | |
| download | linux-dev-0319b848b155185815724e1b46103c550627a845.tar.xz linux-dev-0319b848b155185815724e1b46103c550627a845.zip | |
binfmt: a.out: Fix bogus semicolon
fs/binfmt_aout.c: In function ‘load_aout_library’:
fs/binfmt_aout.c:311:27: error: expected ‘)’ before ‘;’ token
311 | MAP_FIXED | MAP_PRIVATE;
| ^
fs/binfmt_aout.c:309:10: error: too few arguments to function ‘vm_mmap’
309 | error = vm_mmap(file, start_addr, ex.a_text + ex.a_data,
| ^~~~~~~
In file included from fs/binfmt_aout.c:12:
include/linux/mm.h:2626:35: note: declared here
2626 | extern unsigned long __must_check vm_mmap(struct file *, unsigned long,
| ^~~~~~~
Fix this by reverting the accidental replacement of a comma by a
semicolon.
Fixes: 42be8b42535183f8 ("binfmt: don't use MAP_DENYWRITE when loading shared libraries via uselib()")
Reported-by: noreply@ellerman.id.au
Reported-by: Guenter Roeck <linux@roeck-us.net>
Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'fs/binfmt_aout.c')
| -rw-r--r-- | fs/binfmt_aout.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/binfmt_aout.c b/fs/binfmt_aout.c index a47496d0f123..0dcfc691e7e2 100644 --- a/fs/binfmt_aout.c +++ b/fs/binfmt_aout.c @@ -308,7 +308,7 @@ static int load_aout_library(struct file *file) /* Now use mmap to map the library into memory. */ error = vm_mmap(file, start_addr, ex.a_text + ex.a_data, PROT_READ | PROT_WRITE | PROT_EXEC, - MAP_FIXED | MAP_PRIVATE; + MAP_FIXED | MAP_PRIVATE, N_TXTOFF(ex)); retval = error; if (error != start_addr) |