Page MenuHomeFreeBSD
Differential D7973

Linux ARM v2 4/9
ClosedPublic
Actions

Authored by emaste on Sep 20 2016, 2:02 PM.
Tags
Referenced Files
F115259821: D7973.id21014.diff
Mon, Apr 21, 11:27 PM
Unknown Object (File)
Mon, Apr 14, 7:13 AM
Unknown Object (File)
Wed, Mar 26, 1:35 PM
Unknown Object (File)
Tue, Mar 25, 9:56 AM
Unknown Object (File)
Mar 22 2025, 1:36 AM
Unknown Object (File)
Mar 17 2025, 1:19 AM
Unknown Object (File)
Mar 16 2025, 2:06 AM
Unknown Object (File)
Mar 12 2025, 6:13 PM
View All Files
Subscribers
emaste
imp

Details

Reviewers
gonzo
manu
cognet
andrew
imp
soutade_gmail.com
brooks
Commits
rS355615: arm linuxulator: add syscalls.conf and Makefile for "make sysent"
Summary

Linux ARM : Add generated files by 'make sysent' in sys/arm/linux directory

Diff Detail

Lint
Lint Skipped
Unit
Tests Skipped

Event Timeline

soutade_gmail.com updated this revision to Diff 20533.Sep 20 2016, 2:02 PM
soutade_gmail.com retitled this revision from to Linux ARM v2 4/9.
soutade_gmail.com updated this object.
soutade_gmail.com edited the test plan for this revision. (Show Details)
soutade_gmail.com added reviewers: manu, andrew, cognet, dchagin, gonzo.
soutade_gmail.com set the repository for this revision to rS FreeBSD src repository - subversion.
soutade_gmail.com added projects: ARM, Linux Emulation.
Herald added a subscriber: imp. · View Herald TranscriptSep 20 2016, 2:02 PM
imp accepted this revision.Sep 20 2016, 3:39 PM
imp added a reviewer: imp.

If this is just generated code, it doesn't need a code review :)

This revision is now accepted and ready to land.Sep 20 2016, 3:39 PM
soutade_gmail.com updated this revision to Diff 21014.Oct 4 2016, 8:44 AM
soutade_gmail.com edited edge metadata.

Remove old Linux syscalls (not presents in Linux calls.S)

This revision now requires review to proceed.Oct 4 2016, 8:44 AM
soutade_gmail.com updated this revision to Diff 21021.Oct 4 2016, 12:46 PM
soutade_gmail.com edited edge metadata.

Remove obsolete syscalls. Add linux_send() and linux_recv()

emaste added a subscriber: emaste.Jun 17 2017, 9:08 PM
This revision is now accepted and ready to land.Jun 17 2017, 9:08 PM
dchagin removed a reviewer: dchagin.Apr 30 2019, 6:26 PM
emaste added a comment.May 6 2019, 5:21 PM
In D7973#164964, @imp wrote:

If this is just generated code, it doesn't need a code review :)

The Makefile isn't

sys/arm/linux/Makefile
13–17

What is the story behind these mvs?

emaste commandeered this revision.May 6 2019, 5:32 PM
emaste updated this revision to Diff 57092.
emaste added a reviewer: soutade_gmail.com.

Reformat arm linux syscalls.master per current style

Equivalent to rS339958 for sys/kern/syscalls.master.

Sponsored by: The FreeBSD Foundation

This revision now requires review to proceed.May 6 2019, 5:33 PM
Herald added a reviewer: brooks. · View Herald TranscriptMay 6 2019, 5:33 PM
emaste added inline comments.May 6 2019, 5:35 PM
sys/arm/linux/syscalls.master
3–25 ↗(On Diff #57092)

will also remove this boilerplate as has been done in arm64 linuxulator syscalls.master.

emaste added a comment.May 6 2019, 7:49 PM

Oops, updated this review with the diff intended for D7972.

emaste updated this revision to Diff 57131.May 7 2019, 1:25 PM

Upload rebased and updated diff - add arm linuxulator syscalls.conf and Makefile, from arm64

This revision was not accepted when it landed; it landed in state Needs Review.Dec 11 2019, 5:28 PM
Closed by commit rS355615: arm linuxulator: add syscalls.conf and Makefile for "make sysent" (authored by emaste). · Explain Why
This revision was automatically updated to reflect the committed changes.
emaste added a commit: rS355615: arm linuxulator: add syscalls.conf and Makefile for "make sysent".
emaste added a parent revision: D7972: Linux ARM v2 3/9.Oct 12 2021, 1:22 PM
emaste added a child revision: D7974: Linux ARM v2 5/9.

Revision Contents
Changeset List

Diff 57131

View Options

sys/arm/linux/Makefile

Show All 24 Lines
* *
* $FreeBSD$ * $FreeBSD$
*/ */
#include <sys/cdefs.h> #include <sys/cdefs.h>
__FBSDID("$FreeBSD$"); __FBSDID("$FreeBSD$");
#include <sys/param.h> #include <sys/param.h>
#ifndef WITHOUT_CAPSICUM
#include <sys/capsicum.h>
#endif
#include <sys/queue.h> #include <sys/queue.h>
#include <sys/errno.h> #include <sys/errno.h>
#include <sys/stat.h> #include <sys/stat.h>
#include <sys/ioctl.h> #include <sys/ioctl.h>
#include <sys/disk.h> #include <sys/disk.h>
#include <assert.h> #include <assert.h>
#include <err.h> #include <err.h>
#include <fcntl.h> #include <fcntl.h>
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include <pthread.h> #include <pthread.h>
#include <pthread_np.h> #include <pthread_np.h>
#include <signal.h> #include <signal.h>
#include <sysexits.h>
#include <unistd.h> #include <unistd.h>
#include <machine/atomic.h> #include <machine/atomic.h>
#include "bhyverun.h" #include "bhyverun.h"
#include "mevent.h" #include "mevent.h"
#include "block_if.h" #include "block_if.h"
▲ Show 20 Lines • Show All 339 Lines • ▼ Show 20 Linesblockif_open(const char *optstr, const char *ident)
char name[MAXPATHLEN]; char name[MAXPATHLEN];
char *nopt, *xopts, *cp; char *nopt, *xopts, *cp;
struct blockif_ctxt *bc; struct blockif_ctxt *bc;
struct stat sbuf; struct stat sbuf;
struct diocgattr_arg arg; struct diocgattr_arg arg;
off_t size, psectsz, psectoff; off_t size, psectsz, psectoff;
int extra, fd, i, sectsz; int extra, fd, i, sectsz;
int nocache, sync, ro, candelete, geom, ssopt, pssopt; int nocache, sync, ro, candelete, geom, ssopt, pssopt;
#ifndef WITHOUT_CAPSICUM
cap_rights_t rights;
u_long cmds[] = {DIOCGFLUSH, DIOCGDELETE};
#endif
pthread_once(&blockif_once, blockif_init); pthread_once(&blockif_once, blockif_init);
fd = -1; fd = -1;
ssopt = 0; ssopt = 0;
nocache = 0; nocache = 0;
sync = 0; sync = 0;
ro = 0; ro = 0;
▲ Show 20 Lines • Show All 41 Lines • ▼ Show 20 Lines if (fd < 0) {
goto err; goto err;
} }
if (fstat(fd, &sbuf) < 0) { if (fstat(fd, &sbuf) < 0) {
warn("Could not stat backing file %s", nopt); warn("Could not stat backing file %s", nopt);
goto err; goto err;
} }
#ifndef WITHOUT_CAPSICUM
grehanUnsubmitted
Not Done
Inline Actions

fsync needs to be added here, or an ahci-hd file-backed disk image will fail on FreeBSD guest shutdown with

(ada0:ahcich0:0:0:0): FLUSHCACHE48. ACB: ea 00 00 00 00 40 00 00 00 00 00 00
(ada0:ahcich0:0:0:0): CAM status: ATA Status Error
(ada0:ahcich0:0:0:0): ATA status: 41 (DRDY ERR), error: 04 (ABRT )
(ada0:ahcich0:0:0:0): RES: 41 04 00 00 00 40 00 00 00 00 00
(ada0:ahcich0:0:0:0): Retrying command
(ada0:ahcich0:0:0:0): FLUSHCACHE48. ACB: ea 00 00 00 00 40 00 00 00 00 00 00
(ada0:ahcich0:0:0:0): CAM status: ATA Status Error
(ada0:ahcich0:0:0:0): ATA status: 41 (DRDY ERR), error: 04 (ABRT )
(ada0:ahcich0:0:0:0): RES: 41 04 00 00 00 40 00 00 00 00 00
(ada0:ahcich0:0:0:0): Error 5, Retries exhausted
(ada0:ahcich0:0:0:0): Synchronize cache failed

#ifndef WITHOUT_CAPSICUM

  • cap_rights_init(&rights, CAP_IOCTL, CAP_READ, CAP_SEEK, CAP_WRITE);
  • if (ro)

+ cap_rights_init(&rights, CAP_IOCTL, CAP_READ, CAP_SEEK, CAP_WRITE,
+ CAP_FSYNC);
+ if (ro) {

		cap_rights_clear(&rights, CAP_WRITE);

+ cap_rights_clear(&rights, CAP_FSYNC);
+ }

grehan: fsync needs to be added here, or an ahci-hd file-backed disk image will fail on FreeBSD guest…
cap_rights_init(&rights, CAP_IOCTL, CAP_READ, CAP_SEEK, CAP_WRITE);
if (ro)
cap_rights_clear(&rights, CAP_WRITE);
oshogboUnsubmitted
Not Done
Inline Actions

I'm not sure if here the reverse logic would be more secure.

oshogbo: I'm not sure if here the reverse logic would be more secure.
emasteUnsubmitted
Not Done
Inline Actions

That is:

cap_rights_init(&rights, CAP_IOCTL, CAP_READ, CAP_SEEK);
if (!ro)
        cap_rights_set(&rights, CAP_FSYNC, CAP_WRITE);

I agree that looks preferable.

emaste: That is: ``` cap_rights_init(&rights, CAP_IOCTL, CAP_READ, CAP_SEEK); if (!ro)…
if (cap_rights_limit(fd, &rights) == -1 && errno != ENOSYS)
errx(EX_OSERR, "Unable to apply rights for sandbox");
#endif
/* /*
* Deal with raw devices * Deal with raw devices
*/ */
size = sbuf.st_size; size = sbuf.st_size;
sectsz = DEV_BSIZE; sectsz = DEV_BSIZE;
psectsz = psectoff = 0; psectsz = psectoff = 0;
candelete = geom = 0; candelete = geom = 0;
if (S_ISCHR(sbuf.st_mode)) { if (S_ISCHR(sbuf.st_mode)) {
Show All 9 Lines if (S_ISCHR(sbuf.st_mode)) {
strlcpy(arg.name, "GEOM::candelete", sizeof(arg.name)); strlcpy(arg.name, "GEOM::candelete", sizeof(arg.name));
arg.len = sizeof(arg.value.i); arg.len = sizeof(arg.value.i);
if (ioctl(fd, DIOCGATTR, &arg) == 0) if (ioctl(fd, DIOCGATTR, &arg) == 0)
candelete = arg.value.i; candelete = arg.value.i;
if (ioctl(fd, DIOCGPROVIDERNAME, name) == 0) if (ioctl(fd, DIOCGPROVIDERNAME, name) == 0)
geom = 1; geom = 1;
} else } else
psectsz = sbuf.st_blksize; psectsz = sbuf.st_blksize;
#ifndef WITHOUT_CAPSICUM
if (cap_ioctls_limit(fd, cmds, nitems(cmds)) == -1 && errno != ENOSYS)
errx(EX_OSERR, "Unable to apply rights for sandbox");
#endif
if (ssopt != 0) { if (ssopt != 0) {
if (!powerof2(ssopt) || !powerof2(pssopt) || ssopt < 512 || if (!powerof2(ssopt) || !powerof2(pssopt) || ssopt < 512 ||
ssopt > pssopt) { ssopt > pssopt) {
fprintf(stderr, "Invalid sector size %d/%d\n", fprintf(stderr, "Invalid sector size %d/%d\n",
ssopt, pssopt); ssopt, pssopt);
goto err; goto err;
} }
▲ Show 20 Lines • Show All 329 Lines • Show Last 20 Lines
View Options

sys/arm/linux/linux_proto.h

Show All 24 Lines
* *
* $FreeBSD$ * $FreeBSD$
*/ */
#include <sys/cdefs.h> #include <sys/cdefs.h>
__FBSDID("$FreeBSD$"); __FBSDID("$FreeBSD$");
#include <sys/param.h> #include <sys/param.h>
#ifndef WITHOUT_CAPSICUM
#include <sys/capsicum.h>
#endif
#include <sys/queue.h> #include <sys/queue.h>
#include <sys/errno.h> #include <sys/errno.h>
#include <sys/stat.h> #include <sys/stat.h>
#include <sys/ioctl.h> #include <sys/ioctl.h>
#include <sys/disk.h> #include <sys/disk.h>
#include <assert.h> #include <assert.h>
#include <err.h> #include <err.h>
#include <fcntl.h> #include <fcntl.h>
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include <pthread.h> #include <pthread.h>
#include <pthread_np.h> #include <pthread_np.h>
#include <signal.h> #include <signal.h>
#include <sysexits.h>
#include <unistd.h> #include <unistd.h>
#include <machine/atomic.h> #include <machine/atomic.h>
#include "bhyverun.h" #include "bhyverun.h"
#include "mevent.h" #include "mevent.h"
#include "block_if.h" #include "block_if.h"
▲ Show 20 Lines • Show All 339 Lines • ▼ Show 20 Linesblockif_open(const char *optstr, const char *ident)
char name[MAXPATHLEN]; char name[MAXPATHLEN];
char *nopt, *xopts, *cp; char *nopt, *xopts, *cp;
struct blockif_ctxt *bc; struct blockif_ctxt *bc;
struct stat sbuf; struct stat sbuf;
struct diocgattr_arg arg; struct diocgattr_arg arg;
off_t size, psectsz, psectoff; off_t size, psectsz, psectoff;
int extra, fd, i, sectsz; int extra, fd, i, sectsz;
int nocache, sync, ro, candelete, geom, ssopt, pssopt; int nocache, sync, ro, candelete, geom, ssopt, pssopt;
#ifndef WITHOUT_CAPSICUM
cap_rights_t rights;
u_long cmds[] = {DIOCGFLUSH, DIOCGDELETE};
#endif
pthread_once(&blockif_once, blockif_init); pthread_once(&blockif_once, blockif_init);
fd = -1; fd = -1;
ssopt = 0; ssopt = 0;
nocache = 0; nocache = 0;
sync = 0; sync = 0;
ro = 0; ro = 0;
▲ Show 20 Lines • Show All 41 Lines • ▼ Show 20 Lines if (fd < 0) {
goto err; goto err;
} }
if (fstat(fd, &sbuf) < 0) { if (fstat(fd, &sbuf) < 0) {
warn("Could not stat backing file %s", nopt); warn("Could not stat backing file %s", nopt);
goto err; goto err;
} }
#ifndef WITHOUT_CAPSICUM
grehanUnsubmitted
Not Done
Inline Actions

fsync needs to be added here, or an ahci-hd file-backed disk image will fail on FreeBSD guest shutdown with

(ada0:ahcich0:0:0:0): FLUSHCACHE48. ACB: ea 00 00 00 00 40 00 00 00 00 00 00
(ada0:ahcich0:0:0:0): CAM status: ATA Status Error
(ada0:ahcich0:0:0:0): ATA status: 41 (DRDY ERR), error: 04 (ABRT )
(ada0:ahcich0:0:0:0): RES: 41 04 00 00 00 40 00 00 00 00 00
(ada0:ahcich0:0:0:0): Retrying command
(ada0:ahcich0:0:0:0): FLUSHCACHE48. ACB: ea 00 00 00 00 40 00 00 00 00 00 00
(ada0:ahcich0:0:0:0): CAM status: ATA Status Error
(ada0:ahcich0:0:0:0): ATA status: 41 (DRDY ERR), error: 04 (ABRT )
(ada0:ahcich0:0:0:0): RES: 41 04 00 00 00 40 00 00 00 00 00
(ada0:ahcich0:0:0:0): Error 5, Retries exhausted
(ada0:ahcich0:0:0:0): Synchronize cache failed

#ifndef WITHOUT_CAPSICUM

  • cap_rights_init(&rights, CAP_IOCTL, CAP_READ, CAP_SEEK, CAP_WRITE);
  • if (ro)

+ cap_rights_init(&rights, CAP_IOCTL, CAP_READ, CAP_SEEK, CAP_WRITE,
+ CAP_FSYNC);
+ if (ro) {

		cap_rights_clear(&rights, CAP_WRITE);

+ cap_rights_clear(&rights, CAP_FSYNC);
+ }

grehan: fsync needs to be added here, or an ahci-hd file-backed disk image will fail on FreeBSD guest…
cap_rights_init(&rights, CAP_IOCTL, CAP_READ, CAP_SEEK, CAP_WRITE);
if (ro)
cap_rights_clear(&rights, CAP_WRITE);
oshogboUnsubmitted
Not Done
Inline Actions

I'm not sure if here the reverse logic would be more secure.

oshogbo: I'm not sure if here the reverse logic would be more secure.
emasteUnsubmitted
Not Done
Inline Actions

That is:

cap_rights_init(&rights, CAP_IOCTL, CAP_READ, CAP_SEEK);
if (!ro)
        cap_rights_set(&rights, CAP_FSYNC, CAP_WRITE);

I agree that looks preferable.

emaste: That is: ``` cap_rights_init(&rights, CAP_IOCTL, CAP_READ, CAP_SEEK); if (!ro)…
if (cap_rights_limit(fd, &rights) == -1 && errno != ENOSYS)
errx(EX_OSERR, "Unable to apply rights for sandbox");
#endif
/* /*
* Deal with raw devices * Deal with raw devices
*/ */
size = sbuf.st_size; size = sbuf.st_size;
sectsz = DEV_BSIZE; sectsz = DEV_BSIZE;
psectsz = psectoff = 0; psectsz = psectoff = 0;
candelete = geom = 0; candelete = geom = 0;
if (S_ISCHR(sbuf.st_mode)) { if (S_ISCHR(sbuf.st_mode)) {
Show All 9 Lines if (S_ISCHR(sbuf.st_mode)) {
strlcpy(arg.name, "GEOM::candelete", sizeof(arg.name)); strlcpy(arg.name, "GEOM::candelete", sizeof(arg.name));
arg.len = sizeof(arg.value.i); arg.len = sizeof(arg.value.i);
if (ioctl(fd, DIOCGATTR, &arg) == 0) if (ioctl(fd, DIOCGATTR, &arg) == 0)
candelete = arg.value.i; candelete = arg.value.i;
if (ioctl(fd, DIOCGPROVIDERNAME, name) == 0) if (ioctl(fd, DIOCGPROVIDERNAME, name) == 0)
geom = 1; geom = 1;
} else } else
psectsz = sbuf.st_blksize; psectsz = sbuf.st_blksize;
#ifndef WITHOUT_CAPSICUM
if (cap_ioctls_limit(fd, cmds, nitems(cmds)) == -1 && errno != ENOSYS)
errx(EX_OSERR, "Unable to apply rights for sandbox");
#endif
if (ssopt != 0) { if (ssopt != 0) {
if (!powerof2(ssopt) || !powerof2(pssopt) || ssopt < 512 || if (!powerof2(ssopt) || !powerof2(pssopt) || ssopt < 512 ||
ssopt > pssopt) { ssopt > pssopt) {
fprintf(stderr, "Invalid sector size %d/%d\n", fprintf(stderr, "Invalid sector size %d/%d\n",
ssopt, pssopt); ssopt, pssopt);
goto err; goto err;
} }
▲ Show 20 Lines • Show All 329 Lines • Show Last 20 Lines
View Options

sys/arm/linux/linux_syscall.h

Show All 24 Lines
* *
* $FreeBSD$ * $FreeBSD$
*/ */
#include <sys/cdefs.h> #include <sys/cdefs.h>
__FBSDID("$FreeBSD$"); __FBSDID("$FreeBSD$");
#include <sys/param.h> #include <sys/param.h>
#ifndef WITHOUT_CAPSICUM
#include <sys/capsicum.h>
#endif
#include <sys/queue.h> #include <sys/queue.h>
#include <sys/errno.h> #include <sys/errno.h>
#include <sys/stat.h> #include <sys/stat.h>
#include <sys/ioctl.h> #include <sys/ioctl.h>
#include <sys/disk.h> #include <sys/disk.h>
#include <assert.h> #include <assert.h>
#include <err.h> #include <err.h>
#include <fcntl.h> #include <fcntl.h>
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include <pthread.h> #include <pthread.h>
#include <pthread_np.h> #include <pthread_np.h>
#include <signal.h> #include <signal.h>
#include <sysexits.h>
#include <unistd.h> #include <unistd.h>
#include <machine/atomic.h> #include <machine/atomic.h>
#include "bhyverun.h" #include "bhyverun.h"
#include "mevent.h" #include "mevent.h"
#include "block_if.h" #include "block_if.h"
▲ Show 20 Lines • Show All 339 Lines • ▼ Show 20 Linesblockif_open(const char *optstr, const char *ident)
char name[MAXPATHLEN]; char name[MAXPATHLEN];
char *nopt, *xopts, *cp; char *nopt, *xopts, *cp;
struct blockif_ctxt *bc; struct blockif_ctxt *bc;
struct stat sbuf; struct stat sbuf;
struct diocgattr_arg arg; struct diocgattr_arg arg;
off_t size, psectsz, psectoff; off_t size, psectsz, psectoff;
int extra, fd, i, sectsz; int extra, fd, i, sectsz;
int nocache, sync, ro, candelete, geom, ssopt, pssopt; int nocache, sync, ro, candelete, geom, ssopt, pssopt;
#ifndef WITHOUT_CAPSICUM
cap_rights_t rights;
u_long cmds[] = {DIOCGFLUSH, DIOCGDELETE};
#endif
pthread_once(&blockif_once, blockif_init); pthread_once(&blockif_once, blockif_init);
fd = -1; fd = -1;
ssopt = 0; ssopt = 0;
nocache = 0; nocache = 0;
sync = 0; sync = 0;
ro = 0; ro = 0;
▲ Show 20 Lines • Show All 41 Lines • ▼ Show 20 Lines if (fd < 0) {
goto err; goto err;
} }
if (fstat(fd, &sbuf) < 0) { if (fstat(fd, &sbuf) < 0) {
warn("Could not stat backing file %s", nopt); warn("Could not stat backing file %s", nopt);
goto err; goto err;
} }
#ifndef WITHOUT_CAPSICUM
grehanUnsubmitted
Not Done
Inline Actions

fsync needs to be added here, or an ahci-hd file-backed disk image will fail on FreeBSD guest shutdown with

(ada0:ahcich0:0:0:0): FLUSHCACHE48. ACB: ea 00 00 00 00 40 00 00 00 00 00 00
(ada0:ahcich0:0:0:0): CAM status: ATA Status Error
(ada0:ahcich0:0:0:0): ATA status: 41 (DRDY ERR), error: 04 (ABRT )
(ada0:ahcich0:0:0:0): RES: 41 04 00 00 00 40 00 00 00 00 00
(ada0:ahcich0:0:0:0): Retrying command
(ada0:ahcich0:0:0:0): FLUSHCACHE48. ACB: ea 00 00 00 00 40 00 00 00 00 00 00
(ada0:ahcich0:0:0:0): CAM status: ATA Status Error
(ada0:ahcich0:0:0:0): ATA status: 41 (DRDY ERR), error: 04 (ABRT )
(ada0:ahcich0:0:0:0): RES: 41 04 00 00 00 40 00 00 00 00 00
(ada0:ahcich0:0:0:0): Error 5, Retries exhausted
(ada0:ahcich0:0:0:0): Synchronize cache failed

#ifndef WITHOUT_CAPSICUM

  • cap_rights_init(&rights, CAP_IOCTL, CAP_READ, CAP_SEEK, CAP_WRITE);
  • if (ro)

+ cap_rights_init(&rights, CAP_IOCTL, CAP_READ, CAP_SEEK, CAP_WRITE,
+ CAP_FSYNC);
+ if (ro) {

		cap_rights_clear(&rights, CAP_WRITE);

+ cap_rights_clear(&rights, CAP_FSYNC);
+ }

grehan: fsync needs to be added here, or an ahci-hd file-backed disk image will fail on FreeBSD guest…
cap_rights_init(&rights, CAP_IOCTL, CAP_READ, CAP_SEEK, CAP_WRITE);
if (ro)
cap_rights_clear(&rights, CAP_WRITE);
oshogboUnsubmitted
Not Done
Inline Actions

I'm not sure if here the reverse logic would be more secure.

oshogbo: I'm not sure if here the reverse logic would be more secure.
emasteUnsubmitted
Not Done
Inline Actions

That is:

cap_rights_init(&rights, CAP_IOCTL, CAP_READ, CAP_SEEK);
if (!ro)
        cap_rights_set(&rights, CAP_FSYNC, CAP_WRITE);

I agree that looks preferable.

emaste: That is: ``` cap_rights_init(&rights, CAP_IOCTL, CAP_READ, CAP_SEEK); if (!ro)…
if (cap_rights_limit(fd, &rights) == -1 && errno != ENOSYS)
errx(EX_OSERR, "Unable to apply rights for sandbox");
#endif
/* /*
* Deal with raw devices * Deal with raw devices
*/ */
size = sbuf.st_size; size = sbuf.st_size;
sectsz = DEV_BSIZE; sectsz = DEV_BSIZE;
psectsz = psectoff = 0; psectsz = psectoff = 0;
candelete = geom = 0; candelete = geom = 0;
if (S_ISCHR(sbuf.st_mode)) { if (S_ISCHR(sbuf.st_mode)) {
Show All 9 Lines if (S_ISCHR(sbuf.st_mode)) {
strlcpy(arg.name, "GEOM::candelete", sizeof(arg.name)); strlcpy(arg.name, "GEOM::candelete", sizeof(arg.name));
arg.len = sizeof(arg.value.i); arg.len = sizeof(arg.value.i);
if (ioctl(fd, DIOCGATTR, &arg) == 0) if (ioctl(fd, DIOCGATTR, &arg) == 0)
candelete = arg.value.i; candelete = arg.value.i;
if (ioctl(fd, DIOCGPROVIDERNAME, name) == 0) if (ioctl(fd, DIOCGPROVIDERNAME, name) == 0)
geom = 1; geom = 1;
} else } else
psectsz = sbuf.st_blksize; psectsz = sbuf.st_blksize;
#ifndef WITHOUT_CAPSICUM
if (cap_ioctls_limit(fd, cmds, nitems(cmds)) == -1 && errno != ENOSYS)
errx(EX_OSERR, "Unable to apply rights for sandbox");
#endif
if (ssopt != 0) { if (ssopt != 0) {
if (!powerof2(ssopt) || !powerof2(pssopt) || ssopt < 512 || if (!powerof2(ssopt) || !powerof2(pssopt) || ssopt < 512 ||
ssopt > pssopt) { ssopt > pssopt) {
fprintf(stderr, "Invalid sector size %d/%d\n", fprintf(stderr, "Invalid sector size %d/%d\n",
ssopt, pssopt); ssopt, pssopt);
goto err; goto err;
} }
▲ Show 20 Lines • Show All 329 Lines • Show Last 20 Lines
View Options

sys/arm/linux/linux_syscalls.c

Show All 24 Lines
* *
* $FreeBSD$ * $FreeBSD$
*/ */
#include <sys/cdefs.h> #include <sys/cdefs.h>
__FBSDID("$FreeBSD$"); __FBSDID("$FreeBSD$");
#include <sys/param.h> #include <sys/param.h>
#ifndef WITHOUT_CAPSICUM
#include <sys/capsicum.h>
#endif
#include <sys/queue.h> #include <sys/queue.h>
#include <sys/errno.h> #include <sys/errno.h>
#include <sys/stat.h> #include <sys/stat.h>
#include <sys/ioctl.h> #include <sys/ioctl.h>
#include <sys/disk.h> #include <sys/disk.h>
#include <assert.h> #include <assert.h>
#include <err.h> #include <err.h>
#include <fcntl.h> #include <fcntl.h>
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include <pthread.h> #include <pthread.h>
#include <pthread_np.h> #include <pthread_np.h>
#include <signal.h> #include <signal.h>
#include <sysexits.h>
#include <unistd.h> #include <unistd.h>
#include <machine/atomic.h> #include <machine/atomic.h>
#include "bhyverun.h" #include "bhyverun.h"
#include "mevent.h" #include "mevent.h"
#include "block_if.h" #include "block_if.h"
▲ Show 20 Lines • Show All 339 Lines • ▼ Show 20 Linesblockif_open(const char *optstr, const char *ident)
char name[MAXPATHLEN]; char name[MAXPATHLEN];
char *nopt, *xopts, *cp; char *nopt, *xopts, *cp;
struct blockif_ctxt *bc; struct blockif_ctxt *bc;
struct stat sbuf; struct stat sbuf;
struct diocgattr_arg arg; struct diocgattr_arg arg;
off_t size, psectsz, psectoff; off_t size, psectsz, psectoff;
int extra, fd, i, sectsz; int extra, fd, i, sectsz;
int nocache, sync, ro, candelete, geom, ssopt, pssopt; int nocache, sync, ro, candelete, geom, ssopt, pssopt;
#ifndef WITHOUT_CAPSICUM
cap_rights_t rights;
u_long cmds[] = {DIOCGFLUSH, DIOCGDELETE};
#endif
pthread_once(&blockif_once, blockif_init); pthread_once(&blockif_once, blockif_init);
fd = -1; fd = -1;
ssopt = 0; ssopt = 0;
nocache = 0; nocache = 0;
sync = 0; sync = 0;
ro = 0; ro = 0;
▲ Show 20 Lines • Show All 41 Lines • ▼ Show 20 Lines if (fd < 0) {
goto err; goto err;
} }
if (fstat(fd, &sbuf) < 0) { if (fstat(fd, &sbuf) < 0) {
warn("Could not stat backing file %s", nopt); warn("Could not stat backing file %s", nopt);
goto err; goto err;
} }
#ifndef WITHOUT_CAPSICUM
grehanUnsubmitted
Not Done
Inline Actions

fsync needs to be added here, or an ahci-hd file-backed disk image will fail on FreeBSD guest shutdown with

(ada0:ahcich0:0:0:0): FLUSHCACHE48. ACB: ea 00 00 00 00 40 00 00 00 00 00 00
(ada0:ahcich0:0:0:0): CAM status: ATA Status Error
(ada0:ahcich0:0:0:0): ATA status: 41 (DRDY ERR), error: 04 (ABRT )
(ada0:ahcich0:0:0:0): RES: 41 04 00 00 00 40 00 00 00 00 00
(ada0:ahcich0:0:0:0): Retrying command
(ada0:ahcich0:0:0:0): FLUSHCACHE48. ACB: ea 00 00 00 00 40 00 00 00 00 00 00
(ada0:ahcich0:0:0:0): CAM status: ATA Status Error
(ada0:ahcich0:0:0:0): ATA status: 41 (DRDY ERR), error: 04 (ABRT )
(ada0:ahcich0:0:0:0): RES: 41 04 00 00 00 40 00 00 00 00 00
(ada0:ahcich0:0:0:0): Error 5, Retries exhausted
(ada0:ahcich0:0:0:0): Synchronize cache failed

#ifndef WITHOUT_CAPSICUM

  • cap_rights_init(&rights, CAP_IOCTL, CAP_READ, CAP_SEEK, CAP_WRITE);
  • if (ro)

+ cap_rights_init(&rights, CAP_IOCTL, CAP_READ, CAP_SEEK, CAP_WRITE,
+ CAP_FSYNC);
+ if (ro) {

		cap_rights_clear(&rights, CAP_WRITE);

+ cap_rights_clear(&rights, CAP_FSYNC);
+ }

grehan: fsync needs to be added here, or an ahci-hd file-backed disk image will fail on FreeBSD guest…
cap_rights_init(&rights, CAP_IOCTL, CAP_READ, CAP_SEEK, CAP_WRITE);
if (ro)
cap_rights_clear(&rights, CAP_WRITE);
oshogboUnsubmitted
Not Done
Inline Actions

I'm not sure if here the reverse logic would be more secure.

oshogbo: I'm not sure if here the reverse logic would be more secure.
emasteUnsubmitted
Not Done
Inline Actions

That is:

cap_rights_init(&rights, CAP_IOCTL, CAP_READ, CAP_SEEK);
if (!ro)
        cap_rights_set(&rights, CAP_FSYNC, CAP_WRITE);

I agree that looks preferable.

emaste: That is: ``` cap_rights_init(&rights, CAP_IOCTL, CAP_READ, CAP_SEEK); if (!ro)…
if (cap_rights_limit(fd, &rights) == -1 && errno != ENOSYS)
errx(EX_OSERR, "Unable to apply rights for sandbox");
#endif
/* /*
* Deal with raw devices * Deal with raw devices
*/ */
size = sbuf.st_size; size = sbuf.st_size;
sectsz = DEV_BSIZE; sectsz = DEV_BSIZE;
psectsz = psectoff = 0; psectsz = psectoff = 0;
candelete = geom = 0; candelete = geom = 0;
if (S_ISCHR(sbuf.st_mode)) { if (S_ISCHR(sbuf.st_mode)) {
Show All 9 Lines if (S_ISCHR(sbuf.st_mode)) {
strlcpy(arg.name, "GEOM::candelete", sizeof(arg.name)); strlcpy(arg.name, "GEOM::candelete", sizeof(arg.name));
arg.len = sizeof(arg.value.i); arg.len = sizeof(arg.value.i);
if (ioctl(fd, DIOCGATTR, &arg) == 0) if (ioctl(fd, DIOCGATTR, &arg) == 0)
candelete = arg.value.i; candelete = arg.value.i;
if (ioctl(fd, DIOCGPROVIDERNAME, name) == 0) if (ioctl(fd, DIOCGPROVIDERNAME, name) == 0)
geom = 1; geom = 1;
} else } else
psectsz = sbuf.st_blksize; psectsz = sbuf.st_blksize;
#ifndef WITHOUT_CAPSICUM
if (cap_ioctls_limit(fd, cmds, nitems(cmds)) == -1 && errno != ENOSYS)
errx(EX_OSERR, "Unable to apply rights for sandbox");
#endif
if (ssopt != 0) { if (ssopt != 0) {
if (!powerof2(ssopt) || !powerof2(pssopt) || ssopt < 512 || if (!powerof2(ssopt) || !powerof2(pssopt) || ssopt < 512 ||
ssopt > pssopt) { ssopt > pssopt) {
fprintf(stderr, "Invalid sector size %d/%d\n", fprintf(stderr, "Invalid sector size %d/%d\n",
ssopt, pssopt); ssopt, pssopt);
goto err; goto err;
} }
▲ Show 20 Lines • Show All 329 Lines • Show Last 20 Lines
View Options

sys/arm/linux/linux_sysent.c

Loading...
View Options

sys/arm/linux/linux_systrace_args.c

Loading...
View Options

sys/arm/linux/syscalls.conf

Loading...