]> git.baikalelectronics.ru Git - kernel.git/commitdiff
binfmt: a.out: Fix bogus semicolon
authorGeert Uytterhoeven <geert@linux-m68k.org>
Sun, 5 Sep 2021 09:30:34 +0000 (11:30 +0200)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sun, 5 Sep 2021 17:15:05 +0000 (10:15 -0700)
    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: cd9a07da9a5e8b0b ("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>
fs/binfmt_aout.c

index a47496d0f123355c561a2febe22698ceee451c76..0dcfc691e7e218bc8db705a4ca1f7f69e445a697 100644 (file)
@@ -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)