From patchwork Thu Dec 26 17:21:25 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Ludovic_Court=C3=A8s?= X-Patchwork-Id: 35642 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 1349327BBEB; Thu, 26 Dec 2024 17:23:25 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-7.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 8389D27BBE2 for ; Thu, 26 Dec 2024 17:23:24 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tQrZh-0002Ry-HV; Thu, 26 Dec 2024 12:23:05 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tQrZg-0002Ro-5K for guix-patches@gnu.org; Thu, 26 Dec 2024 12:23:04 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tQrZe-0002wH-SM for guix-patches@gnu.org; Thu, 26 Dec 2024 12:23:03 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=8dB9aneqq2u0HbdQgTXXCSFROg4vcrZsHF/IjkWDlVI=; b=M9PSg1vaa6aM8MnHKTj7s6k/OVawWEhanjocy06C7CUT88G5ikHLbds/hW8Mu3VFPg6J5GRdVTD48ggDHAYYrLKTp4kFYt1ZuMlEIwVY2dpJBsOcLFVV9QMchqQEweCIuMpQXV1NRRqPeXryU14vPbJ7qKT43Bo9HYYgTJfYURWyOvhy+LKUcDN0+rX6hlXHE1tXfx2zrnhIW1Ypho+9tZXl6Qfsh1s2PqzLp+hQ3jYXsunkpg3njI5AM+B8hV1jStEhiJsfN8mYE60cnw01ewL40T95GZ0L4nMhfW0aymBYF3gOmhABvVQH18JiSHwJKv09srS3O2EZazrRpKnpvg==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tQrZe-0000QZ-8x for guix-patches@gnu.org; Thu, 26 Dec 2024 12:23:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#75027] [PATCH v2 1/3] syscalls: Add =?utf-8?b?4oCYa2V4ZWMtbG9h?= =?utf-8?b?ZC1maWxl4oCZLg==?= Resent-From: Ludovic =?utf-8?q?Court=C3=A8s?= Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 26 Dec 2024 17:23:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 75027 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 75027@debbugs.gnu.org Cc: Ludovic =?utf-8?q?Court=C3=A8s?= Received: via spool by 75027-submit@debbugs.gnu.org id=B75027.17352337251547 (code B ref 75027); Thu, 26 Dec 2024 17:23:02 +0000 Received: (at 75027) by debbugs.gnu.org; 26 Dec 2024 17:22:05 +0000 Received: from localhost ([127.0.0.1]:42051 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tQrYe-0000OG-VE for submit@debbugs.gnu.org; Thu, 26 Dec 2024 12:22:04 -0500 Received: from eggs.gnu.org ([209.51.188.92]:33108) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tQrYV-0000NJ-AD for 75027@debbugs.gnu.org; Thu, 26 Dec 2024 12:21:53 -0500 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tQrYO-0002sD-Rl; Thu, 26 Dec 2024 12:21:44 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:References:In-Reply-To:Date:Subject:To: From; bh=8dB9aneqq2u0HbdQgTXXCSFROg4vcrZsHF/IjkWDlVI=; b=YW0UjndJVg9Ys3man3J/ Mj2yTCgU8ih7C5/7lkhzFpSqR+tCRtJQi1XR/Kq4Yu0jAT9BisiidXUUQn4ezo8VoANCBCVosFgLz /Au8Kg7ficN/bt4r/wiwTbfvZZ7El13Wytu3+CfEk9d29qQk5yAMpsCaupj+5dOdPGSG9g0lYJe9H h78K1HEvS8v9WDbZnjIFGwheE8tXEkYlpIZUFMimA/jQVO2m0qFkvHIBYckPltyQwZoMdBpvx3MY0 yqUv9S6wOkj344O6MS2EsHoQ561ne70dgdVEh+EJffbMVHUL3AjEJ6YqskOAl2qB55PXSOGdokz3C i+IrszAnZA774w==; From: Ludovic =?utf-8?q?Court=C3=A8s?= Date: Thu, 26 Dec 2024 18:21:25 +0100 Message-ID: X-Mailer: git-send-email 2.46.0 In-Reply-To: References: MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * guix/build/syscalls.scm (string->utf-8/nul-terminated) (kexec-load-file): New procedures. * tests/syscalls.scm ("kexec-load-file"): New test. Change-Id: I3724226a14ecc07f346e77519fb5b0591096c7f6 --- guix/build/syscalls.scm | 54 +++++++++++++++++++++++++++++++++++++++++ tests/syscalls.scm | 13 ++++++++++ 2 files changed, 67 insertions(+) diff --git a/guix/build/syscalls.scm b/guix/build/syscalls.scm index 2c20edf058..f8c9937f54 100644 --- a/guix/build/syscalls.scm +++ b/guix/build/syscalls.scm @@ -146,6 +146,12 @@ (define-module (guix build syscalls) clone setns + kexec-load-file + KEXEC_FILE_UNLOAD + KEXEC_FILE_ON_CRASH + KEXEC_FILE_NO_INITRAMFS + KEXEC_FILE_DEBUG + PF_PACKET AF_PACKET all-network-interface-names @@ -765,6 +771,54 @@ (define-as-needed load-linux-module (list (strerror err)) (list err))))))) +(define (string->utf-8/nul-terminated str) + "Serialize STR to UTF-8; return the resulting bytevector, including +terminating nul character." + (let* ((source (string->utf8 str)) + (bv (make-bytevector (+ (bytevector-length source) 1) 0))) + (bytevector-copy! source 0 bv 0 (bytevector-length source)) + bv)) + +;; Constants from . +(define KEXEC_FILE_UNLOAD #x00000001) +(define KEXEC_FILE_ON_CRASH #x00000002) +(define KEXEC_FILE_NO_INITRAMFS #x00000004) +(define KEXEC_FILE_DEBUG #x00000008) + +(define kexec-load-file + (let* ((proc (syscall->procedure int "syscall" + (list long ;sysno + int ;kernel fd + int ;initrd fd + unsigned-long ;cmdline length + '* ;cmdline + unsigned-long))) ;flags + ;; TODO: Don't do this. + (syscall-id (match (utsname:machine (uname)) + ("i686" 320) + ("x86_64" 320) + ("armv7l" 401) + ("aarch64" 401) + ;; XXX: There's apparently no support for ppc64le and + ;; riscv64. + (_ #f)))) + (lambda* (kernel-fd initrd-fd command-line #:optional (flags 0)) + "Load for eventual use of kexec(8) the Linux kernel from +@var{kernel-fd}, its initial RAM disk from @var{initrd-fd}, with the given +@var{command-line} (a string). Optionally, @var{flags} can be a bitwise or of +the KEXEC_FILE_* constants." + (let*-values (((command-line) + (string->utf-8/nul-terminated command-line)) + ((ret err) + (proc syscall-id kernel-fd initrd-fd + (bytevector-length command-line) + (bytevector->pointer command-line) + flags))) + (when (= ret -1) + (throw 'system-error "kexec-load-file" "~A" + (list (strerror err)) + (list err))))))) + (define (linux-process-flags pid) ;copied from the Shepherd "Return the process flags of @var{pid} (or'd @code{PF_} constants), assuming the Linux /proc file system is mounted; raise a @code{system-error} exception diff --git a/tests/syscalls.scm b/tests/syscalls.scm index 13f4f11721..eef864d097 100644 --- a/tests/syscalls.scm +++ b/tests/syscalls.scm @@ -679,6 +679,19 @@ (define perform-container-tests? (lambda args (system-error-errno args)))))) +(when (or (zero? (getuid)) + (not (string-contains %host-type "linux"))) + (test-skip 1)) +(test-equal "kexec-load-file" + EPERM + (catch 'system-error + (lambda () + (let ((fd1 (open-fdes "/dev/null" O_RDONLY)) + (fd2 (open-fdes "/dev/null" O_RDONLY))) + (kexec-load-file fd1 fd2 "gnu.repl=yes"))) + (lambda args + (system-error-errno args)))) + (test-end) (false-if-exception (delete-file temp-file))