From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-wm1-f52.google.com (mail-wm1-f52.google.com [209.85.128.52]) (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 4EBAA31326A for ; Mon, 22 Jun 2026 16:53:08 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.52 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1782147189; cv=none; b=qlpBXZ11r7veXWKHflP0xaErcHYXaScfLvh5ZsGBWorHh6OMhXsy8vr2zhBrWq/F2akGhoJpmlyHMVzFWlRplIS20HEsFM481LOKGGPCwDu+pVLVIA+rVqn12LgbaZ0LbR69zFBerB6GwKLooAepFPC34Uaxh4MJj6OjSKIBLW4= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1782147189; c=relaxed/simple; bh=84imE7TlZylZzQvQJKF2+t8YmJ5WhG8hl3Du3QQIs0A=; h=Date:From:To:Cc:Subject:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=q/hi6CPLDEjcgoL9XygeH3jGTXjMefytA0K0h/nUtcLpDBJD+9gh14XSHjwvS9+r5SNgiRx/felxYSlhYvKDIuXD+8A9VosWZr9YTJbgEi0DML4BvYkRewkPdftyT8UD2MWJImd9b7wZU2j/kgaieFonMxm3CqcRl+811L+HjOs= 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=bCd6+S7d; arc=none smtp.client-ip=209.85.128.52 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="bCd6+S7d" Received: by mail-wm1-f52.google.com with SMTP id 5b1f17b1804b1-4921eed3fa2so37999645e9.0 for ; Mon, 22 Jun 2026 09:53:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1782147187; x=1782751987; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:subject:cc:to:from:date:from:to:cc:subject:date :message-id:reply-to; bh=hiQBDDZL1fhWnjekM23oihkaGRA+cvxb1E2FW0Sx5Do=; b=bCd6+S7da7RwxeSa3qfaI5G7+qB8k3qhyqlU4bCAXO3rLhg+KdhUhxxHCSaCs/G5w7 EcDYmZT09jMgaFk6whTMJ9ZlaGXN1n11J8ynDMhFxFHgazXVngC9W718t2upb7NzUfG/ r1vs+YD9wST14KA5wBzttgVi5IvMwNTfbVGn98uzlcH47HRfKh5Fw1faVXjrSPyPC1Ue oXX5Oec2WUrs+nIfzovAvmnpSoLnr6MFCAdRsGUdqqKRNWtONLLnnZ6Xa2QgFETJkOXE daUIB1gbRfh4d9Xsd5Zltd3FnAe98SrDl9dwaqVPJyqh4B8yLZ499wtI8QoTDZ1tQZ+G hnKA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1782147187; x=1782751987; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:subject:cc:to:from:date:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=hiQBDDZL1fhWnjekM23oihkaGRA+cvxb1E2FW0Sx5Do=; b=K6N+DW6pXmCj654GdZy2QERxTEu0GZbR27uNd8Od+/BGY9IvsXhTLqR9TUgxsHbgsA L4OsNJ11+mPEtcn+t4rAIuUXjtsh94d4GA2gPEqBBqoN+e+WQK+modhpleCLjuEjr81M 1DmMdKhpgTKeWyxud12ot6JOXanKkhF1VH1UAzwnVJbkPIl4ZlxzRSEYOfnrR9qPATbp t3sFrYah/KpbtRwLPfoA8i4I3lBfkz3hPgds7610owDh0/7/Y3cv9uCFKmOQ9wUS3sNb Kai8BJ6epXAdi2ospzZxzSI/0foflRRDdx225aBzFFKp/sZy4wVxYhBsgkBAf75QUkqu byFg== X-Forwarded-Encrypted: i=1; AFNElJ+G1ikwqzWL3VPbdzSvDgYeekhQUZ6vVuv/nB5x6l3WEr4wO/JOVkUlQKZzEIwDb0RfTzES9pg4jBCCq+o=@vger.kernel.org X-Gm-Message-State: AOJu0YwzGkDHkoDY3K+TgCJ+ZmJI6z0P6gtdbuOMqgVqo+vMaLaQ9024 XlFm6bCU755uKHy1Mi1PFFQaGIK1BMyyh+TxeyVN8leYdd9S8ltsxuTe X-Gm-Gg: AfdE7cn5aS5fHmNmyBEYT2jMPZ8OOPoIoe8ab63odRtu5Fj3PdfPjaSdv388JHsaz3m lz/udUVFoZ5+zHCp9omAE2ja04hzBRU4ey+eOA1LKW9nqeoKVX717j/lr9ri6Lg+mPD8w0ybOly JwJg4vi/YIPhWAsmDGi//sI55ObJeiZ6WHzmTvQUqiihN6rI3E+sCkb0uPg7HwJUmCV2GeaWrs/ ttQ4JadWNu9E75Sr1IKUx2QOFy487kWXu0ZlTZAG6tzGJncjchkfdAneUOoAhRNnWCH3gVIByqo EvvUXVBCJePqOsx3tc+INkxoJEGcd1qppWTFWiA62S9fhWxG0dS/Q57Pj4JJ+f1dzA9Fq0bx/va lEt6AzMY1Aast7x6v0RMTTdeGCXX/0FUOpNnUK8kBa1Z7SU9KrH7g0Mk3TbqEsaJ9wRKCo8TCAB Jf5uObVduzcCRJksyl7qC/WYeDejxU3aGinN1McEEEWsYl5zrQB+LHyJFQNxN5 X-Received: by 2002:a05:600c:1d29:b0:492:3fc4:bd6b with SMTP id 5b1f17b1804b1-49242314120mr234540825e9.7.1782147182587; Mon, 22 Jun 2026 09:53:02 -0700 (PDT) Received: from pumpkin (82-69-66-36.dsl.in-addr.zen.co.uk. [82.69.66.36]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-46666788226sm27693147f8f.23.2026.06.22.09.53.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 22 Jun 2026 09:53:02 -0700 (PDT) Date: Mon, 22 Jun 2026 17:53:01 +0100 From: David Laight To: Ian Bridges Cc: Paul Moore , Stephen Smalley , Ondrej Mosnacek , selinux@vger.kernel.org, linux-kernel@vger.kernel.org, linux-hardening@vger.kernel.org Subject: Re: [PATCH] selinux: replace strlcat() with seq_buf in selinux_ima_collect_state() Message-ID: <20260622175301.6a36756b@pumpkin> In-Reply-To: References: X-Mailer: Claws Mail 4.1.1 (GTK 3.24.38; arm-unknown-linux-gnueabihf) Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit On Mon, 22 Jun 2026 10:00:07 -0500 Ian Bridges wrote: > In preparation for removing the deprecated strlcat() API[1], replace the > strscpy()/strlcat() chain in selinux_ima_collect_state() with a struct > seq_buf, which tracks the write position and remaining space internally. > > The seven open-coded WARN_ON(rc >= buf_len) truncation checks become a > single seq_buf_has_overflowed() check after the string is built. The > kzalloc() and its exact-size computation are unchanged, so the > measurement string passed to IMA is unchanged. > > Link: https://github.com/KSPP/linux/issues/370 [1] > Signed-off-by: Ian Bridges > --- > security/selinux/ima.c | 35 ++++++++++++++--------------------- > 1 file changed, 14 insertions(+), 21 deletions(-) > > diff --git a/security/selinux/ima.c b/security/selinux/ima.c > index aa34da9b0aeb..3d81093d16aa 100644 > --- a/security/selinux/ima.c > +++ b/security/selinux/ima.c > @@ -9,6 +9,7 @@ > */ > #include > #include > +#include > #include "security.h" > #include "ima.h" > > @@ -21,8 +22,9 @@ > static char *selinux_ima_collect_state(void) > { > const char *on = "=1;", *off = "=0;"; > + struct seq_buf s; > char *buf; > - int buf_len, len, i, rc; > + int buf_len, len, i; > > buf_len = strlen("initialized=0;enforcing=0;checkreqprot=0;") + 1; > > @@ -34,33 +36,24 @@ static char *selinux_ima_collect_state(void) > if (!buf) > return NULL; > > - rc = strscpy(buf, "initialized", buf_len); > - WARN_ON(rc < 0); > + seq_buf_init(&s, buf, buf_len); That is silly, you need the length of the buffer not the length of a string that is the expected length of the output. > > - rc = strlcat(buf, selinux_initialized() ? on : off, buf_len); > - WARN_ON(rc >= buf_len); > + seq_buf_puts(&s, "initialized"); > + seq_buf_puts(&s, selinux_initialized() ? on : off); > > - rc = strlcat(buf, "enforcing", buf_len); > - WARN_ON(rc >= buf_len); > + seq_buf_puts(&s, "enforcing"); > + seq_buf_puts(&s, enforcing_enabled() ? on : off); > > - rc = strlcat(buf, enforcing_enabled() ? on : off, buf_len); > - WARN_ON(rc >= buf_len); > - > - rc = strlcat(buf, "checkreqprot", buf_len); > - WARN_ON(rc >= buf_len); > - > - rc = strlcat(buf, checkreqprot_get() ? on : off, buf_len); > - WARN_ON(rc >= buf_len); > + seq_buf_puts(&s, "checkreqprot"); > + seq_buf_puts(&s, checkreqprot_get() ? on : off); That lot would be easier to read as a seq_printf() - with %d and kill 'on' and 'off'. Why does 'security' code so often look like c**p. David > > for (i = 0; i < __POLICYDB_CAP_MAX; i++) { > - rc = strlcat(buf, selinux_policycap_names[i], buf_len); > - WARN_ON(rc >= buf_len); > - > - rc = strlcat(buf, selinux_state.policycap[i] ? on : off, > - buf_len); > - WARN_ON(rc >= buf_len); > + seq_buf_puts(&s, selinux_policycap_names[i]); > + seq_buf_puts(&s, selinux_state.policycap[i] ? on : off); > } > > + WARN_ON(seq_buf_has_overflowed(&s)); > + > return buf; > } >