From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-lj1-f176.google.com (mail-lj1-f176.google.com [209.85.208.176]) (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 4B169353EF3 for ; Thu, 12 Mar 2026 18:45:23 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.208.176 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773341124; cv=none; b=SZzH8ZivbZANM77LFlpy1D31eyq9xrNL3BWRtfL77/Bv1XQVH1ydfyX64QPPQR+ySBRkTMZz5BaeE3jzYRdC15mfpmNP84/xuKxIsJG5q7FOwa/rmPXq+5wl+OxTgr5Zm2vLeGHSgDqA/f5Jlp6+292wDnHTvdfToeNVDcMDh4c= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773341124; c=relaxed/simple; bh=hU/VGb3yH21YeL4A5VehtT/XBLjvs/a5om/0zQIeRrM=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=Iz+YBO4SUXBN9FLSRG6NQcS/3tBOMTP2tQtJaHrhZpS15cZuGUeHryPnKyJmLbChuTevXym6ZGJFyltoxilKTX7D/xW0aMsxdbXB9+eZ1jd2DS+v87hOPaVcGGen00xL0dEASd0Rqy1HMWnpC+VFAonYJ7tZMsp4/YM4RZWPMO0= 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=ShglveBq; arc=none smtp.client-ip=209.85.208.176 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="ShglveBq" Received: by mail-lj1-f176.google.com with SMTP id 38308e7fff4ca-38a2f196cbaso12152261fa.1 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=1773341121; x=1773945921; 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=G0hRm0NvHlM6XWE83yipHMAEU8541DZieRPUAjm3PCU=; b=ShglveBqNjxqLR41lNGd9NdOOElTmA/oNNwMC6OXdafL8VE3OVQmVj9MUjqBrdxyGZ Wvmxc8CkQzz+2XipvAuy7nQKK+KIZOdk6lWsQTHFN3ZappClN8BJ8dfQoIYi8SUH8DPA Hyk8+XEfZ8J/IM8vuUN15ajOEs/xUZJA5KdJcyXvtQaeL1aCD+59opYmEsZLR36t+HJM QqUXk2WSrIVhT9r5GsUxa/TvlMC6qEHkyWIEdtAY7IpsZ07E75rU8uYcdBbWL8f+dTlV MIyZIC3+xsCv2k6LsVZt+HDDrDRvSsuIFmw4zx4ct+rPW+jbzwx7nGz8orqtb5gc4w+e 0dlQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1773341121; x=1773945921; 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=G0hRm0NvHlM6XWE83yipHMAEU8541DZieRPUAjm3PCU=; b=N7bm5W4mkhBSeREJybTM04qf9Br0Xgeq3XGg+pmuxVBKWsbeaCaVrgc2AQBdqEBZiA g1hXvEJ5J0Qqxad7z7Gcy5HXF2NpSyOFr25PRyYCJyaOMFCi6hrkf83HiuOPoefMD8WZ kJ1Z7G32H7O5fu3eNKKV64zExE52lMvc4VmvhMeqlmYbX1xXsIXwb/+FKUKlcqO4Zcw2 VAAfXaz4+cvzvVgUZNfXhlWDL6s1YmIYhmxu/XCUDqpKvbk57IslKi/OWDlQpPytpggv ti1hqm/8UozTdaoLE9aABaNrlct79jv//FENP+hsLTmvZzYw3HD5lIkPhiMzxpsh9y2N OVIg== X-Forwarded-Encrypted: i=1; AJvYcCUU7qPZM0kUOZ65SBJYGbgNL8cCDZFPk1phl9rv7P7mEy05xTeUCwYVWgRqCGP7KDPCZbTTX65+ALerM3A=@vger.kernel.org X-Gm-Message-State: AOJu0YxDqsR1YUTBsg7UxFgU2/av/eFFs6aYvF1EgYRWpDe8Pyto7lMo ITrWjajwT0inWfQGSB98WATUJHg8Sw9RwNF98eGMQRO1Vahzyft1cqFK0uEM+96l X-Gm-Gg: ATEYQzzvVYQ8oujwWw+w+sovYAGBg5/2ypeD8R/nLjtQGicsRgX+gtoPIue586hPRHD ccMhL+hcov4TAvIwF0gvOxnuqn+u4mB6zQWLPVs4OAeCpWEDk7PoL9/wXCBDaTTDYtjlrsrtEoG D4iCQjvBse6wwk8vyEYAWSTxauU+hKSC3yrPqA/dCtekZKREEOAht/ic2pj7F5U3CshlDxPUZeP 2xa3ilXmn3qZHiPFfQ85WLhxlPbq20Vn2Aish6YSGygWywZ6ODHSSozp6Him0cgfJ1VF97pb1Uy zZbJ8rtPwoPWSSEwA6PbzodJtkIIG/GMwjyIx5qc56nSw5ozsaCzt8RpENUM4SkdzkxfT6v2u9B rVjrmGAEeUoZcpktHDMVRzNxge/xeXVJrh3/mxyyON/Unl6lp+N0EMExMdtG+pVFsEOi7u44k9x ym60SCcpUXGyo1bQ/f5uQo4YCQEaN/mojJIElfwH5TSZCanMPXy7tiUiXQZjCvWGzsMAEiWiM= X-Received: by 2002:a05:651c:1584:b0:38a:32bc:6afb with SMTP id 38308e7fff4ca-38a8983ffa3mr947221fa.40.1773341121164; 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.20 (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 2/3] lib/bootconfig: check bounds before writing in __xbc_open_brace() Date: Thu, 12 Mar 2026 18:45:19 +0000 Message-Id: <20260312184520.24399-2-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 The bounds check for brace_index happens after the array write. While the current call pattern prevents an actual out-of-bounds access (the previous call would have returned an error), the write-before-check pattern is fragile and would become a real out-of-bounds write if the error return were ever not propagated. Move the bounds check before the array write so the function is self-contained and safe regardless of caller behavior. 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 a1e6a2e14b01..62b4ed7a0ba6 100644 --- a/lib/bootconfig.c +++ b/lib/bootconfig.c @@ -532,9 +532,9 @@ static char *skip_spaces_until_newline(char *p) static int __init __xbc_open_brace(char *p) { /* Push the last key as open brace */ - open_brace[brace_index++] = xbc_node_index(last_parent); if (brace_index >= XBC_DEPTH_MAX) return xbc_parse_error("Exceed max depth of braces", p); + open_brace[brace_index++] = xbc_node_index(last_parent); return 0; } -- 2.34.1