diff options
| author | Pavel Skripkin <paskripkin@gmail.com> | 2024-06-20 23:30:23 +0300 |
|---|---|---|
| committer | Aleksandr Nogikh <nogikh@google.com> | 2024-06-25 09:05:00 +0000 |
| commit | 20dfeeccf56975c0bc5e488d897dfd90e2650641 (patch) | |
| tree | ede65983edfb87f894e8c9e1fa5fea0e459f11f4 | |
| parent | 04bd2a300f55d565ac5bfaa670c9902d2881fa4b (diff) | |
executor/linux: fix compilation error with old compilers
My gcc-10 in testing vm compainls during reproducer [0] build with
following error:
rep.c: In function ‘remove_dir’:
rep.c:662:3: error: a label can only be part of a statement and a declaration is not a statement
662 | const int umount_flags = MNT_FORCE | UMOUNT_NOFOLLOW;
| ^~~~~
Label followed by declaration is C23 extension, so only new compilers
support it.
Fix it by moving declaration above `retry` label and put unused attribute
to suppress possible warning.
[0] https://syzkaller.appspot.com/bug?extid=dcc068159182a4c31ca3
Signed-off-by: Pavel Skripkin <paskripkin@gmail.com>
| -rw-r--r-- | executor/common_linux.h | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/executor/common_linux.h b/executor/common_linux.h index 15ad0ce69..f00b6be90 100644 --- a/executor/common_linux.h +++ b/executor/common_linux.h @@ -4528,13 +4528,20 @@ static void remove_dir(const char* dir) { int iter = 0; DIR* dp = 0; -retry: + #if SYZ_EXECUTOR || !SYZ_SANDBOX_ANDROID // Starting from v6.9, it does no longer make sense to use MNT_DETACH, because // a loop device may only be reused in RW mode if no mounted filesystem keeps a // reference to it. So we have to umount them synchronously. // MNT_FORCE should hopefully prevent hangs for filesystems that may require a complex cleanup. + // + // This declaration should not be moved under retry label, since label followed by a declaration + // is not supported by old compilers. const int umount_flags = MNT_FORCE | UMOUNT_NOFOLLOW; +#endif + +retry: +#if SYZ_EXECUTOR || !SYZ_SANDBOX_ANDROID #if SYZ_EXECUTOR if (!flag_sandbox_android) #endif |