From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:470:142:3::10]:39630) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jTKGD-0007Xl-AF for guix-patches@gnu.org; Tue, 28 Apr 2020 03:02:45 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.90_1) (envelope-from ) id 1jTKFn-00077z-22 for guix-patches@gnu.org; Tue, 28 Apr 2020 03:02:29 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:55371) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jTKFm-00077k-LI for guix-patches@gnu.org; Tue, 28 Apr 2020 03:02:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1jTKFm-0005bA-Ij for guix-patches@gnu.org; Tue, 28 Apr 2020 03:02:02 -0400 Subject: [bug#40922] gnu: udevil: Fix loading of setuid-programs. Resent-Message-ID: Received: from eggs.gnu.org ([2001:470:142:3::10]:38754) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jTKB5-0004vS-Qy for guix-patches@gnu.org; Tue, 28 Apr 2020 03:01:50 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.90_1) (envelope-from ) id 1jTK6t-0000j9-4W for guix-patches@gnu.org; Tue, 28 Apr 2020 02:57:07 -0400 Received: from knopi.disroot.org ([178.21.23.139]:44780) by eggs.gnu.org with esmtps (TLS1.2:DHE_RSA_CHACHA20_POLY1305:256) (Exim 4.90_1) (envelope-from ) id 1jTK6s-0000is-9c for guix-patches@gnu.org; Tue, 28 Apr 2020 02:52:50 -0400 Received: from localhost (localhost [127.0.0.1]) by disroot.org (Postfix) with ESMTP id 9685727EAF for ; Tue, 28 Apr 2020 08:52:46 +0200 (CEST) Received: from knopi.disroot.org ([127.0.0.1]) by localhost (disroot.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id rtK_36gxJVpA for ; Tue, 28 Apr 2020 08:52:45 +0200 (CEST) Date: Tue, 28 Apr 2020 02:52:28 -0400 From: Raghav Gururajan Message-ID: <20200428025228.09935bde.raghavgururajan@disroot.org> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="MP_/Yh96zZry0XzW8qnxO14RaNf" List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org Sender: "Guix-patches" To: 40922@debbugs.gnu.org --MP_/Yh96zZry0XzW8qnxO14RaNf Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Content-Disposition: inline --MP_/Yh96zZry0XzW8qnxO14RaNf Content-Type: text/x-patch Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename=0001-gnu-udevil-Fix-loading-of-setuid-programs.patch >From de62f6773a75bffff632f70fa3062b3668462543 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Tue, 28 Apr 2020 02:29:36 -0400 Subject: [PATCH] gnu: udevil: Fix loading of setuid-programs. * gnu/packages/disk.scm (udevil): Fix loading of setuid-programs. [1] Patched references to mount, umount, losetup and setfacl; as udevil expects these programs to have uid set as root. [2] Patched references to udevil; as udevil itself and devmon expects udevil to have uid set as root. --- gnu/packages/disk.scm | 26 ++++++++++++++++++++++---- 1 file changed, 22 insertions(+), 4 deletions(-) diff --git a/gnu/packages/disk.scm b/gnu/packages/disk.scm index b7d3b9d954..2b9ba8e38d 100644 --- a/gnu/packages/disk.scm +++ b/gnu/packages/disk.scm @@ -103,16 +103,34 @@ (build-system gnu-build-system) (arguments `(#:configure-flags - (list "--disable-systemd" - (string-append "--sysconfdir=" - (assoc-ref %outputs "out") - "/etc")) + (list + "--disable-systemd" + (string-append "--sysconfdir=" + (assoc-ref %outputs "out") + "/etc") + ;; udevil expects these programs to be run with uid set as root. + ;; user has to manually add these programs to setuid-programs. + ;; mount and umount are default setuid-programs in guix system. + "--with-mount-prog=/run/setuid-programs/mount" + "--with-umount-prog=/run/setuid-programs/umount" + "--with-losetup-prog=/run/setuid-programs/losetup" + "--with-setfacl-prog=/run/setuid-programs/setfacl") #:phases (modify-phases %standard-phases (add-after 'unpack 'remove-root-reference (lambda _ (substitute* "src/Makefile.in" (("-o root -g root") "")) + #t)) + (add-after 'unpack 'patch-udevil-reference + ;; udevil expects itself to be run with uid set as root. + ;; devmon also expects udevil to be run with uid set as root. + ;; user has to manually add udevil to setuid-programs. + (lambda _ + (substitute* "src/udevil.c" + (("/usr/bin/udevil") "/run/setuid-programs/udevil")) + (substitute* "src/devmon" + (("`which udevil 2>/dev/null`") "/run/setuid-programs/udevil")) #t))))) (native-inputs `(("intltool" ,intltool) -- 2.26.2 --MP_/Yh96zZry0XzW8qnxO14RaNf--