- Spectrum Development - spectrum-os.org

[RFC PATCH 1/8] chromiumOSPackages: update 83->89
by Jamie McClymont 02 Apr '21

02 Apr '21

--- .../linux/chromium-os/upstream-info.json | 44 +++++++++---------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/pkgs/os-specific/linux/chromium-os/upstream-info.json b/pkgs/os-specific/linux/chromium-os/upstream-info.json index 7755c48239c..cec5a21b1e4 100644 --- a/pkgs/os-specific/linux/chromium-os/upstream-info.json +++ b/pkgs/os-specific/linux/chromium-os/upstream-info.json @@ -1,66 +1,66 @@ { - "version": "83.13020.0.0-rc1", + "version": "89.13729.0.0-rc1", "components": { "src/aosp/external/minijail": { "name": "minijail", "url": "https://android.googlesource.com/platform/external/minijail", - "rev": "84ffabcf488bf0935f00930a9a23bbce1f34d79f", - "sha256": "0yhbklwmgqws4cb098hpaky4w8if5snpkdabridcc5hk5d7vgild" + "rev": "b49291144e126662b8c7d1551fd1dc572e1d55da", + "sha256": "19z0qrfyh7p2kmsgvm4k053vrzz2w6zysqh3bm2rx0irsdv0pnqm" }, "src/platform/crosvm": { "name": "crosvm", "url": "https://chromium.googlesource.com/chromiumos/platform/crosvm", - "rev": "664cc3ca49cb58d5bf7d936686fd211d6dd728bf", - "sha256": "0rms1hkb3r4w6j3l71gavky6ylc7gi9sfr2rq4dr82v6vc8zxbjx" + "rev": "f35d2c43ff19520855cffee761dc8899c5a439a1", + "sha256": "0fahrcw7x33d21i6azgr787afrhp002f8mvz81ich5w7vk2xjzxr" }, "src/platform/minigbm": { "name": "minigbm", "url": "https://chromium.googlesource.com/chromiumos/platform/minigbm", - "rev": "bc4f023bfcc51cf9dcfcfec5bf4177b2e607dd68", - "sha256": "08ag207199xj5cw686386rmvr7sx2mzihdckm2pnvw743w03gipr" + "rev": "9fe8c20f05116869f86d91fc542a17b9badf9ec3", + "sha256": "0gr81qngfa1g58cz3v9dlms997ry3h5dh7vcv2ak1j53dzfdzckn" }, "src/platform2": { "name": "platform2", "url": "https://chromium.googlesource.com/chromiumos/platform2", - "rev": "e45d54bedee94e0121e12cc86fded46be8b3fa4e", - "sha256": "0ag01p8ch0wn7ds9ywasrdxkbibg19qzf5rldf8nr8irk1n851n7" + "rev": "e6e2faf2abb10fcbca3b6eccdcf7cf2506bcc212", + "sha256": "1g6kxmiffizqlxwakma1rp26p9mwpjbl3cv5hn7k5zd6cn8wixj7" }, "src/third_party/adhd": { "name": "adhd", "url": "https://chromium.googlesource.com/chromiumos/third_party/adhd", - "rev": "d3af897db5540cadc439463a0ffdde07f2b8898a", - "sha256": "1h0xxf338d7fwmfwjlpsjiml8d3v426a95x3ka7qfikdapgmav3d" + "rev": "0458a459ad51cc0b386835f5b909d0d04003ab16", + "sha256": "1y1g0h2dcmgpz9nk2hc6fcb0c53ip3mf27yyf7gg6syx764pr2gb" }, "src/third_party/chromiumos-overlay": { "name": "chromiumos-overlay", "url": "https://chromium.googlesource.com/chromiumos/overlays/chromiumos-overlay", - "rev": "270f5c2cfb7eadc374638076c8fdee72360a6d66", - "sha256": "1d88xvnf0qc3v5hp9b2pafxhi83rph84y2sbk1nc46rhj63m8bwi" + "rev": "dd29be74a5c6fa492411ec7feed734004c6a1ea5", + "sha256": "0pbrbbr39j9zsc10dhhhmwx1c69a40nsv4cprh7biz1b8f840l1b" }, "src/third_party/kernel/v5.4": { "name": "v5.4", "url": "https://chromium.googlesource.com/chromiumos/third_party/kernel", - "rev": "36270ae817fb576debb80bce752addb3a4cc9886", - "sha256": "0h7fj3w9vwmq8a6cx96vjcyw29v7wfamxykh1nx3lmhxxkn120f4", - "version": "5.4.28" + "rev": "eb179ec7ef3e053acb48366e72299055b2b66ca8", + "sha256": "13i7f3742cnw7lm0b2zal4lxbqrkmniajqp5c1gllvrfvxcw4a45", + "version": "5.4.88" }, "src/third_party/libqmi": { "name": "libqmi", "url": "https://chromium.googlesource.com/chromiumos/third_party/libqmi", - "rev": "20726755e60d48c70f0189a1cfe9665a87a5e6c6", - "sha256": "0w04lyd459jgcag70kx6nq1i952fbhy32nmkh6r255xjf2wrliwr" + "rev": "072abd58da99c00b79dbf7e4642fa19fb791aed9", + "sha256": "1a6x5hwghkrvi82szhabxf2by4x7x9pfk6bvpgz0ipz8yqg8fwih" }, "src/third_party/modemmanager-next": { "name": "modemmanager-next", "url": "https://chromium.googlesource.com/chromiumos/third_party/modemmanager-next", - "rev": "988f572cc882a74209fba0f5c49cf0b01b9163a6", - "sha256": "1hiqz7wn1w461sd94v179q81yahisffnw033yix3dwfwagm9ndf8" + "rev": "3eba6678dfe0d7b35f128bb58b63e71d1a3a64d4", + "sha256": "0lviwkkqsv5zmajqdlc0s83yq12ikk0gf7wq9za58p92g0970i4l" }, "src/third_party/modp_b64": { "name": "modp_b64", "url": "https://chromium.googlesource.com/aosp/platform/external/modp_b64", - "rev": "ae26ad8516036774fd3b6e84a98a89955dcf5f61", - "sha256": "03ja5fkq3wk0qcnfnqcj09lciky6n6zdj544xs1jfssjhz9yj8hi" + "rev": "467734f4870d3ab23968f5ebdd461f6112e4103b", + "sha256": "1hlk9vzivy0n3xf9hm9bhj7i09yifirc1af6pli471m00v3s0zvg" } } } -- 2.31.1

2 1

[RFC PATCH 8/8] chromiumOSPackages.crosvm: bump cargoSha256
by Jamie McClymont 02 Apr '21

02 Apr '21

--- pkgs/os-specific/linux/chromium-os/crosvm/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/chromium-os/crosvm/default.nix b/pkgs/os-specific/linux/chromium-os/crosvm/default.nix index ab5ac518ef7..1013e7817e4 100644 --- a/pkgs/os-specific/linux/chromium-os/crosvm/default.nix +++ b/pkgs/os-specific/linux/chromium-os/crosvm/default.nix @@ -42,7 +42,7 @@ in ./default-seccomp-policy-dir.diff ]; - cargoSha256 = "0wzqn2n4vyv3bk39079yg1zbnriagi5xns928bzdqmq9djdcj21i"; + cargoSha256 = "02y4wvm2l54f3y0dzcfyzay4hsy7b1q8x9kshqidi9pvh09if7x4"; nativeBuildInputs = [ pkgconfig ]; -- 2.31.1

1 0

[RFC PATCH 7/8] chromiumOSPackages.crosvm: add platform2 dep
by Jamie McClymont 02 Apr '21

02 Apr '21

Several crates from under platfrom2 are now used. --- pkgs/os-specific/linux/chromium-os/crosvm/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/os-specific/linux/chromium-os/crosvm/default.nix b/pkgs/os-specific/linux/chromium-os/crosvm/default.nix index d64dc316772..ab5ac518ef7 100644 --- a/pkgs/os-specific/linux/chromium-os/crosvm/default.nix +++ b/pkgs/os-specific/linux/chromium-os/crosvm/default.nix @@ -13,6 +13,7 @@ let "src/platform/crosvm" "src/third_party/adhd" "src/aosp/external/minijail" + "src/platform2" ] getSrc; in -- 2.31.1

1 0

virtio-wl on AMD graphics
by Jamie McClymont 01 Apr '21

01 Apr '21

Hello If anyone else has struggled with sepectrum-vm on AMD graphics, where the "child virtio-pci (virtio-wl)" process dies without a descriptive error, I believe the issue is fixed here: https://chromium-review.googlesource.com/c/chromiumos/platform/crosvm/+/257… It doesn't cleanly apply (I assume the seccomp policies have been shuffled between files), but --disable-sandbox is there as a functioning workaround :) Does anyone have a branch where the chromium-os upstream-info is more up to date? I can have a go myself, but didn't want to duplicate effort :) Thanks - Jamie McClymont -- P.S. an introduction: Hi everyone! I have just started a new job where VM isolation is necessary, and have been hoping for a way to get integrated window management across VM boundaries - it looks like this is clearly the ideal approach, and I'm already a NixOS user, so am keen to contribute :)

2 1

[PATCH ucspi-vsock] vsockclient: allow null application
by Alyssa Ross 24 Mar '21

24 Mar '21

I found myself running vsockclient 2 1024 true in a situation where it just mattered that a connection was made, and no data needed to be exchanged of it. That I found myself doing this is quite a strong indicator that the program to exec into should be optional. UCSPI-1996[1] doesn't specify what should happen if no application is provided, so I think this is a reasonable interpretation. I'm not sure if I feel the same for vsockserver(d), so I haven't made the corresponding change there. I'll wait to see if there's ever a need for it. [1]: https://cr.yp.to/proto/ucspi.txt --- vsockclient.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/vsockclient.c b/vsockclient.c index 934cfa0..456810d 100644 --- a/vsockclient.c +++ b/vsockclient.c @@ -41,11 +41,9 @@ int main(int argc, char *argv[]) } } - // Check there are enough positional arguments (two for the - // address and at least one to exec into). - if (optind > argc - 3) + // Find the address (cid and port) to connect to. + if (optind > argc - 2) ex_usage(); - if (getu32(argv[optind++], 0, UINT32_MAX, &rcid)) ex_usage(); if (getu32(argv[optind++], 0, UINT32_MAX, &rport)) @@ -69,6 +67,11 @@ int main(int argc, char *argv[]) "connect to %" PRIu32 ":%" PRIu32 " failed", rcid, rport); ilog("connected to %" PRIu32 ":%" PRIu32 "!", rcid, rport); + // If we have nothing to exec into, we're done. (Sometimes + // just connecting on its own is enough.) + if (optind == argc) + return 0; + // Set up the file descriptors to the well-known UCSPI numbers. if (dup2(fd, 6) == -1) diee(EX_OSERR, "dup2"); -- 2.30.0

2 3

[PATCH ucspi-vsock] Remove unused includes
by Alyssa Ross 24 Mar '21

24 Mar '21

--- vsock.c | 1 - vsockclient.c | 3 --- 2 files changed, 4 deletions(-) diff --git a/vsock.c b/vsock.c index ab8c4bd..159a51f 100644 --- a/vsock.c +++ b/vsock.c @@ -6,7 +6,6 @@ #include "vsock.h" #include <errno.h> -#include <sys/ioctl.h> #include <sys/socket.h> #include <linux/vm_sockets.h> diff --git a/vsockclient.c b/vsockclient.c index d6cc778..934cfa0 100644 --- a/vsockclient.c +++ b/vsockclient.c @@ -8,12 +8,9 @@ #include <stdio.h> #include <stdlib.h> #include <stdnoreturn.h> -#include <sys/socket.h> #include <sysexits.h> #include <unistd.h> -#include <linux/vm_sockets.h> - #include "env.h" #include "log.h" #include "num.h" -- 2.30.0

2 2

[PATCH ucspi-vsock] configure: reject invalid arguments
by Alyssa Ross 22 Mar '21

22 Mar '21

But we preserve the autoconf behaviour of only warning on invalid options. $ ./configure --test Warning: unrecognized options: --test $ ./configure test Error: unexpected argument: test --- configure | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/configure b/configure index 38c926c..938db10 100755 --- a/configure +++ b/configure @@ -29,8 +29,11 @@ for arg; do prefix="$(printf "%s" "$arg" | cut -d= -f2-)" elif printf "%s" "$arg" | grep -q "^--bindir="; then bindir="$(printf "%s" "$arg" | cut -d= -f2-)" - else + elif printf "%s" "$arg" | grep -q "^--"; then unrecognized="$unrecognized $arg" + else + echo "Error: unexpected argument: $arg" >&2 + exit 64 # EX_USAGE fi done -- 2.30.0

2 2

[PATCH ucspi-vsock] Set up clang-format
by Alyssa Ross 22 Mar '21

22 Mar '21

--- I'm not entirely happy with the automatic formatting, but I think it's worth it. .clang-format | 10 ++++++++++ num.c | 2 +- vsock.c | 4 ++-- vsockclient.c | 5 +++-- vsockserver-socketbinder.c | 8 ++++---- vsockserver.c | 27 +++++++++++++++------------ vsockserverd.c | 9 +++++---- 7 files changed, 40 insertions(+), 25 deletions(-) create mode 100644 .clang-format diff --git a/.clang-format b/.clang-format new file mode 100644 index 0000000..89313b0 --- /dev/null +++ b/.clang-format @@ -0,0 +1,10 @@ +# SPDX-License-Identifier: GPL-2.0-or-later +# SPDX-FileCopyrightText: 2021 Alyssa Ross <hi(a)alyssa.is> + +AlignOperands: DontAlign +BreakBeforeBinaryOperators: All +BreakBeforeBraces: Linux +ContinuationIndentWidth: 8 +Cpp11BracedListStyle: false +IndentWidth: 8 +UseTab: AlignWithSpaces diff --git a/num.c b/num.c index ac7f0a4..cef71ae 100644 --- a/num.c +++ b/num.c @@ -21,7 +21,7 @@ int getu32(const char *s, uint32_t min, uint32_t max, uint32_t *out) } int getul(const char *s, unsigned long min, unsigned long max, - unsigned long *out) + unsigned long *out) { char *endptr; diff --git a/vsock.c b/vsock.c index 6f1f466..ab8c4bd 100644 --- a/vsock.c +++ b/vsock.c @@ -18,8 +18,8 @@ static void fill_sockaddr(struct sockaddr_vm *addr, uint32_t cid, uint32_t port) addr->svm_port = port; } -static int fill_cid_and_port(const struct sockaddr_vm *addr, - uint32_t *cid, uint32_t *port) +static int fill_cid_and_port(const struct sockaddr_vm *addr, uint32_t *cid, + uint32_t *port) { // Check that this sockaddr info is actually for the socket // type we think it is, or we could get some very confusing diff --git a/vsockclient.c b/vsockclient.c index fbdd20e..d6cc778 100644 --- a/vsockclient.c +++ b/vsockclient.c @@ -23,7 +23,7 @@ noreturn static void ex_usage(void) { if (verbosity) fprintf(stderr, "Usage: %s [ -q | -Q | -v ] cid port prog...\n", - program_invocation_short_name); + program_invocation_short_name); exit(EX_USAGE); } @@ -63,7 +63,8 @@ int main(int argc, char *argv[]) // the same host with no backlog, so retry a few times. { int i = 0; - do fd = vsock_open(rcid, rport); + do + fd = vsock_open(rcid, rport); while (i++ < 3 && fd == -1 && errno == ETIMEDOUT); } if (fd == -1) diff --git a/vsockserver-socketbinder.c b/vsockserver-socketbinder.c index fdcdfa8..97c5442 100644 --- a/vsockserver-socketbinder.c +++ b/vsockserver-socketbinder.c @@ -5,13 +5,13 @@ #include <errno.h> #include <fcntl.h> +#include <stdint.h> #include <stdio.h> #include <stdlib.h> -#include <stdint.h> #include <stdnoreturn.h> #include <string.h> -#include <sysexits.h> #include <sys/socket.h> +#include <sysexits.h> #include <unistd.h> #include <linux/vm_sockets.h> @@ -26,7 +26,7 @@ noreturn static void ex_usage(void) { if (verbosity) fprintf(stderr, "Usage: %s cid port prog...\n", - program_invocation_short_name); + program_invocation_short_name); exit(EX_USAGE); } @@ -54,7 +54,7 @@ int main(int argc, char *argv[]) // Parse the `cid' argument. if (!strcmp(argv[optind], "-1")) cid = VMADDR_CID_ANY; - else if (getu32(argv[optind], 0, UINT32_MAX, &cid)) + else if (getu32(argv[optind], 0, UINT32_MAX, &cid)) ex_usage(); optind++; diff --git a/vsockserver.c b/vsockserver.c index b717eee..e45c2ea 100644 --- a/vsockserver.c +++ b/vsockserver.c @@ -19,8 +19,9 @@ noreturn static void ex_usage(void) { if (verbosity) - fprintf(stderr, "Usage: %s [ -1 ] [ -q | -Q | -v ] cid port prog...\n", - program_invocation_short_name); + fprintf(stderr, + "Usage: %s [ -1 ] [ -q | -Q | -v ] cid port prog...\n", + program_invocation_short_name); exit(EX_USAGE); } @@ -40,9 +41,10 @@ int main(int argc, char *argv[]) // we've parsed the arguments, so we know what our verbosity // setting is, and consequently whether we should print an // error message about the allocation failure. - alloc_failed |= - argz_add(&binder_opts, &binder_opts_len, BINDIR "/vsockserver-socketbinder") || - argz_add(&daemon_opts, &daemon_opts_len, BINDIR "/vsockserverd"); + alloc_failed |= argz_add(&binder_opts, &binder_opts_len, + BINDIR "/vsockserver-socketbinder") + || argz_add(&daemon_opts, &daemon_opts_len, + BINDIR "/vsockserverd"); while ((opt = getopt(argc, argv, "+1qQv")) != -1) { char *arg = NULL; @@ -53,9 +55,9 @@ int main(int argc, char *argv[]) case 'Q': case 'v': set_verbosity(opt); - alloc_failed |= - asprintf(&arg, "-%c", opt) == -1 || - argz_add(&daemon_opts, &daemon_opts_len, arg); + alloc_failed |= asprintf(&arg, "-%c", opt) == -1 + || argz_add(&daemon_opts, &daemon_opts_len, + arg); free(arg); break; default: @@ -78,15 +80,16 @@ int main(int argc, char *argv[]) ex_usage(); // Add `cid' and `port' arguments to binder options. - if (argz_add(&binder_opts, &binder_opts_len, "--") || - argz_add(&binder_opts, &binder_opts_len, argv[optind++]) || - argz_add(&binder_opts, &binder_opts_len, argv[optind++])) + if (argz_add(&binder_opts, &binder_opts_len, "--") + || argz_add(&binder_opts, &binder_opts_len, argv[optind++]) + || argz_add(&binder_opts, &binder_opts_len, argv[optind++])) diee(EX_OSERR, "malloc"); // Add all of daemon_opts onto the end of binder_opts. It's // okay to multiply to find the size because if it would // overflow calloc would have failed earlier. - if (argz_append(&binder_opts, &binder_opts_len, daemon_opts, daemon_opts_len)) + if (argz_append(&binder_opts, &binder_opts_len, daemon_opts, + daemon_opts_len)) diee(EX_OSERR, "malloc"); free(daemon_opts); diff --git a/vsockserverd.c b/vsockserverd.c index 1abfff9..a056bf1 100644 --- a/vsockserverd.c +++ b/vsockserverd.c @@ -23,7 +23,7 @@ noreturn static void ex_usage(void) { if (verbosity) fprintf(stderr, "Usage: %s [ -1 ] [ -q | -Q | -v ] prog...\n", - program_invocation_short_name); + program_invocation_short_name); exit(EX_USAGE); } @@ -33,8 +33,8 @@ int main(int argc, char *argv[]) int opt; pid_t child; uint32_t lcid, lport, rcid, rport; - struct pollfd poll_fd = - { .fd = STDIN_FILENO, .events = POLLIN, .revents = 0 }; + struct pollfd poll_fd + = { .fd = STDIN_FILENO, .events = POLLIN, .revents = 0 }; while ((opt = getopt(argc, argv, "+1qQv")) != -1) { switch (opt) { @@ -93,7 +93,8 @@ int main(int argc, char *argv[]) ilog("connection from %" PRIu32 " port %" PRIu32, rcid, rport); switch (child = fork()) { - case -1: diee(EX_OSERR, "fork"); + case -1: + diee(EX_OSERR, "fork"); case 0: // Set up the connection socket on prog's // stdin and stdout. This has the happy side -- 2.30.0

2 2

[PATCH ucspi-vsock 0/2] Fix clang-tidy warnings
by Alyssa Ross 21 Mar '21

21 Mar '21

clang-tidy also produced this warning: /home/src/ucspi-vsock/repro.c:43:19: warning: unused parameter 'sig' [clang-diagnostic-unused-parameter] void sig_exit(int sig) { exit(EX_UNAVAILABLE); } ^ vsock.c:27:23: warning: The left operand of '!=' is a garbage value [clang-analyzer-core.UndefinedBinaryOperatorResult] if (addr->svm_family != AF_VSOCK) { ^ vsock.c:90:6: note: Assuming the condition is false if (getsockname(fd, (struct sockaddr *)&addr, &addrlen) == -1) ^ vsock.c:90:2: note: Taking false branch if (getsockname(fd, (struct sockaddr *)&addr, &addrlen) == -1) ^ vsock.c:93:9: note: Calling 'fill_cid_and_port' return fill_cid_and_port(&addr, cid, port); ^ vsock.c:27:23: note: The left operand of '!=' is a garbage value if (addr->svm_family != AF_VSOCK) { But I think this is just warning me that the POSIX socket API violates the strict aliasing rule. (Which is true, but there's not a lot I can do about it...) It also tells me I should use memset_s instead of memset, but, well... https://en.wikipedia.org/wiki/C11_(C_standard_revision)#Criticism Alyssa Ross (2): exec: free argv if exec fails vsockserver: fix uninitialized variable exec.c | 5 ++++- vsockserver.c | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) -- 2.30.0

2 4

[PATCH ucspi-vsock 0/7] Extract vsockserver-socketbinder and vsockserverd
by Alyssa Ross 21 Mar '21

21 Mar '21

This series breaks vsockserver apart into two smaller programs, vsockserver-socketbinder and vsockserverd. vsockserver-socketbinder binds and listens on an AF_VSOCK socket and then execs into another program with the socket as stdin. vsockserverd accepts connections to a socket provided on stdin, and for each connection runs a program with the connection socket on stdin and stdout. vsockserver is replaced with a program that builds an argv that just combines these two smaller programs and execs into it. This design is based on s6[1]'s s6-ipcserver, s6-ipcserver-socketbinder, and s6-ipcserverd programs. [1]: https://skarnet.org/software/s6/ [2]: https://skarnet.org/software/s6-rc/ Alyssa Ross (7): vsock: get cid and port instead of just cid vsock: check socket family before reading sockaddr vsockserver: switch to a non-blocking socket configure: create, to generate config.h log: add die function exec: add execzp() Extract vsockserver-socketbinder and vsockserverd .gitignore | 7 +- Makefile | 33 -------- Makefile.in | 47 +++++++++++ configure | 49 ++++++++++++ exec.c | 22 +++++ exec.h | 7 ++ log.c | 10 +++ log.h | 8 +- vsock.c | 32 ++++++-- vsock.h | 14 +++- vsockserver-socketbinder.c | 86 ++++++++++++++++++++ vsockserver.c | 137 +++++++++++++++----------------- vsockserver.c => vsockserverd.c | 73 +++++++++-------- 13 files changed, 368 insertions(+), 157 deletions(-) delete mode 100644 Makefile create mode 100644 Makefile.in create mode 100755 configure create mode 100644 exec.c create mode 100644 exec.h create mode 100644 vsockserver-socketbinder.c copy vsockserver.c => vsockserverd.c (55%) -- 2.30.0

2 14