From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-qk1-f169.google.com (mail-qk1-f169.google.com [209.85.222.169]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 377343148D9 for ; Sun, 26 Apr 2026 23:23:51 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.222.169 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777245833; cv=none; b=GC9MvWgxZJhx45NYmEyQ6ksk2WvANV72mux/38yUr6E/1QE7OStM5RVYv3pmQRzo7b/Wd6RuT/tuG0FQpYrJ3HmczDgd6TPr0y/CytL0Aa4LNVzi9SaTVNoZAMX1VY164d5aItJlw/1KnowVy1XywKYheFTuRn28+sFVChTk1Sw= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777245833; c=relaxed/simple; bh=3PfpSsq9PVqlOFmWLAB5WPbcbb7zy7cmiuYW1YK3Yac=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=Z/qC+KydJTxrnMiwQzQsl9tEtXg0k7gMEeEz3CMETt2xjBOdUBlH4Xtq4qiIJ/6GxG1N9avVZGjmHjFMLc50CAbavIaH2Fywrpqn5Q29TeMHPBPjJsQuMHtqwqOl+QH4AB9WMSGnQd2pOS0+WmWpNtG9CXC6GLMEkmFbYSRb26U= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=R83f3coU; arc=none smtp.client-ip=209.85.222.169 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="R83f3coU" Received: by mail-qk1-f169.google.com with SMTP id af79cd13be357-8ea8563c693so845717385a.2 for ; Sun, 26 Apr 2026 16:23:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1777245830; x=1777850630; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=SMcVPLr/wbi2Q8Kaqf49orEV0Xtu1ZF/I9pLdpkPlEs=; b=R83f3coU1bE3WufNsrV+dbv02EBiCFDAJuGnn9wQEDCs7kjA+Yhud5f0dWS9S52VlR Ydyoo41RB51h1BOttZd0CaG+Ip62cX26fmzspW3tVo/kJ4ZOE9UqEodJfKxsSwqpwWIy Vn7yFD1JIONuHVCCd3dJX/WoJCKOuIKSQrqkOosuRZMVFINgENxHk0cIaxIFndf4EfwF GpnobeWEZOydLUDEdN0FLcmq+jsxTSIcPs4s2v8MJjTpuKL689Zaejse0rrO+ZjSb/mp ddTjJqBW4tgiTuthSsrqF4NVFnI4fO248ZN8IOu9/VHRXYn5aMfwiUYMrFJ9dbRbEcTJ eSCg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1777245830; x=1777850630; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-gg:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=SMcVPLr/wbi2Q8Kaqf49orEV0Xtu1ZF/I9pLdpkPlEs=; b=sqGOaLnFVkaILWpEd14cWeMbOAA3D8/qiNoigQv1QNvi913/RA2136rDoXE9hf22Z/ Gjq1CbyWyv1tLg2AZ5WNzWd1JQqk4EGIcO/mmi0Oo9aq+vbHvxx5spu88nrV1+8VbdUr ohyzXT+eF+lSBOIuxQSLH2eYAOAMbWmJzwKdXBXotCcjBCRWGG0tcmyTZMcAXaw7eKNm kxo5mNNNF1p0lgkFYVDFRJfaMz0SHnRms/W+aAgLUXSsamJEk/7SY25W97cI2rUerUWQ F/7Z0dcPXFsYYr+gjs59AsoaOI33qzZI+WbTlN9sex4FDDIBt7+9RsndVexrXhXCqEQh 5LQg== X-Forwarded-Encrypted: i=1; AFNElJ/wY2vpLQ6Yn79bCbdfIooP8Zxfnh6NtHN9Ck9FJ/M8fsFuZbLqd/cZq1KfwFT0t3rSIYK+zbtEHhH/2G4=@vger.kernel.org X-Gm-Message-State: AOJu0YzV21f44REyU5TXXedyacxY4iIdUPi7kxFVK0mrUPOTu4Wy9jeH xOtNGSrDmsm3QAgVs1i3hjf9wHFj89v/Q6xYICDjUS+wgzFD8ze/wEMM X-Gm-Gg: AeBDiesDJMEPLPpLDAZjtm4cRcPOHHRIFV3o4TURrr+RPM/zi9+ZdriDjC8nbwN2umv yoL/UUJiCQqCDqoqlXpkf6byVzyMJ+5R9emZD7UJxyrvhKi+/sZ/+lelaZrzVyndklDYMAkPnGa Nc0uHZFzlSEi7TgYvy15IzpyUu49qCd5RcVM3no0aVlcmkWbQKcrbZYBmNQJc3V1g1RZeVeNO08 pzRn+Z4A+hLwnFOyAVWsvUy1wa/RnZPpcZadbdpQqa350AX7hhmSEbJs6/0f990RMN2hznw7AGo iXT30wwgHRSbTEaNWsCfvXKUDaqw5jg2BtvwqZnfoPpl8fDt183+wcXRfmyNgCM/x7FivS4cF1Y XR/begw4ibzQ3XtXh9PAezWePwnQRL3pUZjS0LoGVg+aKKNbImWUE+SwHFtOvJsu19slJ1VnWtS RuCfoP/HXFAnNjeNpvADMPd/W//2h4wmaN6RPNlcVP/68uHgUGTcveT8Fzh6e7D34AEfD5JSoqd oKhKBBu4GX8tcZzSsK89y/fJIUAY0+wK5usO2dGumNos9ZfvA8I X-Received: by 2002:a05:620a:46a9:b0:8db:de3:92a1 with SMTP id af79cd13be357-8e79208594dmr5861913385a.48.1777245830182; Sun, 26 Apr 2026 16:23:50 -0700 (PDT) Received: from battery.lan (pool-100-15-227-251.washdc.fios.verizon.net. [100.15.227.251]) by smtp.gmail.com with ESMTPSA id af79cd13be357-8e7d93c2fffsm2383899085a.36.2026.04.26.16.23.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 26 Apr 2026 16:23:49 -0700 (PDT) From: David Windsor To: Paul Moore , Stephen Smalley Cc: Ondrej Mosnacek , selinux@vger.kernel.org, linux-security-module@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH] selinux: don't reserve xattr slot when we won't fill it Date: Sun, 26 Apr 2026 19:23:49 -0400 Message-ID: <20260426232349.844289-1-dwindsor@gmail.com> X-Mailer: git-send-email 2.53.0 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Move lsm_get_xattr_slot() below the SBLABEL_MNT check so we don't leave a NULL-named slot in the array when returning -EOPNOTSUPP; filesystem initxattrs() callbacks stop iterating at the first NULL ->name, silently dropping xattrs installed by later LSMs. Signed-off-by: David Windsor --- security/selinux/hooks.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/security/selinux/hooks.c b/security/selinux/hooks.c index 97801966bf32..4ff118a9395f 100644 --- a/security/selinux/hooks.c +++ b/security/selinux/hooks.c @@ -2966,7 +2966,7 @@ static int selinux_inode_init_security(struct inode *inode, struct inode *dir, { const struct cred_security_struct *crsec = selinux_cred(current_cred()); struct superblock_security_struct *sbsec; - struct xattr *xattr = lsm_get_xattr_slot(xattrs, xattr_count); + struct xattr *xattr; u32 newsid, clen; u16 newsclass; int rc; @@ -2992,6 +2992,7 @@ static int selinux_inode_init_security(struct inode *inode, struct inode *dir, !(sbsec->flags & SBLABEL_MNT)) return -EOPNOTSUPP; + xattr = lsm_get_xattr_slot(xattrs, xattr_count); if (xattr) { rc = security_sid_to_context_force(newsid, &context, &clen); base-commit: 254f49634ee16a731174d2ae34bc50bd5f45e731 -- 2.53.0