From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-lj1-f178.google.com (mail-lj1-f178.google.com [209.85.208.178]) (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 72D8D3C73E0 for ; Thu, 12 Mar 2026 18:45:23 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.208.178 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773341124; cv=none; b=jS7e8WWi1Nf8A6dOdA1BNyRGkRJEQB7AJzpIiKFzbA+ExMxF4Z1u/BPgbinSt+IYfabAm2yFZGpZOju/LL+nap/oIRDfVoYYS/9QwWjCe1bYFux0y9CEJqlFUiLxi+sYRucc6fovAPmMx3N1/uS9M7FvaONgfYHV1MKBkfoGO3A= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773341124; c=relaxed/simple; bh=+kMlSxjMZoglOsCcAnI+So4oVKy/vFvPGKu4SmIoT/0=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=AyZwa02lh9jIGniwnN+FACEwAkfyweGrqWNYzPDSfSPoDB8/WmwIe/MiK5FbNVX4iytBar/rZNlm3q571buPBbAompRSdQMcWTS5/5H9p2d84tRace0HqKVLf6OOPPzuK9fQVkhHupi9NTvVZ+wdl2a5v5YpTL+PhuVFDoeniSM= 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=jACBKLYj; arc=none smtp.client-ip=209.85.208.178 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="jACBKLYj" Received: by mail-lj1-f178.google.com with SMTP id 38308e7fff4ca-38a725a14e3so12541271fa.0 for ; Thu, 12 Mar 2026 11:45:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1773341122; x=1773945922; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=Vuk/jw32c8PNpTwL/uN6PztjY6W4Zj8CeSCt8quW+80=; b=jACBKLYjbuGswfE5RlLyN1mB5nKuMnnQzTgBQ7TzsEH+U+UyF71Q/YQl0gZUfjwcRx 3mOW+CEyp1wprGPSA80WhqxTu/sErRBVyhnhiigHUrwwdhqtyr9ghZeXKRa+McL8rwwz IQzq1CbjBlstSrVaaifIyXLwl282/1FrzCRRysowYNcFzSHc+aIKuPcP69NJDnzNuzFD ET00TK7CWCD8mpMIcYidBVg8ztVbLsE+BlPuGspQCHCwJ5th9UzNXZr4g+W18NhVojyg 3P5jnab2om+v+QGq0z9hOuUzmrl/SJLiqsiJSIwP4QwJpkrIqED7uhh298zewFps2xGn IpDw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1773341122; x=1773945922; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=Vuk/jw32c8PNpTwL/uN6PztjY6W4Zj8CeSCt8quW+80=; b=llV8TZul8AMSL7SoLuUA3EK6Y/b4V7wFtcf93JDAPNMA7bCxJ7qDII/R4RmnSxJUSA CjH9FHRu6UgogXBcyg4xcr1gKYJSaw1Zcp1/p9l7ZuYx7pa+oEpkx3OmuiooERWpF9JT vh8B2mJ+01MiCE2fPT9UMAitKqkjgZIMJDi+hZciiD7FOYOP1Y5yuL0w9S5dGa09SvFQ KgK7tGd2YZQhG/b93t5aKgzmhiz5wcS9GoGvepArd27gSKccDgaWU6AqEIY9hLFGOmuL N6r4bv6H50I8jPbRCAcH6qWhOIDHlQrVWVD1nKAdTkFZHhrM1uWrMgtQQlJ45bXGgxcY Hqkg== X-Forwarded-Encrypted: i=1; AJvYcCVcJJ9o/6OjtRR0xfZOq1/dMmeXUbT5XYRC1EhqfD9VC5eyOghI1ohseNfFeXaS9hcfl/jD2bB9WZfAjQE=@vger.kernel.org X-Gm-Message-State: AOJu0Yz44/Z0wBZ2XPOuBnsg974twRDyc6oORkjyGyuM6yblEbbpv1xT 1VTrGPYXhZ7MfAwPPRo3CCirVdrV8HqtFlGFoFcZeK6kdDLA8sgeoc7S X-Gm-Gg: ATEYQzx5UkvAJ6QWvwhR973Jm30/CdKISCdZTBOvYlRRDK3cDTAf9I13YwmOsVLZ1Uj U+A5hWOoqnmxmQVFnG/TCh1O+89uvm57+llwJ50gkJcvRKS+FUU0aZSz8XvkScP1faZIau46ubI 6dd0Z4oX6Gd9XcoaJf+PmPgjrne87qC4fYjurax/PqPXzxBijD/BQ1LpoCQ/M4wVqrJRHzf4ZYL rJoHhAqzjcgXjCluRb6wrpDUdPhWrGXh+U55OWq97T10EzjTUIsBdKNJOV6FNiZ6uFhnDNATmZM kfNIxP86RVRU9DoTwZDFBtAGU5aSYh5yFk2hrr6ZtWcGLgnb14aEOz2/ak9o43BWCYDuYgHotOM IZpLJHShq9kLH2Y2xu+x58uILhvyHWmXLCo45/th2gjlbmiTr/4RBnQwhuutSJ/rkmgWMNNjp9C pbQ4+wAPUXNszVECcWFmjZCXMHvvSGbh3+lWj9TZvClWBDRTV9WD37I0rcbPkcL5cY/N7XwgU= X-Received: by 2002:a05:651c:210e:b0:38a:27e:b904 with SMTP id 38308e7fff4ca-38a8965822cmr1225031fa.4.1773341121502; Thu, 12 Mar 2026 11:45:21 -0700 (PDT) Received: from ubuntu.. (static.159.107.27.37.clients.your-server.de. [37.27.107.159]) by smtp.gmail.com with ESMTPSA id 38308e7fff4ca-38a67e7b64bsm10382991fa.43.2026.03.12.11.45.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 12 Mar 2026 11:45:21 -0700 (PDT) From: Josh Law X-Google-Original-From: Josh Law To: Masami Hiramatsu , Andrew Morton Cc: Josh Law , linux-kernel@vger.kernel.org, linux-trace-kernel@vger.kernel.org Subject: [PATCH 3/3] lib/bootconfig: fix snprintf truncation check in xbc_node_compose_key_after() Date: Thu, 12 Mar 2026 18:45:20 +0000 Message-Id: <20260312184520.24399-3-objecting@objecting.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20260312184520.24399-1-objecting@objecting.org> References: <20260312184520.24399-1-objecting@objecting.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit snprintf() returns the number of characters that would have been written excluding the NUL terminator. Output is truncated when the return value is >= the buffer size, not just > the buffer size. When ret == size, the current code takes the non-truncated path, advancing buf by ret and reducing size to 0. This is wrong because the output was actually truncated (the last character was replaced by NUL). Fix by using >= so the truncation path is taken correctly. Signed-off-by: Josh Law --- lib/bootconfig.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/bootconfig.c b/lib/bootconfig.c index 62b4ed7a0ba6..b0ef1e74e98a 100644 --- a/lib/bootconfig.c +++ b/lib/bootconfig.c @@ -316,7 +316,7 @@ int __init xbc_node_compose_key_after(struct xbc_node *root, depth ? "." : ""); if (ret < 0) return ret; - if (ret > size) { + if (ret >= size) { size = 0; } else { size -= ret; -- 2.34.1