From patchwork Sat Apr 26 15:13:57 2025 Content-Type: text\/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Alyssa Ross X-Patchwork-Id: 14067708 Received: from fhigh-b7-smtp.messagingengine.com (fhigh-b7-smtp.messagingengine.com [202.12.124.158]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256\/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 33F71A31 for ; Sat, 26 Apr 2025 15:15:54 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=202.12.124.158 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745680559; cv=none; b=Pq1cEfDSDJ0fkBMv6QVCQI8UUqLnYGihmK9UeuLduv0kwLuwpvD6WOxM\/TSLMRIywjgR8gd2c853qlcX7DDrHAnyddbljBfUmT7TClUWm+eES9n51wREeMkgpjwZEvuOCVXfWzMNnBJNztbAVx+10PtGeluwXSHG1odCX\/NjgQI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745680559; c=relaxed\/simple; bh=pJMDSW9OyFQkw5+mTn23RDQ0ioaHtTd6I+0qBZvmwP4=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version:Content-Type; b=VY6d+x8V7xkeJ2uh\/a5R7YERgjbG4KKpSH0LL+z\/D5ebQqDoQYyVyuQAhANwGBuFP81lunmLcZc2wMIkhtTTIzrFJyVwMsKJnPT2vLUBI6Um9ow9ZAwrpU3bMzV3KjnKaTZMGAZ87fAstIzB5jJaPIF2rhU9NiBHjpTAn5ofXYo= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=alyssa.is; spf=pass smtp.mailfrom=alyssa.is; dkim=pass (2048-bit key) header.d=alyssa.is header.i=@alyssa.is header.b=sVvu9\/jU; dkim=pass (2048-bit key) header.d=messagingengine.com header.i=@messagingengine.com header.b=Oe16\/9D7; arc=none smtp.client-ip=202.12.124.158 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=alyssa.is Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=alyssa.is Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=alyssa.is header.i=@alyssa.is header.b="sVvu9\/jU"; dkim=pass (2048-bit key) header.d=messagingengine.com header.i=@messagingengine.com header.b="Oe16\/9D7" Received: from phl-compute-02.internal (phl-compute-02.phl.internal [10.202.2.42]) by mailfhigh.stl.internal (Postfix) with ESMTP id ED5B02540205; Sat, 26 Apr 2025 11:15:53 -0400 (EDT) Received: from phl-mailfrontend-02 ([10.202.2.163]) by phl-compute-02.internal (MEProxy); Sat, 26 Apr 2025 11:15:54 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed\/relaxed; d=alyssa.is; h=cc :cc:content-transfer-encoding:content-type:content-type:date :date:from:from:in-reply-to:message-id:mime-version:reply-to :subject:subject:to:to; s=fm2; t=1745680553; x=1745766953; bh=rW uOFM2rzwdFfxgV2+EnHMjhI780MNjU9R+9eFq8dvg=; b=sVvu9\/jU9LemQ6RFQI DtSKhUj2+dsfX0he1Ov1CofCaTdNc+esuMzB8dGEgQnIY6sfB7FHrPAuDDQaCTEb Qb0MW0FQNzuTyNO94P8IXvcPEN7XWpcH1UKkWyohOsX\/DRQYs8YP\/oyrZB7gy8h+ LPbqcyracjmJriUdC8aesJ3FKHmyQiXY8ka08VFQyiVrksvEwfM7tleNW0mQVrVG VpHxDigwP71zXB3gHl0ogks6VloaqH0f3EKo1nT19xuzWGcMPKtBrs3jHJFSgy8X 9+jY\/qFSAq6OvItkKnwXf08McbuKVuPnYZrrsVgx3NZFcaCo+tklqEvWJUJCPxnz BfXw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed\/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding :content-type:content-type:date:date:feedback-id:feedback-id :from:from:in-reply-to:message-id:mime-version:reply-to:subject :subject:to:to:x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s= fm3; t=1745680553; x=1745766953; bh=rWuOFM2rzwdFfxgV2+EnHMjhI780 MNjU9R+9eFq8dvg=; b=Oe16\/9D7\/7d67cUSyAPHmj+rekiHlxK3tMneIFP\/5hTG MlpQlyg5QLsVRSUxfGn\/OjX1vvg5VrpRpeGYaxJyNU\/oPy2jFBSwUmB1lR7\/W4Lz M4NYele9Nufotym19hpJylkMpOi266PNIqG1lT4OfK7d+ZEJSoZygq\/tnsgE08ql 2AFSMbYbTQC6YM8sk+9tk2ypCjb7W1NouIshFQ33J7LNniu67KJDcPtH3VqfkG6q RYkGhc21tTZl\/e9EQ6m8Z4c6yWk8kDqozOBI0lOh6GrhAaDEj1+\/2v0DF7OAcqwG KhqGnYTkH2Qj8pshvMSctbOWckywkqxX+fREJWN9Gw== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeefvddrtddtgddvheehheefucetufdoteggodetrf dotffvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdggtfgfnhhsuhgsshgtrhhisggv pdfurfetoffkrfgpnffqhgenuceurghilhhouhhtmecufedttdenucesvcftvggtihhpih gvnhhtshculddquddttddmnecujfgurhephffvvefufffkofggtgfgsehtkeertdertdej necuhfhrohhmpeetlhihshhsrgcutfhoshhsuceohhhisegrlhihshhsrgdrihhsqeenuc ggtffrrghtthgvrhhnpeevieegveegkeefieekffeuuddtuefhtdfhgfdvfeeugfffvdeh tdekveeufedtjeenucffohhmrghinhepghhithhhuhgsrdgtohhmnecuvehluhhsthgvrh fuihiivgeptdenucfrrghrrghmpehmrghilhhfrhhomhephhhisegrlhihshhsrgdrihhs pdhnsggprhgtphhtthhopeegpdhmohguvgepshhmthhpohhuthdprhgtphhtthhopehmvg esrghlsggrrdhshhdprhgtphhtthhopehjfigtrghrthdvsehgmhgrihhlrdgtohhmpdhr tghpthhtohepnhgrsghijhgrtgiilhgvfigvlhhisehnrggsihhjrggtiihlvgifvghlih drgiihiidprhgtphhtthhopehsvghlihhnuhigsehvghgvrhdrkhgvrhhnvghlrdhorhhg X-ME-Proxy:

Feedback-ID: i12284293:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Sat, 26 Apr 2025 11:15:52 -0400 (EDT) Received: by mbp.qyliss.net (Postfix, from userid 1000) id E07A2117F8; Sat, 26 Apr 2025 17:15:46 +0200 (CEST) From: Alyssa Ross To: selinux@vger.kernel.org Cc: =?utf-8?b?0L3QsNCx?= , James Carter , Alba Mendez Subject: [PATCH v2] libselinux: be careful with non-portable LFS macro Date: Sat, 26 Apr 2025 17:13:57 +0200 Message-ID: <20250426151356.7116-2-hi@alyssa.is> X-Mailer: git-send-email 2.47.2 Precedence: bulk X-Mailing-List: selinux@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 musl does not provide the obsolete LFS64 APIs (like ino64_t) — ino_t has always been 64-bit on all platforms there. That means there's also no __INO_T_MATCHES_INO64_T macro, meaning the check would pass and reach the static asserts for the shim, which would fail due to there being no ino64_t to check the size of. Fix this by only assuming the absense of __INO_T_MATCHES_INO64_t is meaningful when another non-portable Glibc macro, __INO64_T_TYPE, is defined. If both are missing, that probably just means there is no ino64_t. Fixes: 5c3fcbd9 ("Inject matchpathcon_filespec_add64() if !defined(__INO_T_MATCHES_INO64_T) instead of using __BITS_PER_LONG < 64 as proxy") Signed-off-by: Alyssa Ross Acked-by: James Carter --- v2: Made the same change to the condition in the header, as suggested in a GitHub comment. The omission didn't seem to break anything, but it makes sense to change it there too. https:\/\/github.com\/NixOS\/nixpkgs\/pull\/391728#issuecomment-2832282846 include\/selinux\/selinux.h | 2 +- src\/matchpathcon.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) base-commit: 2647cc0fdca326b81ee3c08718cbe19b7866b53a --- a\/include\/selinux\/selinux.h +++ b\/include\/selinux\/selinux.h @@ -537,7 +537,7 @@ extern int matchpathcon_index(const char with the same inode (e.g. due to multiple hard links). If so, then use the latter of the two specifications based on their order in the file contexts configuration. Return the used specification index. *\/ -#if defined(_FILE_OFFSET_BITS) && _FILE_OFFSET_BITS == 64 && !defined(__INO_T_MATCHES_INO64_T) +#if defined(_FILE_OFFSET_BITS) && _FILE_OFFSET_BITS == 64 && defined(__INO64_T_TYPE) && !defined(__INO_T_MATCHES_INO64_T) #define matchpathcon_filespec_add matchpathcon_filespec_add64 #endif extern int matchpathcon_filespec_add(ino_t ino, int specind, const char *file); --- a\/src\/matchpathcon.c +++ b\/src\/matchpathcon.c @@ -261,7 +261,7 @@ int matchpathcon_filespec_add(ino_t ino, return -1; } -#if (defined(_FILE_OFFSET_BITS) && _FILE_OFFSET_BITS == 64) && !defined(__INO_T_MATCHES_INO64_T) +#if (defined(_FILE_OFFSET_BITS) && _FILE_OFFSET_BITS == 64) && defined(__INO64_T_TYPE) && !defined(__INO_T_MATCHES_INO64_T) \/* alias defined in the public header but we undefine it here *\/ #undef matchpathcon_filespec_add

Other Versions#

Patches#