reactos/syzkaller
1
0
Fork 0
mirror of https://github.com/reactos/syzkaller.git synced 2025-02-20 03:21:26 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

executor: fix FS_XFLAG_IMMUTABLE for 32-bit mode

Browse Source 
FS_IOC_FSSETXATTR is not supported in compat mode, use FS_IOC_SETFLAGS instead.
This commit is contained in:
Dmitry Vyukov 2018-08-09 16:03:06 +02:00
parent fa9be14164
commit 1fb62d5815
2 changed files with 10 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
executor/common_linux.h
View File

@ -1741,17 +1741,7 @@ static int do_sandbox_namespace(void)
#include <sys/ioctl.h>
#include <sys/mount.h>
// This should be in <linux/fs.h> but is not there on some distros/arches as expected.
struct fsxattr {
uint32 fsx_xflags;
uint32 fsx_extsize;
uint32 fsx_nextents;
uint32 fsx_projid;
uint32 fsx_cowextsize;
char fsx_pad[8];
};
#define FS_IOC_FSSETXATTR _IOW('X', 32, struct fsxattr)
#define FS_IOC_SETFLAGS _IOW('f', 2, long)
// One does not simply remove a directory.
// There can be mounts, so we need to try to umount.
@ -1803,8 +1793,8 @@ retry:
// Try to reset FS_XFLAG_IMMUTABLE.
int fd = open(filename, O_RDONLY);
if (fd != -1) {
struct fsxattr attr = {0};
if (ioctl(fd, FS_IOC_FSSETXATTR, &attr) == 0)
long flags = 0;
if (ioctl(fd, FS_IOC_SETFLAGS, &flags) == 0)
debug("reset FS_XFLAG_IMMUTABLE\n");
close(fd);
continue;
@ -1832,8 +1822,8 @@ retry:
// Try to reset FS_XFLAG_IMMUTABLE.
int fd = open(dir, O_RDONLY);
if (fd != -1) {
struct fsxattr attr = {0};
if (ioctl(fd, FS_IOC_FSSETXATTR, &attr) == 0)
long flags = 0;
if (ioctl(fd, FS_IOC_SETFLAGS, &flags) == 0)
debug("reset FS_XFLAG_IMMUTABLE\n");
close(fd);
continue;

18
pkg/csource/generated.go
View File

@ -3218,16 +3218,8 @@ static int do_sandbox_namespace(void)
#include <string.h>
#include <sys/ioctl.h>
#include <sys/mount.h>
struct fsxattr {
uint32 fsx_xflags;
uint32 fsx_extsize;
uint32 fsx_nextents;
uint32 fsx_projid;
uint32 fsx_cowextsize;
char fsx_pad[8];
};
#define FS_IOC_FSSETXATTR _IOW('X', 32, struct fsxattr)
#define FS_IOC_SETFLAGS _IOW('f', 2, long)
static void remove_dir(const char* dir)
{
DIR* dp;
@ -3267,8 +3259,8 @@ retry:
if (errno == EPERM) {
int fd = open(filename, O_RDONLY);
if (fd != -1) {
struct fsxattr attr = {0};
if (ioctl(fd, FS_IOC_FSSETXATTR, &attr) == 0)
long flags = 0;
if (ioctl(fd, FS_IOC_SETFLAGS, &flags) == 0)
debug("reset FS_XFLAG_IMMUTABLE\n");
close(fd);
continue;
@ -3295,8 +3287,8 @@ retry:
if (errno == EPERM) {
int fd = open(dir, O_RDONLY);
if (fd != -1) {
struct fsxattr attr = {0};
if (ioctl(fd, FS_IOC_FSSETXATTR, &attr) == 0)
long flags = 0;
if (ioctl(fd, FS_IOC_SETFLAGS, &flags) == 0)
debug("reset FS_XFLAG_IMMUTABLE\n");
close(fd);
continue;