From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Tomas Volf Newsgroups: gmane.lisp.guile.bugs Subject: bug#66531: [PATCH] ftw: Fix getuid-or-false, getgid-or-false macros. Date: Fri, 13 Oct 2023 18:18:11 +0200 Message-ID: <20231013161811.19233-1-wolf@wolfsden.cz> Mime-Version: 1.0 Content-Transfer-Encoding: 8bit Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="35726"; mail-complaints-to="usenet@ciao.gmane.io" Cc: Tomas Volf To: 66531@debbugs.gnu.org Original-X-From: bug-guile-bounces+guile-bugs=m.gmane-mx.org@gnu.org Fri Oct 13 18:19:01 2023 Return-path: Envelope-to: guile-bugs@m.gmane-mx.org Original-Received: from lists.gnu.org ([209.51.188.17]) by ciao.gmane.io with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1qrKsO-0008zV-J9 for guile-bugs@m.gmane-mx.org; Fri, 13 Oct 2023 18:19:00 +0200 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qrKs5-0006vD-Ir; Fri, 13 Oct 2023 12:18:41 -0400 Original-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 1qrKs3-0006v1-R7 for bug-guile@gnu.org; Fri, 13 Oct 2023 12:18:39 -0400 Original-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 1qrKs3-0003CL-Jb for bug-guile@gnu.org; Fri, 13 Oct 2023 12:18:39 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qrKsQ-0005Og-Jd for bug-guile@gnu.org; Fri, 13 Oct 2023 12:19:02 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Tomas Volf Original-Sender: "Debbugs-submit" Resent-CC: bug-guile@gnu.org Resent-Date: Fri, 13 Oct 2023 16:19:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 66531 X-GNU-PR-Package: guile X-GNU-PR-Keywords: patch X-Debbugs-Original-To: bug-guile@gnu.org Original-Received: via spool by submit@debbugs.gnu.org id=B.169721393820734 (code B ref -1); Fri, 13 Oct 2023 16:19:02 +0000 Original-Received: (at submit) by debbugs.gnu.org; 13 Oct 2023 16:18:58 +0000 Original-Received: from localhost ([127.0.0.1]:47300 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qrKsM-0005OM-2A for submit@debbugs.gnu.org; Fri, 13 Oct 2023 12:18:58 -0400 Original-Received: from lists.gnu.org ([2001:470:142::17]:35272) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qrKsJ-0005O8-AZ for submit@debbugs.gnu.org; Fri, 13 Oct 2023 12:18:57 -0400 Original-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 1qrKrp-0006sb-IY for bug-guile@gnu.org; Fri, 13 Oct 2023 12:18:26 -0400 Original-Received: from wolfsden.cz ([37.205.8.62]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qrKrn-00039e-1Q for bug-guile@gnu.org; Fri, 13 Oct 2023 12:18:25 -0400 Original-Received: by wolfsden.cz (Postfix, from userid 104) id EF67A26B373; Fri, 13 Oct 2023 16:18:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=wolfsden.cz; s=mail; t=1697213897; bh=j+nWa6+Rigc76UQWflcDcQwvt8kaZiYFMDPC85JI/pU=; h=From:To:Cc:Subject:Date; b=oYb/Y1nVlO3jLt7hNNHFvLdoCyX6tfpJLnqyXMvOae/0nnpk2+/l4fBcxq/KDZstH rhOsh2ZQY1c30gZsk2H/pCE3+b66zEtGpwelEQFsGdt1ocBndWWTuZcezy5aG6fCUr 3uyNKNekGC2M45cfv73mbZIjfUFVkqKFHt6s9zICb0qugV48fHQdC5PhLSseLuHLMb xnc+bUjxvxJ+lC/5unmcqQAuqfGEc8nlIuIqrH61n1AFM9xeLuA2BhcSY7Azo2J5yD aFNEBsy4y/W0125jvZkk1LQz7C/BihfHkMrb2hZq+QhpxWfCikXGg7M/2Q761zkFwe P5z8ImrhRBzE48PmU61JjHvDVWZP+2MjNzj9bZHd8xz19Jun++VdMzw4aIOZ2qe7pS U8t0NxjpBLNiLPJOx8eo/nwLpguK6DQ9ZlnIYQJBWTPKFoJCd0ctRcUvrjS6oT29bE DwdVovjz0K2WNWGsO0vCo17TeZkYYDRYh9Eo8GbwJrdkgcscab6zAf5r2Bbyoqc7FN H9NDc6ppekgLGFhqAwi1cdLybriZNcYVS4LWwL4WcsAz2uyNW+XFcZDkuezNnaksWk bZBColiqSJ5xwdW5oKGlIDic0auITh+xArapAL++1s8VsY98keI+yYxg/u9/G3VAgP p7ykBCeALIf/yi2xbfh9/sRY= Original-Received: from localhost (unknown [81.17.16.88]) by wolfsden.cz (Postfix) with ESMTPSA id 0F89926B4E1; Fri, 13 Oct 2023 16:18:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=wolfsden.cz; s=mail; t=1697213897; bh=j+nWa6+Rigc76UQWflcDcQwvt8kaZiYFMDPC85JI/pU=; h=From:To:Cc:Subject:Date; b=oYb/Y1nVlO3jLt7hNNHFvLdoCyX6tfpJLnqyXMvOae/0nnpk2+/l4fBcxq/KDZstH rhOsh2ZQY1c30gZsk2H/pCE3+b66zEtGpwelEQFsGdt1ocBndWWTuZcezy5aG6fCUr 3uyNKNekGC2M45cfv73mbZIjfUFVkqKFHt6s9zICb0qugV48fHQdC5PhLSseLuHLMb xnc+bUjxvxJ+lC/5unmcqQAuqfGEc8nlIuIqrH61n1AFM9xeLuA2BhcSY7Azo2J5yD aFNEBsy4y/W0125jvZkk1LQz7C/BihfHkMrb2hZq+QhpxWfCikXGg7M/2Q761zkFwe P5z8ImrhRBzE48PmU61JjHvDVWZP+2MjNzj9bZHd8xz19Jun++VdMzw4aIOZ2qe7pS U8t0NxjpBLNiLPJOx8eo/nwLpguK6DQ9ZlnIYQJBWTPKFoJCd0ctRcUvrjS6oT29bE DwdVovjz0K2WNWGsO0vCo17TeZkYYDRYh9Eo8GbwJrdkgcscab6zAf5r2Bbyoqc7FN H9NDc6ppekgLGFhqAwi1cdLybriZNcYVS4LWwL4WcsAz2uyNW+XFcZDkuezNnaksWk bZBColiqSJ5xwdW5oKGlIDic0auITh+xArapAL++1s8VsY98keI+yYxg/u9/G3VAgP p7ykBCeALIf/yi2xbfh9/sRY= Original-Received: from localhost (localhost [local]) by localhost (OpenSMTPD) with ESMTPA id b04980c0; Fri, 13 Oct 2023 16:18:15 +0000 (UTC) X-Mailer: git-send-email 2.41.0 Received-SPF: none client-ip=37.205.8.62; envelope-from=ws@wolfsnet.cz; helo=wolfsden.cz X-Spam_score_int: -16 X-Spam_score: -1.7 X-Spam_bar: - X-Spam_report: (-1.7 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, HEADER_FROM_DIFFERENT_DOMAINS=0.25, SPF_HELO_PASS=-0.001, SPF_NONE=0.001, UNPARSEABLE_RELAY=0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: bug-guile@gnu.org List-Id: "Bug reports for GUILE, GNU's Ubiquitous Extension Language" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-guile-bounces+guile-bugs=m.gmane-mx.org@gnu.org Original-Sender: bug-guile-bounces+guile-bugs=m.gmane-mx.org@gnu.org Xref: news.gmane.io gmane.lisp.guile.bugs:10679 Archived-At: Both macros were missing a quote for the procedure call, causing the actual return value to be compiled into the ftw.go, instead of the procedure call. Snippet from disassembly of ftw.go does confirm that: 55 (make-immediate 2 3990) ;; 997 at ice-9/ftw.scm:319:46 56 (make-long-immediate 1 120002) ;; 30000 at ice-9/ftw.scm:320:46 That effectively prevented ftw from entering directories without access for others. Simple reproduction: scheme@(guile-user)> ,use (ice-9 ftw) scheme@(guile-user)> (mkdir "/tmp/xxxx") scheme@(guile-user)> (chmod "/tmp/xxxx" #o0700) scheme@(guile-user)> (ftw "/tmp/xxxx" (lambda (_ __ f) (pk f) #t)) ;;; (directory-not-readable) $1 = #t scheme@(guile-user)> (system "ls -al /tmp/xxxx") total 0 drwx------ 1 wolf wolf 0 Oct 11 22:54 . drwxrwxrwt 1 root root 888 Oct 11 22:54 .. $2 = 0 The fix is to quote the procedure call, leading to the intended behavior. This fixes bug 55344. * module/ice-9/ftw.scm (getuid-or-false): Quote the (getuid). (getgid-or-false): Quote the (getgid). --- module/ice-9/ftw.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/module/ice-9/ftw.scm b/module/ice-9/ftw.scm index ac6aa6316..8496086a1 100644 --- a/module/ice-9/ftw.scm +++ b/module/ice-9/ftw.scm @@ -201,12 +201,12 @@ (define-macro (getuid-or-false) (if (defined? 'getuid) - (getuid) + '(getuid) #f)) (define-macro (getgid-or-false) (if (defined? 'getgid) - (getgid) + '(getgid) #f)) (define (directory-files dir) -- 2.41.0